Merge pull request #3 from senkin/jjacob-master

Fixing the recipe
BristolTopGroup · Jun 16, 2014 · 5f4d99e · 5f4d99e
2 parents 22b7ab3 + fb7fe12
commit 5f4d99e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/python/EventFilter_cfi.py b/python/EventFilter_cfi.py
@@ -24,9 +24,9 @@
     TracksInput=cms.InputTag('generalTracks'),
 
     # Specify input collections
-    electronInput=cms.InputTag("gsfElectrons"),
-    muonInput=cms.InputTag("cleanPatMuons"),
-    jetInput=cms.InputTag("ak5CaloJets"),
+    electronInput=cms.InputTag("selectedPatElectronsLoosePFlow"),
+    muonInput=cms.InputTag("selectedPatMuonsLoosePFlow"),
+    jetInput=cms.InputTag("selectedPatJetsPFlow"),
 
     # Specifiy number of jets
     minNJets=cms.int32(-1),

diff --git a/python/Jets_Setup_cff.py b/python/Jets_Setup_cff.py
@@ -78,5 +78,4 @@ def setup_jets(process, cms, options, postfix="PFlow"):
     pfNoElectron = getattr(process, "pfNoElectron" + postfix)
     for module in additionalJets :
         getattr(process, "patPF2PATSequence" + postfix).replace(pfNoElectron, pfNoElectron * module)
-
-    process.patJets.discriminatorSources = cms.VInputTag(cms.InputTag("combinedSecondaryVertexBJetTags"), cms.InputTag("combinedSecondaryVertexMVABJetTags"), cms.InputTag("jetBProbabilityBJetTags"), cms.InputTag("jetProbabilityBJetTags"), cms.InputTag("simpleSecondaryVertexHighEffBJetTags"), cms.InputTag("simpleSecondaryVertexHighPurBJetTags"), cms.InputTag("trackCountingHighEffBJetTags"), cms.InputTag("trackCountingHighPurBJetTags"))
+
diff --git a/python/MET_Setup_cff.py b/python/MET_Setup_cff.py
@@ -115,9 +115,9 @@ def setup_MET_uncertainties(process, cms, options, postfix="PFlow"):
     process.pfMEtSysShiftCorr.parameter = metSysShiftCorrParameter
 
     runMEtUncertainties(process,
-                    electronCollection = cms.InputTag('cleanPatElectrons'),
-                    muonCollection = 'cleanPatMuons',
-                    tauCollection = 'cleanPatTaus',
+                    electronCollection = cms.InputTag('patElectronsPFlow'),
+                    muonCollection = 'patMuonsPFlow',
+                    tauCollection = 'patTausPFlow',
                     jetCollection = cms.InputTag('goodPatJetsPFlow'),
                     jetCorrLabel = inputJetCorrLabelForMETuncertainties,
                     doSmearJets = not options.useData,

diff --git a/python/NTupleTools_cff.py b/python/NTupleTools_cff.py
@@ -313,8 +313,8 @@
     process.genParticlesForJetsNoNu *
     getattr(process, "patPF2PATSequence" + postfix) * 
     process.looseLeptonSequence * 
-    process.patDefaultSequence * 
-    process.goodPatJets * 
+    #process.patDefaultSequence * 
+    #process.goodPatJets * 
     process.goodPatJetsPFlow * 
     process.metUncertaintySequence * 
     process.EventFilters * 

diff --git a/python/NTupler_cff.py b/python/NTupler_cff.py
@@ -221,6 +221,7 @@ def setup_ntupler(process, cms, options):
         process.rootNTuples.remove(process.rootTupleCaloMET)
         process.rootNTuples.remove(process.rootTupleElectrons)
         process.rootNTuples.remove(process.nTupleMuons)
+        process.rootNTuples.remove(process.rootTuplePhotons)
 
     if not options.writeFat and not options.writeIsolatedPFLeptons:#write only PF particles
         #isolated leptons