Fix pu geometry bug (cms-sw#245)

* fix pu geometry bug * temporary JEC payloads
bi-ran · Jul 29, 2019 · 153b789 · 153b789
1 parent 266063b
commit 153b789
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/HeavyIonsAnalysis/JetAnalysis/test/runForestAOD_pponAA_DATA_103X.py b/HeavyIonsAnalysis/JetAnalysis/test/runForestAOD_pponAA_DATA_103X.py
@@ -89,6 +89,12 @@
 process.akPu4Calocorr.payload = "AK4Calo"
 process.akPu4PFcorr.payload = "AK4PF"
 process.akCs4PFcorr.payload = "AK4PF"
+process.akFlowPuCs4PFcorr.payload = "AK4PF"
+process.akPu3Calocorr.payload = "AK4Calo"
+process.akPu3PFcorr.payload = "AK3PF"
+process.akCs3PFcorr.payload = "AK3PF"
+process.akFlowPuCs3PFcorr.payload = "AK3PF"
+process.akPu3PFJets.jetPtMin = 1
 process.akPu4PFJets.jetPtMin = 1
 
 process.load('HeavyIonsAnalysis.JetAnalysis.hiFJRhoAnalyzer_cff')

diff --git a/HeavyIonsAnalysis/JetAnalysis/test/runForestAOD_pponAA_MB_103X.py b/HeavyIonsAnalysis/JetAnalysis/test/runForestAOD_pponAA_MB_103X.py
@@ -90,9 +90,14 @@
 process.akPu4Calocorr.payload = "AK4Calo"
 process.akPu4PFcorr.payload = "AK4PF"
 process.akCs4PFcorr.payload = "AK4PF"
+process.akFlowPuCs4PFcorr.payload = "AK4PF"
+process.akPu3Calocorr.payload = "AK4Calo"
+process.akPu3PFcorr.payload = "AK3PF"
+process.akCs3PFcorr.payload = "AK3PF"
+process.akFlowPuCs3PFcorr.payload = "AK3PF"
+process.akPu3PFJets.jetPtMin = 1
 process.akPu4PFJets.jetPtMin = 1
 
-
 process.load('HeavyIonsAnalysis.JetAnalysis.hiFJRhoAnalyzer_cff')
 process.load("HeavyIonsAnalysis.JetAnalysis.pfcandAnalyzer_cfi")
 process.pfcandAnalyzer.doTrackMatching  = cms.bool(True)

diff --git a/HeavyIonsAnalysis/JetAnalysis/test/runForestAOD_pponAA_MIX_103X.py b/HeavyIonsAnalysis/JetAnalysis/test/runForestAOD_pponAA_MIX_103X.py
@@ -91,6 +91,13 @@
 process.akPu4PFcorr.payload = "AK4PF"
 process.akCs4PFcorr.payload = "AK4PF"
 process.ak4PFcorr.payload = "AK4PF"
+process.akFlowPuCs4PFcorr.payload = "AK4PF"
+process.akPu3Calocorr.payload = "AK4Calo"
+process.akPu3PFcorr.payload = "AK3PF"
+process.akCs3PFcorr.payload = "AK3PF"
+process.ak3PFcorr.payload = "AK3PF"
+process.akFlowPuCs3PFcorr.payload = "AK3PF"
+process.akPu3PFJets.jetPtMin = 1
 process.akPu4PFJets.jetPtMin = 1
 
 

diff --git a/RecoHI/HiJetAlgos/src/ParametrizedSubtractor.cc b/RecoHI/HiJetAlgos/src/ParametrizedSubtractor.cc
@@ -77,7 +77,6 @@ void ParametrizedSubtractor::setupGeometryMap(edm::Event& iEvent,const edm::Even
       for(std::vector<DetId>::const_iterator did=alldid.begin(); did != alldid.end(); did++){
 	 if( (*did).det() == DetId::Hcal ){
 	    HcalDetId hid = HcalDetId(*did);
-	    if( (hid).depth() == 1 ) {
 	       allgeomid_.push_back(*did);
 
 	       if((hid).ieta() != ietaold){
@@ -89,7 +88,6 @@ void ParametrizedSubtractor::setupGeometryMap(edm::Event& iEvent,const edm::Even
 	       else{
 		  geomtowers_[(hid).ieta()]++;
 	       }
-	    }
 	 }
       }
    }

diff --git a/RecoJets/JetProducers/src/PileUpSubtractor.cc b/RecoJets/JetProducers/src/PileUpSubtractor.cc
@@ -73,7 +73,6 @@ void PileUpSubtractor::setupGeometryMap(edm::Event& iEvent,const edm::EventSetup
     for(std::vector<DetId>::const_iterator did=alldid.begin(); did != alldid.end(); did++){
       if( (*did).det() == DetId::Hcal ){
         HcalDetId hid = HcalDetId(*did);
-        if( (hid).depth() == 1 ) {
 	  allgeomid_.push_back(*did);
 
           if((hid).ieta() != ietaold){
@@ -85,7 +84,6 @@ void PileUpSubtractor::setupGeometryMap(edm::Event& iEvent,const edm::EventSetup
           else{
             geomtowers_[(hid).ieta()]++;
           }
-        }
       }
     }
   }