Skip to content
Snippets Groups Projects
Commit 9c0c8917 authored by Tim Martin's avatar Tim Martin
Browse files

Merge branch 'cherry-pick-1da2a8e8-2' into 'master' 

Merge branch 'TIDV-review2' into 'master'

See merge request !1153

Former-commit-id: 589ee7f3
parents 7f421796 b3ea4bc8
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 79 additions and 1158 deletions
Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_TestConfiguration_main.xml
+ 8
− 6
View file @ 9c0c8917
......@@ -61,17 +61,19 @@
<!-- # include "TrigInDetValidation_bjet.xml" -->
<!-- # include "TrigInDetValidation_bjet_pu46.xml" -->
# include "TrigInDetValidation_bjet_IBL_pu40.xml"
# include "TrigInDetValidation_bjet_IBL_pu40_test.xml"
<!-- # include "TrigInDetValidation_bjet_IBL_pu40_test.xml" -->
# include "TrigInDetValidation_bjet_IBL_pu40_offline.xml"
# include "TrigInDetValidation_bjet_IBL_pu46.xml"
# include "TrigInDetValidation_bjet_IBL_pu80.xml"
# include "TrigInDetValidation_bjet_IBL_pu40_trkpt2.xml"
# include "TrigInDetValidation_bjet_IBL_pu40_super1.xml"
# include "TrigInDetValidation_bjet_IBL_pu40_super2.xml"
# include "TrigInDetValidation_bjet_IBL_pu40_super3.xml"
# include "TrigInDetValidation_bjet_IBL_pu40_super4.xml"
# include "TrigInDetValidation_bjet_IBL_pu40_2016config.xml"
<!-- # include "TrigInDetValidation_bjet_IBL_pu40_trkpt2.xml" -->
<!-- # include "TrigInDetValidation_bjet_IBL_pu40_super1.xml" -->
<!-- # include "TrigInDetValidation_bjet_IBL_pu40_super2.xml" -->
<!-- # include "TrigInDetValidation_bjet_IBL_pu40_super3.xml" -->
<!-- # include "TrigInDetValidation_bjet_IBL_pu40_super4.xml" -->
<!-- # include "TrigInDetValidation_tau_pu46.xml" -->
......
Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_all_ttbar_pu40.xml
+ 2
− 2
View file @ 9c0c8917
......@@ -127,7 +127,7 @@
</arg>
<arg>
<argname>exeParamString</argname>
<argvalue>data-all.root data-all.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 HLT_tau20_r1_idperf_InDetTrigTrackingxAODCnv_Tau_EFID -d HLTEF-plots-tau </argvalue>
<argvalue>data-all.root data-all.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 -d HLTEF-plots-tau </argvalue>
</arg>
</action>
......@@ -143,7 +143,7 @@
</arg>
<arg>
<argname>exeParamString</argname>
<argvalue>data-all.root data-all.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau20_r1_idperf_TrigL2SiTrackFinder_Tau_2 -d HLTL2-plots-tau </argvalue>
<argvalue>data-all.root data-all.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 -d HLTL2-plots-tau </argvalue>
</arg>
</action>
......
Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_all_ttbar_pu46.xml
+ 2
− 2
View file @ 9c0c8917
......@@ -127,7 +127,7 @@
</arg>
<arg>
<argname>exeParamString</argname>
<argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 HLT_tau20_r1_idperf_InDetTrigTrackingxAODCnv_Tau_EFID -d HLTEF-plots-tau </argvalue>
<argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 -d HLTEF-plots-tau </argvalue>
</arg>
</action>
......@@ -143,7 +143,7 @@
</arg>
<arg>
<argname>exeParamString</argname>
<argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau20_r1_idperf_TrigL2SiTrackFinder_Tau_2 -d HLTL2-plots-tau </argvalue>
<argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3-d HLTL2-plots-tau </argvalue>
</arg>
</action>
......
Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_all_ttbar_pu80.xml
+ 2
− 2
View file @ 9c0c8917
......@@ -127,7 +127,7 @@
</arg>
<arg>
<argname>exeParamString</argname>
<argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 HLT_tau20_r1_idperf_InDetTrigTrackingxAODCnv_Tau_EFID -d HLTEF-plots-tau </argvalue>
<argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_IDTrig HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_Tau_IDTrig_forID3 -d HLTEF-plots-tau </argvalue>
</arg>
</action>
......@@ -143,7 +143,7 @@
</arg>
<arg>
<argname>exeParamString</argname>
<argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3 HLT_tau20_r1_idperf_TrigL2SiTrackFinder_Tau_2 -d HLTL2-plots-tau </argvalue>
<argvalue>data-all.root data-all_ttbar_pu46-reference.root HLT_tau25_idperf_track_InDetTrigTrackingxAODCnv_Tau_FTF HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauCore_FTF_forID1 HLT_tau25_idperf_tracktwo_InDetTrigTrackingxAODCnv_TauIso_FTF_forID3-d HLTL2-plots-tau </argvalue>
</arg>
</action>
......
Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_tau_IBL_pu46.xml
+ 0
− 15
View file @ 9c0c8917
......@@ -57,21 +57,6 @@
</action>
<action position="04">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
<argvalue>TIDArun.sh</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
<argvalue>data-tau-IBL.root data-tau_IBL_pu46-reference.root HLT_tau29_idperf_InDetTrigTrackingxAODCnv_Tau_EFID HLT_tau20_r1_idperf_InDetTrigTrackingxAODCnv_Tau_EFID --tag EFID -d HLTEF-plots </argvalue>
</arg>
</action>
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
......
Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/TrigInDetValidation_tau_IBL_pu46_offline.xml
+ 2
− 16
View file @ 9c0c8917
......@@ -27,7 +27,7 @@
<action position="03">
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
......@@ -43,7 +43,7 @@
<action position="04">
<action position="03">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
......@@ -58,20 +58,6 @@
<action position="05">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
<argvalue>TIDArun.sh</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
<argvalue>data-tau-IBL.root data-tau_IBL_pu46_offline-reference.root HLT_tau29_idperf_InDetTrigTrackingxAODCnv_Tau_EFID HLT_tau20_r1_idperf_InDetTrigTrackingxAODCnv_Tau_EFID --tag EFID -d HLTEF-plots </argvalue>
</arg>
</action>
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
......
Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_AllSlices.py
+ 4
− 1
View file @ 9c0c8917
......@@ -67,10 +67,13 @@ if athenaCommonFlags.FilesInput()==[]:
rMC = False
rID = False
rFTK=False
rBperf=False
if 'runMergedChain' in dir() and runMergedChain==True:
rMC = True
if 'doIDNewTracking' in dir() and doIDNewTracking==True:
rID = True
if 'doBperf' in dir() and doBperf==True:
rBperf = True
tidaAnalysischains = []
......@@ -85,7 +88,7 @@ tidaAnalysischains += muonAnalysischains
(tauChainlist, tauAnalysischains) = tauChains(rMC, rID, rFTK)
tidaAnalysischains += tauAnalysischains
(bjetChainlist, bjetAnalysischains) = bjetChains(rMC, rID, rFTK)
(bjetChainlist, bjetAnalysischains) = bjetChains(rMC, rID, rFTK, rBperf)
tidaAnalysischains += bjetAnalysischains
(minBiasChainlist, minBiasAnalysischains) = minBiasChains(rMC, rID)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment