Merge branch 'master-TIDV-art3' into 'master'

Changes for TrigInDetValidation ART jobs

See merge request atlas/athena!34288

Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat

+/* emacs: this is -*- c++ -*- */
+testChains = {
+    //  "Offline",
+    //  "Muons",
+    //  "Electrons",
+    //  "Truth",
+
+
+    "HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_FTF",
+    "HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_IDTrig",
+    "HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_FTF",
+    "HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_IDTrig",
+
+    "HLT_e5_etcut_L1EM3:HLT_IDTrack_Electron_FTF",  
+    "HLT_e5_etcut_L1EM3:HLT_IDTrack_Electron_IDTrig", 
+ 
+    "HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_TauCore_FTF",
+    "HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_TauIso_FTF",
+    "HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_Tau_FTF",
+    "HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_Tau_IDTrig",
+
+    "HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20:HLT_IDTrack_Bjet_FTF",
+    "HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20:HLT_IDTrack_Bjet_IDTrig"
+
+
+}; 

Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-run3.dat

+// emacs: this is -*- c++ -*-
+
+#include "TIDAdata_cuts.dat"
+
+refChain = "Truth";
+//refChain = "Offline";
+//refChain = "Electrons";
+//refChain = "Muons";
+//refChain = "Taus";
+
+
+MinVertices = 0;
+
+
+#include "TIDAdata-chains-run3.dat"
+
+
+InitialiseFirstEvent = 1;
+
+outputFile = "data-output.root";
+DataFiles = { "TrkNtuple-0000.root"};
+//DataSets = {"./"}
+
+
+#include "TIDAbeam.dat"

Trigger/TrigValidation/TrigInDetValidation/CMakeLists.txt

@@ -10,8 +10,8 @@ find_package( requests )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
-atlas_install_joboptions( share/TrigInDetValidation_RTT_*.py )
-atlas_install_runtime( test/TrigInDetValidation_TestConfiguration.xml share/TrigInDetValidation_RTT_*.py TIDAbuild )
+atlas_install_joboptions( share/TrigInDetValidation_*.py )
+atlas_install_runtime( test/TrigInDetValidation_TestConfiguration.xml share/TrigInDetValidation_*.py TIDAbuild )
 
 atlas_install_scripts( scripts/TIDA*.py test/test*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=ATL902 )
 

Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py

@@ -7,6 +7,8 @@ Definitions of additional validation steps in Trigger ART tests relevant only fo
 The main common check steps are defined in the TrigValSteering.CheckSteps module.
 '''
 
+import os
+
 from TrigAnalysisTest.TrigAnalysisSteps import AthenaCheckerStep
 from TrigValTools.TrigValSteering.Step import Step
 
@@ -16,7 +18,7 @@ from TrigValTools.TrigValSteering.Step import Step
 
 class TrigInDetAna(AthenaCheckerStep):
     def __init__(self, name='TrigInDetAna', in_file='AOD.pool.root'):
-        AthenaCheckerStep.__init__(self, name, 'TrigInDetValidation/TrigInDetValidation_RTT_tida22.py')
+        AthenaCheckerStep.__init__(self, name, 'TrigInDetValidation/TrigInDetValidation_AODtoTrkNtuple.py')
         self.max_events=-1
         self.required = True
         self.input_file = in_file
@@ -31,12 +33,22 @@ class TrigInDetdictStep(Step):
     '''
     def __init__(self, name='TrigInDetdict'):
         super(TrigInDetdictStep, self).__init__(name)
-        self.args = 'TIDAdata11-rtt.dat -f data-hists.root -p 13 -b Test_bin.dat'
+        self.args=' '
         self.auto_report_result = True
         self.required = True
         self.executable = 'TIDArdict'
 
     def configure(self, test):
+        cmd = 'get_files TIDAdata-run3.dat'
+        os.system(cmd)
+        cmd = 'get_files TIDAdata-chains-run3.dat'
+        os.system(cmd)
+        cmd = 'get_files TIDAbeam.dat'
+        os.system(cmd)
+        cmd = 'get_files Test_bin.dat'
+        os.system(cmd)
+        cmd = 'get_files TIDAdata_cuts.dat'
+        os.system(cmd)
         super(TrigInDetdictStep, self).configure(test)
 
 

Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_grid.py

@@ -34,16 +34,24 @@ from TrigInDetValidation.TrigInDetArtSteps import TrigInDetAna, TrigInDetdictSte
 import sys,getopt
 
 try:
-    opts, args = getopt.getopt(sys.argv[1:],"l",["local"])
+    opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
 except getopt.GetoptError:
-    print("Usage: -l(--local)")
+    print("Usage:  ")
+    print("-l(--local)    run locally with input file from art eos grid-input")
+    print("-x             don't run athena or post post-processing, only plotting")
+    print("-p             run post-processing, even if -x is set")
 
 
 local=False
+exclude=False
+postproc=False
 for opt,arg in opts:
     if opt in ("-l", "--local"):
         local=True
-
+    if opt=="-x":
+        exclude=True
+    if opt=="-p":
+        postproc=True
 
 
 chains = [
@@ -107,14 +115,17 @@ rdo2aod.args += ' --preExec "RDOtoRDOTrigger:{:s};" "all:{:s};" "RAWtoESD:{:s};"
 
 test = Test.Test()
 test.art_type = 'grid'
-test.exec_steps = [rdo2aod]
-test.check_steps = CheckSteps.default_check_steps(test)
+if (not exclude):
+    test.exec_steps = [rdo2aod]
+    test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
+    test.check_steps = CheckSteps.default_check_steps(test)
 
-# Run analysis to produce TrkNtuple
-test.exec_steps.append(TrigInDetAna())
- 
 # Run Tidardict
-test.check_steps.append(TrigInDetdictStep())
+if ((not exclude) or postproc ):
+    rdict = TrigInDetdictStep()
+    rdict.args='TIDAdata-run3.dat -r Offline -f data-hists.root -b Test_bin.dat '
+    test.check_steps.append(rdict)
+
  
 # Now the comparitor steps
 comp=TrigInDetCompStep('CompareStep1')

Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_build.py

@@ -4,7 +4,25 @@
 # art-type: build
 # art-include: master/Athena
 
+import sys,getopt
 
+try:
+    opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
+except getopt.GetoptError:
+    print("Usage:  ")
+    print ("-x             don't run athena or post post-processing, only plotting")
+    print ("-p             run post-processing, even if -x is set")
+
+
+exclude=False
+postproc=False
+for opt,arg in opts:
+    if opt=="-x":
+        exclude=True
+    if opt=="-p":
+        postproc=True
+
+        
 from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
 from TrigInDetValidation.TrigInDetArtSteps import TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep
 
@@ -55,15 +73,19 @@ rdo2aod.args += ' --preExec "RDOtoRDOTrigger:{:s};" "all:{:s};" "RAWtoESD:{:s};"
 
 test = Test.Test()
 test.art_type = 'build'
-test.exec_steps = [rdo2aod]
-test.check_steps = CheckSteps.default_check_steps(test)
+if (not exclude):
+    test.exec_steps = [rdo2aod]
+    test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
+    test.check_steps = CheckSteps.default_check_steps(test)
 
-# Run analysis to produce TrkNtuple
-test.exec_steps.append(TrigInDetAna())
  
 # Run Tidardict
-test.check_steps.append(TrigInDetdictStep())
+if ((not exclude) or postproc ):
+    rdict = TrigInDetdictStep()
+    rdict.args='TIDAdata-run3.dat -f data-hists.root -p 13 -b Test_bin.dat '
+    test.check_steps.append(rdict)
  
+
 # Now the comparitor steps
 comp=TrigInDetCompStep('CompareStep1')
 comp.chains = 'HLT_mu24_idperf_InDetTrigTrackingxAODCnv_Muon_FTF'

Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_grid.py

@@ -30,19 +30,28 @@
 from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
 from TrigInDetValidation.TrigInDetArtSteps import TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep
 
-
 import sys,getopt
 
 try:
-    opts, args = getopt.getopt(sys.argv[1:],"l",["local"])
+    opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
 except getopt.GetoptError:
-    print("Usage: -l(--local)")
+    print("Usage:  ")
+    print("-l(--local)    run locally with input file from art eos grid-input")
+    print("-x             don't run athena or post post-processing, only plotting")
+    print("-p             run post-processing, even if -x is set")
 
 
 local=False
+exclude=False
+postproc=False
 for opt,arg in opts:
     if opt in ("-l", "--local"):
         local=True
+    if opt=="-x":
+        exclude=True
+    if opt=="-p":
+        postproc=True
+
 
 
 
@@ -101,14 +110,18 @@ rdo2aod.args += ' --preExec "RDOtoRDOTrigger:{:s};" "all:{:s};" "RAWtoESD:{:s};"
 
 test = Test.Test()
 test.art_type = 'grid'
-test.exec_steps = [rdo2aod]
-test.check_steps = CheckSteps.default_check_steps(test)
+if (not exclude):
+    test.exec_steps = [rdo2aod]
+    test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
+    test.check_steps = CheckSteps.default_check_steps(test)
 
-# Run analysis to produce TrkNtuple
-test.exec_steps.append(TrigInDetAna())
  
 # Run Tidardict
-test.check_steps.append(TrigInDetdictStep())
+if ((not exclude) or postproc ):
+    rdict = TrigInDetdictStep()
+    rdict.args='TIDAdata-run3.dat -f data-hists.root -p 13 -b Test_bin.dat '
+    test.check_steps.append(rdict)
+
  
 # Now the comparitor steps
 comp=TrigInDetCompStep('CompareStep1')