Merge branch 'master-TIDV-art32' into 'master'

Changes to ml seeding test in TrigInDetValidation ART tests

See merge request atlas/athena!36886

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_*.py share/Cosmic.py share/*.py )
-atlas_install_data( share/*.json)
+atlas_install_joboptions( share/*.py)
+atlas_install_data( share/*.json )
 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

@@ -22,7 +22,7 @@ from AthenaCommon.Utils.unixtools import FindFile
 
 class TrigInDetReco(ExecStep):
 
-    def __init__(self, name='TrigInDetReco', postexec_file='' ):
+    def __init__(self, name='TrigInDetReco', postinclude_file='' ):
         ExecStep.__init__(self, name)
 ##        super(TrigInDetReco, self).__init__(name)
         self.type = 'Reco_tf'
@@ -34,6 +34,7 @@ class TrigInDetReco(ExecStep):
         self.timeout = 18*3600
         self.slices = []
         self.preexec_trig = ' '
+        self.postinclude_trig = postinclude_file
         self.preexec_reco =  ';'.join([
             'from RecExConfig.RecFlags import rec',
             'rec.doForwardDet=False',
@@ -58,11 +59,6 @@ class TrigInDetReco(ExecStep):
         ])
         self.postexec_trig = "from AthenaCommon.AppMgr import ServiceMgr; ServiceMgr.AthenaPoolCnvSvc.MaxFileSizes=['tmp.RDO_TRIG=100000000000']"
 
-        if postexec_file!='' : 
-            pe_file = open( postexec_file )
-            self.postexec_trig += ";"+pe_file.read()            
-            print( "postexec_trig: ", self.postexec_trig )
-
         self.postexec_reco = "from AthenaCommon.AppMgr import ServiceMgr; ServiceMgr.AthenaPoolCnvSvc.MaxFileSizes=['tmp.ESD=100000000000']"
         self.args = '--outputAODFile=AOD.pool.root --steering="doRDO_TRIG" '
 
@@ -103,10 +99,13 @@ class TrigInDetReco(ExecStep):
         chains += ']'
         self.preexec_trig = 'doEmptyMenu=True;'+flags+'selectChains='+chains
 
+
         self.args += ' --preExec "RDOtoRDOTrigger:{:s};" "all:{:s};" "RAWtoESD:{:s};" "ESDtoAOD:{:s};"'.format(
             self.preexec_trig, self.preexec_all, self.preexec_reco, self.preexec_aod)
         if (self.postexec_trig != ' '):
             self.args += ' --postExec "RDOtoRDOTrigger:{:s};" "RAWtoESD:{:s};" '.format(self.postexec_trig, self.postexec_reco)
+        if (self.postinclude_trig != ' '):
+            self.args += ' --postInclude "RDOtoRDOTrigger:{:s}" '.format(self.postinclude_trig)
         super(TrigInDetReco, self).configure(test)
 
 

Trigger/TrigValidation/TrigInDetValidation/share/TIDAml_extensions.py

-ftf = findAlgorithm(topSequence, "TrigFastTrackFinder_JetFS")
-ftf.doSeedRedundancyCheck = True
-ftf.UseTrigSeedML  = 1 #can be 0, 1, 2, or 3, 0 means the
-# ML-based seed filtering is off
-ftf.TrigSeedML_LUT = 'trigseed_ML_medium.lut' 
-ftf.OutputLevel=DEBUG 
+ftf = findAlgorithm(topSequence, "TrigFastTrackFinder__jet")
+###  ML seeding not yet in master. This file is a placeholder until it is implemented.
+#ftf.doSeedRedundancyCheck = True
+#ftf.UseTrigSeedML  = 1 #can be 0, 1, 2, or 3, 0 means the
+## ML-based seed filtering is off
+#ftf.TrigSeedML_LUT = 'trigseed_ML_medium.lut' 
+#ftf.OutputLevel=DEBUG 
 

Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py

@@ -45,8 +45,8 @@ for opt,arg in opts:
     if opt=="-n":
         Events_local=arg
 
-if 'postexec' in dir() :
-    rdo2aod = TrigInDetReco( postexec_file=postexec )
+if 'postinclude_file' in dir() :
+    rdo2aod = TrigInDetReco( postinclude_file = postinclude_file )
 else :
     rdo2aod = TrigInDetReco()