new HLT prescale interface (cms-sw#313)

* new HLT prescale interface * remove junk * enabled for MC too Co-authored-by: Matthew Nguyen <matthew.nguyen@cern.ch>
stahlleiton · Aug 28, 2021 · ee055a2 · ee055a2
1 parent f0cac9a
commit ee055a2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/HeavyIonsAnalysis/Configuration/test/forest_miniAOD_112X_DATA.py b/HeavyIonsAnalysis/Configuration/test/forest_miniAOD_112X_DATA.py
@@ -26,7 +26,7 @@
 process.source = cms.Source("PoolSource",
     duplicateCheckMode = cms.untracked.string("noDuplicateCheck"),
     fileNames = cms.untracked.vstring(
-        "file:/afs/cern.ch/work/m/mnguyen/public/devel/forest/CMSSW_11_2_0_pre9/src/HeavyIonsAnalysis/Configuration/test/step2_PAT.root"
+        "/store/hidata/HIRun2018A/HISingleMuon/MINIAOD/PbPb18_MiniAODv1-v1/00000/00345f79-641f-4002-baf1-19ae8e83c48b.root"
     ), 
 )
 #input file produced from:
@@ -96,17 +96,16 @@
 ###############################################################################
 
 # event analysis
-# process.load('HeavyIonsAnalysis.EventAnalysis.hltanalysis_cfi')
+process.load('HeavyIonsAnalysis.EventAnalysis.hltanalysis_cfi')
 process.load('HeavyIonsAnalysis.EventAnalysis.hievtanalyzer_data_cfi')
-#process.load('HeavyIonsAnalysis.EventAnalysis.hltanalysis_cfi')
 process.load('HeavyIonsAnalysis.EventAnalysis.skimanalysis_cfi')
 #process.load('HeavyIonsAnalysis.EventAnalysis.hltobject_cfi')
 #process.load('HeavyIonsAnalysis.EventAnalysis.l1object_cfi')
 
-#from HeavyIonsAnalysis.EventAnalysis.hltobject_cfi import trigger_list_mc
-#process.hltobject.triggerNames = trigger_list_mc
+#from HeavyIonsAnalysis.EventAnalysis.hltobject_cfi import trigger_list_data
+#process.hltobject.triggerNames = trigger_list_data
 
-# process.load('HeavyIonsAnalysis.EventAnalysis.particleFlowAnalyser_cfi')
+process.load('HeavyIonsAnalysis.EventAnalysis.particleFlowAnalyser_cfi')
 ################################
 # electrons, photons, muons
 process.load('HeavyIonsAnalysis.EGMAnalysis.ggHiNtuplizer_cfi')
@@ -125,9 +124,10 @@
 # main forest sequence
 process.forest = cms.Path(
     process.HiForestInfo + 
-    # process.hltanalysis +
+    process.hltanalysis +
+    #process.hltobject +
     process.trackSequencePbPb +
-    # process.particleFlowAnalyser +
+    process.particleFlowAnalyser +
     process.hiEvtAnalyzer +
     process.ggHiNtuplizer +
     process.akCs4PFJetAnalyzer

diff --git a/HeavyIonsAnalysis/Configuration/test/forest_miniAOD_112X_MC.py b/HeavyIonsAnalysis/Configuration/test/forest_miniAOD_112X_MC.py
@@ -77,7 +77,8 @@
 ###############################################################################
 
 # event analysis
-# process.load('HeavyIonsAnalysis.EventAnalysis.hltanalysis_cfi')
+process.load('HeavyIonsAnalysis.EventAnalysis.hltanalysis_cfi')
+process.load('HeavyIonsAnalysis.EventAnalysis.particleFlowAnalyser_cfi')
 process.load('HeavyIonsAnalysis.EventAnalysis.hievtanalyzer_mc_cfi')
 #process.load('HeavyIonsAnalysis.EventAnalysis.hltanalysis_cfi')
 process.load('HeavyIonsAnalysis.EventAnalysis.skimanalysis_cfi')
@@ -110,10 +111,10 @@
 ###############################################################################
 # main forest sequence
 process.forest = cms.Path(
-    process.HiForestInfo + 
-    # process.hltanalysis +
+    process.HiForestInfo +
+    process.hltanalysis +
     process.trackSequencePbPb +
-    # process.particleFlowAnalyser +
+    process.particleFlowAnalyser +
     process.hiEvtAnalyzer +
     process.ggHiNtuplizer +
     process.akCs4PFJetAnalyzer +

diff --git a/HeavyIonsAnalysis/EventAnalysis/plugins/TriggerAnalyzer.cc b/HeavyIonsAnalysis/EventAnalysis/plugins/TriggerAnalyzer.cc
@@ -79,7 +79,7 @@ TriggerAnalyzer::TriggerAnalyzer(edm::ParameterSet const& conf)
       l1dummies(conf.getParameter<std::vector<std::string>>("l1dummybranches")),
       hltresultsToken_(consumes<edm::TriggerResults>(conf.getParameter<edm::InputTag>("hltresults"))),
       l1resultsToken_(consumes<GlobalAlgBlkBxCollection>(conf.getParameter<edm::InputTag>("l1results"))),
-      hltPrescaleProvider_(new HLTPrescaleProvider(conf, consumesCollector(), *this)) {
+      hltPrescaleProvider_(new HLTPrescaleProvider(conf.getParameter<edm::ParameterSet>("hltPSProvCfg"), consumesCollector(), *this)) {
   // open the tree file and initialize the tree
   edm::Service<TFileService> fs;
   t_ = fs->make<TTree>("HltTree", "");

diff --git a/HeavyIonsAnalysis/EventAnalysis/python/hltanalysis_cfi.py b/HeavyIonsAnalysis/EventAnalysis/python/hltanalysis_cfi.py
@@ -9,4 +9,5 @@
     l1results = cms.InputTag('gtStage2Digis'),
     hltdummybranches = dummy_branches_for_PbPb_2018_HLT,
     l1dummybranches = dummy_branches_for_PbPb_2018_L1,
+    hltPSProvCfg=cms.PSet(stageL1Trigger = cms.uint32(2)),
     )