diff --git a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
index e0fb1c1c247d94f478983ecbfc1a3ff659170233..29916149dada9c860d179e9d5abd04c6433a5117 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
@@ -74,10 +74,7 @@ class TrigInDetReco(ExecStep):
     def configure(self, test):
         chains = '['
         flags = ''
-        lrt = False
         for i in self.slices:
-            if ('LRT' in i):
-                lrt = True
             if (i=='L2muonLRT') :
                 chains += "'HLT_mu6_LRT_idperf_l2lrt_L1MU6',"
                 chains += "'HLT_mu6_idperf_L1MU6',"
@@ -110,15 +107,15 @@ class TrigInDetReco(ExecStep):
             if (i=='minbias') :
                 chains += "'HLT_mb_sptrk_L1RD0_FILLED',"
                 flags  += "doMinBiasSlice=True;setMenu='LS2_v1';"
-
+            if (i=='cosmic') :
+                chains += "'HLT_mu4_cosmic_L1MU4_EMPTY'"
+                flags  += "doMuonSlice=True;setMenu='Cosmic_run3_v1';"
         if ( flags=='' ) : 
             print( "ERROR: no chains configured" )
 
         chains += ']'
         self.preexec_trig = 'doEmptyMenu=True;'+flags+'selectChains='+chains
 
-        if (lrt):
-            self.preexec_all += ';from InDetRecExample.InDetJobProperties import InDetFlags; InDetFlags.doR3LargeD0.set_Value_and_Lock(True);InDetFlags.storeSeparateLargeD0Container.set_Value_and_Lock(False)'
 
         if (self.release == 'current'):
             print( "Using current release for offline Reco steps  " )
@@ -145,9 +142,9 @@ class TrigInDetReco(ExecStep):
         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)
+            self.args += ' --postInclude "{:s}" '.format(self.postinclude_trig)
         if (self.preinclude_trig != ''):
-            self.args += ' --preInclude "RDOtoRDOTrigger:{:s}" '.format(self.preinclude_trig)
+            self.args += ' --preInclude "{:s}" '.format(self.preinclude_trig)
         super(TrigInDetReco, self).configure(test)
 
 
@@ -156,7 +153,7 @@ class TrigInDetReco(ExecStep):
 ##################################################
 
 class TrigInDetAna(ExecStep):
-    def __init__(self, name='TrigInDetAna', extra=None):
+    def __init__(self, name='TrigInDetAna', extraArgs=None):
         ExecStep.__init__(self, name )
         self.type = 'athena'
         self.job_options = 'TrigInDetValidation/TrigInDetValidation_AODtoTrkNtuple.py'
@@ -167,8 +164,9 @@ class TrigInDetAna(ExecStep):
         self.input = ''
         self.perfmon=False
         self.imf=False
-        if extra is not None:
-            self.args = extra
+        if extraArgs is not None:
+            self.args = extraArgs
+
 
 ##################################################
 # Additional exec (athena) steps - RDO to CostMonitoring
diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TIDAlrt_preinclude.py b/Trigger/TrigValidation/TrigInDetValidation/share/TIDAlrt_preinclude.py
new file mode 100644
index 0000000000000000000000000000000000000000..c768b77fbafed26a28ce502f5b6654f589a68c33
--- /dev/null
+++ b/Trigger/TrigValidation/TrigInDetValidation/share/TIDAlrt_preinclude.py
@@ -0,0 +1,11 @@
+
+from AthenaCommon.Logging import logging 
+log = logging.getLogger("TrigInDetValidation")
+
+log.info( "preinclude: TIDAlrt_preinclude.py" ) 
+
+from InDetRecExample.InDetJobProperties import InDetFlags
+InDetFlags.doR3LargeD0.set_Value_and_Lock(True)
+InDetFlags.storeSeparateLargeD0Container.set_Value_and_Lock(False)
+
+
diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py
index 440529279fe9c67dfe98a1517c95fcb7a08ead78..8127a5336b54b4ecb3cfc378c79104caa8539302 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py
@@ -108,11 +108,9 @@ test = Test.Test()
 test.art_type = Art_type
 
 
-if 'Extra' not in locals() :
-    Extra = None
-
-aod_to_ntup = TrigInDetAna(extra=Extra)
-
+if 'ExtraAna' not in locals() :
+    ExtraAna = None
+aod_to_ntup = TrigInDetAna(extraArgs = ExtraAna)
 
 
 rdo_to_cost = TrigCostStep()
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_nopps_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_nopps_pu40.py
index d881c3ff9b55b75f64c9146de4e855775ead92b9..ef7be3e6b4b68b65f269716a2c2a9837f6235645 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_nopps_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_nopps_pu40.py
@@ -33,7 +33,7 @@ Slices = ['bjet']
 Events  = 4000
 Threads = 8 
 Slots   = 8
-postinclude_file = 'dopps.py'
+postinclude_file = 'RDOtoRDOTrigger:dopps.py'
 Input = 'ttbar_ID'    # defined in TrigValTools/share/TrigValInputs.json  
 
 Jobs = [ ( "Truth",       " TIDAdata-run3.dat                    -o data-hists.root" ),
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_clones_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_clones_pu40.py
index 3f62978228722689932dd804d9fc2b08d3f49b19..dd4239faa4f38c5181af8f24d7aff5e58e881d51 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_clones_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_clones_pu40.py
@@ -34,7 +34,7 @@ Slots   = 8
 Input   = 'Zee_pu40'    # defined in TrigValTools/share/TrigValInputs.json
 Release = "current"
 GridFiles = True
-postinclude_file = "TrigInDetValidation/TIDAcloneremoval.py"
+postinclude_file = "RDOtoRDOTrigger:TrigInDetValidation/TIDAcloneremoval.py"
 
 Jobs = [ ( "Truth",       " TIDAdata-run3.dat                    -o data-hists.root -p 11" ),
          ( "Offline",     " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ) ]
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_ml2_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_ml2_pu40.py
index f6801bd23a5063644800bf4699cb6edcef4e9ca2..af022aa6df3b5c2e10f660b0078efdc61f212426 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_ml2_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_ml2_pu40.py
@@ -32,7 +32,7 @@ Threads = 1
 Slots   = 1 # what about the mt: 4 art directive ? nfiles: 3 ?
 Input   = 'ttbar'    # defined in TrigValTools/share/TrigValInputs.json  
 
-postinclude_file = 'TrigInDetValidation/TIDAml2_extensions.py'
+postinclude_file = 'RDOtoRDOTrigger:TrigInDetValidation/TIDAml2_extensions.py'
 
 Jobs = [ ( "Truth",       " TIDAdata-run3.dat                        -o data-hists.root" ),
          ( "Offline",     " TIDAdata-run3-offline.dat     -r Offline -o data-hists-offline.root" ),
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_ml_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_ml_pu40.py
index 2a9a6b8fe213234bdbb903ef13ea49d79a8d29aa..50951e8a65059dbf1b1cc17cd880b56607f2eaa0 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_ml_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_ml_pu40.py
@@ -32,7 +32,7 @@ Threads = 1
 Slots   = 1 # what about the mt: 4 art directive ? nfiles: 3 ?
 Input   = 'ttbar'    # defined in TrigValTools/share/TrigValInputs.json  
 
-postinclude_file = 'TrigInDetValidation/TIDAml_extensions.py'
+postinclude_file = 'RDOtoRDOTrigger:TrigInDetValidation/TIDAml_extensions.py'
 
 Jobs = [ ( "Truth",       " TIDAdata-run3.dat                        -o data-hists.root" ),
          ( "Offline",     " TIDAdata-run3-offline.dat     -r Offline -o data-hists-offline.root" ),
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_nopps_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_nopps_pu40.py
index 239bfe93dbb4c564ece5aeedaeca2aeed25fbd61..4483836d36feb480e15bf7a885aa6e60ee3aeb04 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_nopps_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_nopps_pu40.py
@@ -33,7 +33,7 @@ Slices  = ['fsjet']
 Events  = 2000 
 Threads = 8 
 Slots   = 8
-postinclude_file = 'dopps.py'
+postinclude_file = 'RDOtoRDOTrigger:dopps.py'
 Input   = 'ttbar'    # defined in TrigValTools/share/TrigValInputs.json  
 
 Jobs = [ ( "Truth",       " TIDAdata-run3.dat                        -o data-hists.root" ), 
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_vtx_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_vtx_pu40.py
index 960c33176d289c872fb6628102950b1c0ce5fe0a..20ece9fe110f7717d69b39b439ee16a665a64e5d 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_vtx_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_vtx_pu40.py
@@ -32,7 +32,7 @@ Threads = 8
 Slots   = 8
 Input   = 'ttbar'    # defined in TrigValTools/share/TrigValInputs.json  
 
-preinclude_file = "TrigInDetValidation/TIDAvtx_preinclude.py"
+preinclude_file = "RDOtoRDOTrigger:TrigInDetValidation/TIDAvtx_preinclude.py"
 
 
 Jobs = [ ( "Truth",       " TIDAdata-run3.dat                        -o data-hists.root" ), 
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_FSLRT_RHadron.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fslrt_rhadron.py
similarity index 94%
rename from Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_FSLRT_RHadron.py
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fslrt_rhadron.py
index 377c60e047e8bf062844ff2e0b11c99eb71cc3e5..5cc8ef87f51e3f2253cd77ede05df02a61b89849 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_FSLRT_RHadron.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fslrt_rhadron.py
@@ -33,7 +33,9 @@ Threads = 8
 Slots   = 8
 Input   = 'RHadron'    # defined in TrigValTools/share/TrigValInputs.json
 GridFiles = False
-Extra   = ' -c "LRT=True" '
+ExtraAna = ' -c LRT="True" '
+
+preinclude_file = 'all:TrigInDetValidation/TIDAlrt_preinclude.py'
 
 Jobs = [ ( "Truth",  " TIDAdata-run3-lrt.dat -o data-hists.root ", "Test_bin_lrt.dat" ),
          ( "Offline",    " TIDAdata-run3-offline-lrt.dat -r Offline -o data-hists-offline.root", "Test_bin_lrt.dat" ) ]
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias.py
index 104efc5ee3ae977b3430c73f6c66912c629625ff..2c53dde162040e09943149b47b3a447911530c98 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias.py
@@ -31,7 +31,7 @@ Events  = 8000
 Threads = 8 
 Slots   = 8
 Input   = 'minbias'    # defined in TrigValTools/share/TrigValInputs.json  
-Extra   = " -c 'ptmin=400' "
+ExtraAna   = " -c 'ptmin=400' "
 
 Jobs = [ ( "Truth",       " TIDAdata-run3-minbias.dat                    -o data-hists.root" ),
          ( "Offline",     " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ) ]
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_muLRT_StauStau.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mulrt_staustau.py
similarity index 94%
rename from Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_muLRT_StauStau.py
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mulrt_staustau.py
index d10c5b84080371580df03e59ea4e5cb37adac5e2..1b0c4a25336a241e180c63a1fe3c783a3974e102 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_muLRT_StauStau.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mulrt_staustau.py
@@ -33,7 +33,11 @@ Threads = 8
 Slots   = 8
 Input   = 'StauStau'    # defined in TrigValTools/share/TrigValInputs.json
 GridFiles = False
-Extra   = ' -c "LRT=True" '
+
+ExtraAna = ' -c LRT="True" '
+
+preinclude_file = 'all:TrigInDetValidation/TIDAlrt_preinclude.py'
+
 
 Jobs = [ ( "Truth",  " TIDAdata-run3-lrt.dat -o data-hists.root -p 13", "Test_bin_lrt.dat" ),
          ( "Offline",    " TIDAdata-run3-offline-lrt.dat -r Offline -o data-hists-offline.root", "Test_bin_lrt.dat" ) ]
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_muLRT_Zmumu_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mulrt_zmumu_pu40.py
similarity index 94%
rename from Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_muLRT_Zmumu_pu40.py
rename to Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mulrt_zmumu_pu40.py
index b25f6958416f1acc5dab692e7caa0ed0eb2b7e1f..f8bf734850153f64d4b197c103d1bc6ffc2d321a 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_muLRT_Zmumu_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mulrt_zmumu_pu40.py
@@ -28,13 +28,14 @@
 
 
 Slices  = ['L2muonLRT']
-Extra   = ' -c "LRT=True" ' 
 Events  = 8000 
 Threads = 8 
 Slots   = 8
 Input   = 'Zmumu_pu40'    # defined in TrigValTools/share/TrigValInputs.json
 GridFiles = True
+ExtraAna = ' -c LRT="True" '
 
+preinclude_file = 'all:TrigInDetValidation/TIDAlrt_preinclude.py'
 
 Jobs = [ ( "Truth",  " TIDAdata-run3-lrt.dat -o data-hists.root -p 13", "Test_bin_lrt.dat" ),
          ( "Offline",    " TIDAdata-run3-offline-lrt.dat -r Offline -o data-hists-offline.root", "Test_bin_lrt.dat" ) ]