Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

miniAOD part4 (7.2.X, only PatAlgos and cmsDriver) #4016

Merged
merged 5 commits into from Jun 10, 2014
Merged

miniAOD part4 (7.2.X, only PatAlgos and cmsDriver) #4016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b07a582
bring also puJetId to ak4 (though the training is still ak5 in 5.3.X,…
gpetruc May 23, 2014
b58d45a
PATUserDataMerger: throw exception if the association points to the w…
gpetruc May 23, 2014
7945812
miniAOD_tools: move the addition of PuJetID at the end, so that it do…
gpetruc May 23, 2014
e4db5ab
cmsDriver extra output options for MINIAOD that significantly affect …
gpetruc May 26, 2014
23492f2
Don't compute flavour for the met uncertainties (this also avoids err…
gpetruc May 27, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions Configuration/Applications/python/ConfigBuilder.py
View file
Open in desktop
Expand Up @@ -584,6 +584,11 @@ def doNotInlineEventContent(instance,label = "cms.untracked.vstring(process."+th
if streamType=='ALCARECO':
output.dataset.filterName = cms.untracked.string('StreamALCACombined')

if "MINIAOD" in streamType:
output.dropMetaData = cms.untracked.string('ALL')
output.fastCloning= cms.untracked.bool(False)
output.overrideInputFileSplitLevels = cms.untracked.bool(True)

outputModuleName=streamType+'output'
setattr(self.process,outputModuleName,output)
outputModule=getattr(self.process,outputModuleName)
Expand Down
4 changes: 1 addition & 3 deletions PhysicsTools/PatAlgos/interface/PATUserDataMerger.h
View file
Open in desktop
Expand Up @@ -145,9 +145,7 @@ pat::PATUserDataMerger<ObjectType, Operation>::add(ObjectType & patObject,
iEvent.getByToken( *token_it, userData );

edm::Ptr<reco::Candidate> recoObject = patObject.originalObjectRef();
if ( userData->contains( recoObject.id() ) ) {
loader_.addData( patObject, encoded, (*userData)[recoObject]);
}
loader_.addData( patObject, encoded, (*userData)[recoObject]);

}

Expand Down
9 changes: 5 additions & 4 deletions PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py
View file
Open in desktop
Expand Up @@ -80,10 +80,6 @@ def miniAOD_customizeCommon(process):
process.selectedPatJetsCA8.cut = cms.string("pt > 100")
process.patJetGenJetMatchCA8.matched = 'slimmedGenJets'
#
## PU JetID
process.load("PhysicsTools.PatAlgos.slimming.pileupJetId_cfi")
process.patJets.userData.userFloats.src = [ cms.InputTag("pileupJetId:fullDiscriminant"), ]
#
from PhysicsTools.PatAlgos.tools.trigTools import switchOnTriggerStandAlone
switchOnTriggerStandAlone( process, outputModule = '' )
process.patTrigger.packTriggerPathNames = cms.bool(True)
Expand All @@ -93,6 +89,7 @@ def miniAOD_customizeCommon(process):
# FIXME: this and the typeI MET should become AK4 once we have the proper JEC?
from PhysicsTools.PatUtils.tools.metUncertaintyTools import runMEtUncertainties
addJetCollection(process, postfix = "ForMetUnc", labelName = 'AK5PF', jetSource = cms.InputTag('ak5PFJets'), jetCorrections = ('AK5PF', ['L1FastJet', 'L2Relative', 'L3Absolute'], ''))
process.patJetsAK5PFForMetUnc.getJetMCFlavour = False
runMEtUncertainties(process,jetCollection="selectedPatJetsAK5PFForMetUnc", outputModule=None)

#keep this after all addJetCollections otherwise it will attempt computing them also for stuf with no taginfos
Expand All @@ -106,6 +103,10 @@ def miniAOD_customizeCommon(process):
process.patJets.userData.userFunctionLabels = cms.vstring('vtxMass','vtxNtracks','vtx3DVal','vtx3DSig')
process.patJets.tagInfoSources = cms.VInputTag(cms.InputTag("secondaryVertexTagInfos"))
process.patJets.addTagInfos = cms.bool(True)
#
## PU JetID
process.load("PhysicsTools.PatAlgos.slimming.pileupJetId_cfi")
process.patJets.userData.userFloats.src = [ cms.InputTag("pileupJetId:fullDiscriminant"), ]


def miniAOD_customizeMC(process):
Expand Down
2 changes: 1 addition & 1 deletion PhysicsTools/PatAlgos/python/slimming/pileupJetId_cfi.py
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
produceJetIds = cms.bool(True),
jetids = cms.InputTag(""),
runMvas = cms.bool(True),
jets = cms.InputTag("ak5PFJetsCHS"),
jets = cms.InputTag("ak4PFJetsCHS"),
vertexes = cms.InputTag("offlinePrimaryVertices"),
algos = cms.VPSet(full_5x_chs),
rho = cms.InputTag("fixedGridRhoFastjetAll"),
Expand Down