Fix forward port 71x

[ktf]

By hand fix of merge of CMSSW_7_0_X into CMSSW_7_1_X.

The following PR were picked up (recent first):

• FlatPU #4102
• fix afterglow correction boundary #4118
• miniAOD part 4 (7.0.X) #4204
• Improvements to LumiList on 70x branch #4238
• Fix post ls1 customs 70 x #4318
• 7_0_X Change DataMixer to merge CSC Strip Digis instead of adding duplic... #4326
• Add missing customize. #4328

The following were ignored and will not be forward ported:

• New MVA taggers backport from 71X to 70X #3774
• GTs for mini AOD production in 70X #4294
• 7 0 x input files for700pre13 #4246
• 70 x hcal pre mix bugfix #4325

[davidlange6]

@ktf - are tests running on this PR? (4316)

[arizzi]

@slava77 I think miniaod part4 can mostly be forward ported, the only thing I'd check is that commit
ktf@c251751 doesn't mess up with substructures as they are in 71X/72X (but in principle it was obtained from single file checkout of 71X so it should be safe). @ktf can you check that such commit is actually doing nothing on top of 71X/72X ?

[ktf]

I've added a few more pull requests (#4318 and #4326) which were merged in the meanwhile. #4325 is tricky though, since it conflicts. Should it really be forward ported?

[cmsbuild]

Pull request #4316 was updated. @civanch, @nclopezo, @vlimant, @mdhildreth, @monttj, @cmsbuild, @franzoni, @Dr15Jones, @StoyanStoynev, @slava77, @vadler, @Degano, @ktf, @davidlange6 can you please check and sign again.

[slava77]

should be OK for RECO, waiting for jenkins though

[cmsbuild]

Pull request #4316 was updated. @civanch, @nclopezo, @vlimant, @mdhildreth, @monttj, @cmsbuild, @franzoni, @Dr15Jones, @StoyanStoynev, @slava77, @vadler, @Degano, @ktf, @davidlange6 can you please check and sign again.

[ktf]

Final update. #4325 ignored as suggested by @davidlange6 , #4328 added.

[davidlange6]

@ktf - what's the state of tests for this pr?

[ktf]

For some reason it did not merge. Running it again.

[ktf]

Ok, I'll merge it so that we can try it out in the IB at this point.

[ktf]

Something is wrong here. I get a

>> Checking EDM Class Version for src/DataFormats/PatCandidates/src/classes_def_objects.xml in libDataFormatsPatCandidatesCapabilities.so
LD_LIBRARY_PATH=/build/eulisse/CMSSW_7_1_0-build/tmp/BUILDROOT/d8755e73764cac50b87d5c1648a3c5a6/opt/cmssw/slc6_amd64_gcc481/cms/cmssw/CMSSW_7_1_0/tmp/slc6_amd64_gcc481/src/DataFormats/PatCandi
Automatic building of dictionaries now off
error: class 'pat::Photon' has a different checksum for ClassVersion 13. Increment ClassVersion to 14 and assign it to checksum 2518470540
gmake: *** [tmp/slc6_amd64_gcc481/src/DataFormats/PatCandidates/src/DataFormatsPatCandidates/libDataFormatsPatCandidatesCapabilities.so] Error 1

when building the release (but not in the IB..:-/). Ideas?

[ktf]

I just noticed ClassVersion 12 has 2518470540 as a checksum. Do I understand right that pat::Photon was changes in CMSSW_7_0_X but not in CMSSW_7_1_X? If yes, I guess the solution is simply to revert the change.

[ktf]

For the record, this made CMSSW_7_1_0.