Merge pull request #406 from amarini/topic_submission

2016 + KinFit
MiT-HEP · Apr 1, 2019 · 27fd932 · 27fd932
2 parents 2fa9ec0 + c98ad15
commit 27fd932
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/Nero/src/NeroLeptons.cpp b/Nero/src/NeroLeptons.cpp
@@ -257,9 +257,11 @@ int NeroLeptons::analyze(const edm::Event & iEvent)
 
         if (mu.innerTrack().isNull()) continue;
         // for kinematic fit. Must have track
-        ++nMuons;
-        selectedMuons.push_back(mu);
-        selectedIndex.push_back(leptons.size()-1);
+        if (mu.isLooseMuon()){
+            ++nMuons;
+            selectedMuons.push_back(mu);
+            selectedIndex.push_back(leptons.size()-1);
+        }
     }
 
     // Muon Vertex fitter

diff --git a/Nero/test/testNero.py b/Nero/test/testNero.py
@@ -123,17 +123,17 @@
         tagNamePuppi = 'Fall17_17Nov2017_V32_94X_DATA_AK4PFPuppi'
     if isYear == 2016:
         connectString = cms.string('sqlite:jec/Summer16_07Aug2017All_V11_DATA.db')
-        tagName = 'Summer16_07Aug2017_V11_94X_DATA_AK4PFchs'
-        tagNamePuppi = 'Summer16_07Aug2017_V11_94X_DATA_AK4PFPuppi'
+        tagName = 'Summer16_07Aug2017All_V11_DATA_AK4PFchs'
+        tagNamePuppi = 'Summer16_07Aug2017All_V11_DATA_AK4PFPuppi'
 else:
     if isYear==2017:
         connectString = cms.string('sqlite:jec/Fall17_17Nov2017_V32_94X_MC.db')
         tagName = 'Fall17_17Nov2017_V32_94X_MC_AK4PFchs'
         tagNamePuppi = 'Fall17_17Nov2017_V32_94X_MC_AK4PFPuppi'
     if isYear==2016:
         connectString = cms.string('sqlite:jec/Summer16_07Aug2017_V11_MC.db')
-        tagName = 'Summer16_07Aug2017_V11_94X_MC_AK4PFchs'
-        tagNamePuppi = 'Summer16_07Aug2017_V11_94X_MC_AK4PFPuppi'
+        tagName = 'Summer16_07Aug2017_V11_MC_AK4PFchs'
+        tagNamePuppi = 'Summer16_07Aug2017_V11_MC_AK4PFPuppi'
 
 #data only, mc hard coded. Need to be fixed per Run
 print "-> Setting Up JEC for AK8 using Year",isYear,"and Run",options.isRun
@@ -151,7 +151,7 @@
 elif isYear==2016:
     process.nero.NeroFatJets.chsAK8JECMC = cms.string("jec/Summer16/Summer16_07Aug2017_V11")
     if options.isRun in ['Run2016A','Run2016B','Run2016C','Run2016D']:
-        process.nero.NeroFatJets.chsAK8JEC = cms.string("jec/Summer16/Summer16_07Aug2017ABCD_V11")
+        process.nero.NeroFatJets.chsAK8JEC = cms.string("jec/Summer16/Summer16_07Aug2017BCD_V11")
     elif options.isRun in ['Run2016E', 'Run2016F']:
         process.nero.NeroFatJets.chsAK8JEC = cms.string("jec/Summer16/Summer16_07Aug2017EF_V11")
     elif options.isRun in ['Run2016G', 'Run2016H']: