Introduced switch doRun2

Trigger/TrigMonitoring/TrigBjetMonitoring/python/TrigBjetMonitorAlgorithm.py

@@ -112,6 +112,7 @@ def TrigBjetMonConfig(inputFlags):
     # Histograms which depend on the trigger chain
 
 
+    doRun2 = False
     AllChains = []
     for chain in bjet_triglist :
         AllChains.append(chain[2:])
@@ -136,21 +137,21 @@ def TrigBjetMonConfig(inputFlags):
             HistName = 'PVz_jet_' + chain[2:]
             if chain[0:1] == "E" :
                 BjetMonGroup.defineHistogram(HistName, title='Distribution of online zPV from jets;zPV from jets;Events',
-                                             path='Expert/'+chain[2:],xbins=200,xmin=-200.0,xmax=200.0)
+                                             path='Expert/'+chain[2:],xbins=500,xmin=-250.0,xmax=250.0)
                 # print " ==> histogram ",HistName," is defined for Expert folder"
             if chain[0:1] == "S" :
                 BjetMonGroup.defineHistogram(HistName, title='Distribution of online zPV from jets;zPV from jets;Events',
-                                             path='Shifter/'+chain[2:],xbins=200,xmin=-200.0,xmax=200.0)
+                                             path='Shifter/'+chain[2:],xbins=500,xmin=-250.0,xmax=250.0)
                 # print " ==> histogram ",HistName," is defined for Shifter folder"
 
             HistName = 'PVz_tr_' + chain[2:]
             if chain[0:1] == "E" :
                 BjetMonGroup.defineHistogram(HistName, title='Distribution of online zPV;zPV;Events',
-                                             path='Expert/'+chain[2:],xbins=200,xmin=-200.0,xmax=200.0)
+                                             path='Expert/'+chain[2:],xbins=500,xmin=-250.0,xmax=250.0)
                 # print " ==> histogram ",HistName," is defined for Expert folder"
             if chain[0:1] == "S" :
                 BjetMonGroup.defineHistogram(HistName, title='Distribution of online zPV;zPV;Events',
-                                             path='Shifter/'+chain[2:],xbins=200,xmin=-200.0,xmax=200.0)
+                                             path='Shifter/'+chain[2:],xbins=500,xmin=-250.0,xmax=250.0)
                 # print " ==> histogram ",HistName," is defined for Shifter folder"
 
             HistName = 'd0_' + chain[2:]
@@ -187,7 +188,7 @@ def TrigBjetMonConfig(inputFlags):
 
     # print " ==> In TrigBjetMonitorAlgorithm.py: AllChains list: ", AllChains
     trigBjetMonAlg.AllChains = AllChains
-
+    trigBjetMonAlg.doRun2 = doRun2
 
 
     ### STEP 6 ###
@@ -236,7 +237,11 @@ if __name__=='__main__':
     # file = '/afs/cern/ch/user/t/tamartin/public/AOD.pool.root'
     # file = '/afs/cern.ch/work/e/enagy/public/Run3TrigFeatureAccessTest_1/run/legacy.AOD.pool.root'
     # file = '/afs/cern.ch/work/e/enagy/public/GenerateAOD/AOD.pool.root'
-    file = '/eos/atlas/atlascerngroupdisk/data-art/build-output/master/Athena/x86_64-centos7-gcc8-opt/2019-09-16T2129/TrigAnalysisTest/test_trigAna_q221_RDOtoAOD_mt1_build/AOD.pool.root'
+    # file to be run w/ doRun2 = False
+    file = '/afs/cern.ch/work/e/enagy/public/GenerateAOD/Gen_MT_240919/AOD.pool.root'
+    # file to be run w/ doRun2 = True
+    # file = '/afs/cern.ch/work/e/enagy/public/GenerateAOD/Gen_ST_240919/AOD.pool.root'
+    # file = '/eos/atlas/atlascerngroupdisk/data-art/build-output/master/Athena/x86_64-centos7-gcc8-opt/2019-09-16T2129/TrigAnalysisTest/test_trigAna_q221_RDOtoAOD_mt1_build/AOD.pool.root'
     # file = '/afs/cern.ch/work/e/enagy/public/Run3TrigFeatureAccessTest_1/run/mt.AOD.pool.root'
     ConfigFlags.Input.Files = [file]
     ConfigFlags.Input.isMC = True

Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.cxx

@@ -21,10 +21,12 @@ TrigBjetMonitorAlgorithm::TrigBjetMonitorAlgorithm( const std::string& name, ISv
   ,m_muonContainerKey("Muons")
   ,m_vertexContainerKey("PrimaryVertices")
   ,m_trigDec("Trig::TrigDecisionTool/TrigDecisionTool")
+  ,m_doRun2(false)
 {
   declareProperty ("AllChains", m_allChains);
   declareProperty("MuonContainerName",m_muonContainerKey);
   declareProperty("VertexContainerName",m_vertexContainerKey);
+  declareProperty("doRun2",m_doRun2);
 }
 
 
@@ -95,7 +97,7 @@ StatusCode TrigBjetMonitorAlgorithm::fillHistograms( const EventContext& ctx ) c
     
     // Access to TrigFeature
     //    bool Run2_Access = true;
-    bool Run2_Access = false;
+    //    bool Run2_Access = false;
 
     
     if ( m_trigDecTool->isPassed(trigName) ) {
@@ -147,7 +149,8 @@ StatusCode TrigBjetMonitorAlgorithm::fillHistograms( const EventContext& ctx ) c
       // Read the TrigFeature contener
 
       // if (getTDT()->getNavigationFormat() == "TriggerElement") { // Run 2 trigger
-      if (Run2_Access) { // Run 2 trigger
+      //      if (Run2_Access) { // Run 2 trigger
+      if (m_doRun2) { // Run 2 trigger
 
 	ATH_MSG_INFO("  ===> Run 2 access to Trigger feature: " );
 	Trig::FeatureContainer fc = m_trigDec->features(trigName);

Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.h

@@ -31,5 +31,6 @@ class TrigBjetMonitorAlgorithm : public AthMonitorAlgorithm {
   SG::ReadHandleKey<xAOD::VertexContainer> m_vertexContainerKey;
   //SG::ReadHandleKey<xAOD::VertexContainer> m_vertexContainerKey {this,"PriVtxKey","HLT_EFHistoPrmVtx","Key of bjet primary vertexes"}; // Tim Martin 170919
   ToolHandle<Trig::TrigDecisionTool> m_trigDec; //!
+  bool m_doRun2;
 };
 #endif