Merge branch 'cherry-pick-87cfb539' into '21.0'

Merge branch 'cherry-pick-29526907' into '21.1'

See merge request !2435

Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_AllSlices.py

@@ -11,10 +11,10 @@ from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
 
 #set athenaCommonFlags.FilesInput to be able to use this job options standalone without RTT
 
-if athenaCommonFlags.FilesInput()==[]:
-  athenaCommonFlags.FilesInput=[
-    "root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000001.pool.root.1",
-  ]
+#if athenaCommonFlags.FilesInput()==[]:
+#  athenaCommonFlags.FilesInput=[
+#    "root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000001.pool.root.1",
+#  ]
 
 
 rMC = False

Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_BeamspotSlice.py

@@ -13,10 +13,10 @@ from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
 #set athenaCommonFlags.FilesInput to be able to use this job options standalone without RTT
 #secondSet of files can be activated by the if statement below 
 
-if athenaCommonFlags.FilesInput()==[]:
-  athenaCommonFlags.FilesInput=[
-    "root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000001.pool.root.1",
-    ]
+#if athenaCommonFlags.FilesInput()==[]:
+#  athenaCommonFlags.FilesInput=[
+#    "root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000001.pool.root.1",
+#    ]
 
 include("TrigInDetValidation/TrigInDetValidation_RTT_Chains.py")
 

Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_BjetSlice.py

@@ -13,10 +13,10 @@ from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
 #set athenaCommonFlags.FilesInput to be able to use this job options standalone without RTT
 #secondSet of files can be activated by the if statement below 
 
-if athenaCommonFlags.FilesInput()==[]:
-  athenaCommonFlags.FilesInput=[
-    "root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000001.pool.root.1",
-    ]
+#if athenaCommonFlags.FilesInput()==[]:
+#  athenaCommonFlags.FilesInput=[
+#    "root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000001.pool.root.1",
+#    ]
 
 include("TrigInDetValidation/TrigInDetValidation_RTT_Chains.py")
 

Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_ElectronSlice.py

@@ -12,10 +12,10 @@ from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
 #set athenaCommonFlags.FilesInput to be able to use this job options standalone without RTT
 #second set of files can be activated by the if statement below 
 
-if athenaCommonFlags.FilesInput()==[]:
-  athenaCommonFlags.FilesInput=[
-    "root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000001.pool.root.1"
-    ]
+#if athenaCommonFlags.FilesInput()==[]:
+#  athenaCommonFlags.FilesInput=[
+#    "root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000001.pool.root.1"
+#    ]
 
 include("TrigInDetValidation/TrigInDetValidation_RTT_Chains.py")
 

Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_MonitorSlice.py

@@ -10,10 +10,10 @@
 #==============================================================
 from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
 
-if athenaCommonFlags.FilesInput()==[]:
-  athenaCommonFlags.FilesInput=[
-       "root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361036.Pythia8_A2MSTW2008LO_minbias_inelastic.recon.RDO.e3580_s2726_r7011/RDO.07344311._000057.pool.root.1"
-       ]
+#if athenaCommonFlags.FilesInput()==[]:
+#  athenaCommonFlags.FilesInput=[
+#       "root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361036.Pythia8_A2MSTW2008LO_minbias_inelastic.recon.RDO.e3580_s2726_r7011/RDO.07344311._000057.pool.root.1"
+#       ]
 
 from TriggerMenu import useNewTriggerMenu
 use_new_tm = useNewTriggerMenu()

Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_MuonSlice.py

@@ -12,10 +12,10 @@ from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
 #set athenaCommonFlags.FilesInput to be able to use this job options standalone without RTT
 #secondSet of files can be activated by the if statement below 
 
-if athenaCommonFlags.FilesInput()==[]:
-  athenaCommonFlags.FilesInput=[
-      "root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu.recon.RDO.e3601_s2576_s2132_r7143/RDO.06718162._000013.pool.root.1"
-    ]
+#if athenaCommonFlags.FilesInput()==[]:
+#  athenaCommonFlags.FilesInput=[
+#      "root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu.recon.RDO.e3601_s2576_s2132_r7143/RDO.06718162._000013.pool.root.1"
+#    ]
 
 ###XMLDataSet='TrigInDetValidation_mu_single_mu_100' # <-- RTT jobID
 

Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_TauSlice.py

@@ -6,10 +6,10 @@
 from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
 
 
-if athenaCommonFlags.FilesInput()==[]:
-  athenaCommonFlags.FilesInput=[
-    "root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.recon.RDO.e3601_s2757_r7245/RDO.06885566._001556.pool.root.1"    
-       ]
+#if athenaCommonFlags.FilesInput()==[]:
+#  athenaCommonFlags.FilesInput=[
+#    "root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.recon.RDO.e3601_s2757_r7245/RDO.06885566._001556.pool.root.1"    
+#       ]
 
 include("TrigInDetValidation/TrigInDetValidation_RTT_Chains.py")
 

Trigger/TrigValidation/TrigInDetValidation/utils/update

@@ -62,7 +62,7 @@ foreach job ( $BASE/* )
     echo "eos testfile:   $testfile"
     cd $DIR
     cp -v $eosdir/$testfile /tmp/data-$jobid-reference.root
-    TIDAmakeSmallRefFile /tmp/data-$jobid-reference.root share/$PROJECT/data-$jobid-reference.root >& $jobid.log
+    TIDAmakeSmallRefFile.exe /tmp/data-$jobid-reference.root share/$PROJECT/data-$jobid-reference.root >& $jobid.log
     rm /tmp/data-$jobid-reference.root
    endif