Skip to content
Snippets Groups Projects
Commit 1c7175c1 authored by Olga Igonkina's avatar Olga Igonkina Committed by Julie Kirk
Browse files

Merge branch 'TIDV-rev6' into '21.1-dev'

Tidy up TIDV RTT tests

See merge request !2179
parent 7419e6a1
No related branches found
No related tags found
No related merge requests found
Showing
with 156 additions and 31 deletions
...@@ -195,6 +195,7 @@ testChains = { ...@@ -195,6 +195,7 @@ testChains = {
"HLT_beamspot_allTE_trkfast:InDetTrigTrackingxAODCnv_BeamSpot_FTF", "HLT_beamspot_allTE_trkfast:InDetTrigTrackingxAODCnv_BeamSpot_FTF",
"HLT_beamspot_allTE_FTK:InDetTrigTrackingxAODCnv_BeamSpot_FTK", "HLT_beamspot_allTE_FTK:InDetTrigTrackingxAODCnv_BeamSpot_FTK",
"HLT_beamspot_allTE_FTKRefit:InDetTrigTrackingxAODCnv_BeamSpot_FTKRefit",
"HLT_beamspot_idperf_FTK:InDetTrigTrackingxAODCnv_BeamSpot_FTKMon", "HLT_beamspot_idperf_FTK:InDetTrigTrackingxAODCnv_BeamSpot_FTKMon",
"HLT_beamspot_idperf_FTK:InDetTrigTrackingxAODCnv_BeamSpot_FTF" "HLT_beamspot_idperf_FTK:InDetTrigTrackingxAODCnv_BeamSpot_FTF"
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</arg> </arg>
<arg> <arg>
<argname>exeParamString</argname> <argname>exeParamString</argname>
<argvalue>data-beamspot-FTK.root data-FTK_beamspot_ttbar-reference.root HLT_beamspot_allTE_trkfast_InDetTrigTrackingxAODCnv_BeamSpot_FTF HLT_beamspot_idperf_FTK_InDetTrigTrackingxAODCnv_BeamSpot_FTKMon -d HLTL2-plots </argvalue> <argvalue>data-beamspot-FTK.root data-FTK_beamspot_ttbar-reference.root HLT_beamspot_allTE_trkfast_InDetTrigTrackingxAODCnv_BeamSpot_FTF HLT_beamspot_idperf_FTK_InDetTrigTrackingxAODCnv_BeamSpot_FTKMon HLT_beamspot_allTE_FTKRefit_InDetTrigTrackingxAODCnv_BeamSpot_FTKRefit -d HLTL2-plots </argvalue>
</arg> </arg>
</action> </action>
......
...@@ -30,11 +30,11 @@ ...@@ -30,11 +30,11 @@
# include "TrigInDetValidation_all_ttbar_pu40.xml" # include "TrigInDetValidation_all_ttbar_pu40.xml"
# include "TrigInDetValidation_all_ttbar_pu46.xml" <!-- # include "TrigInDetValidation_all_ttbar_pu46.xml" -->
# include "TrigInDetValidation_all_ttbar_pu80.xml" # include "TrigInDetValidation_all_ttbar_pu80.xml"
# include "TrigInDetValidation_beamspot_ttbar_pu46.xml" # include "TrigInDetValidation_beamspot_ttbar_pu40.xml"
# include "TrigInDetValidation_beamspot_ttbar_pu46_zfinder.xml" # include "TrigInDetValidation_beamspot_ttbar_pu40_zfinder.xml"
# include "TrigInDetValidation_beamspot_ttbar_pu80_zfinder.xml" # include "TrigInDetValidation_beamspot_ttbar_pu80_zfinder.xml"
# include "TrigInDetValidation_el_Jpsiee_pu40.xml" # include "TrigInDetValidation_el_Jpsiee_pu40.xml"
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<!-- # 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_pu40_offline.xml"
# include "TrigInDetValidation_bjet_IBL_pu46.xml" <!-- # include "TrigInDetValidation_bjet_IBL_pu46.xml" -->
# include "TrigInDetValidation_bjet_IBL_pu80.xml" # include "TrigInDetValidation_bjet_IBL_pu80.xml"
# include "TrigInDetValidation_bjet_IBL_pu40_2016config.xml" # include "TrigInDetValidation_bjet_IBL_pu40_2016config.xml"
......
<athena trendId='all_pu40' userJobId='TrigInDetValidation_beamspot_ttbar_pu40'>
<doc>BeamSpot slice, ttbar events, pu40, run2 chains</doc>
<displayName>BeamSpot slice, ttbar, pu40, run2 chains</displayName>
<commandLineFlags>EventMax=1000;runMergedChain=True;rec.doFloatingPointException.set_Value_and_Lock(False)</commandLineFlags>
<options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BeamspotSlice</options>
<package>Trigger/TrigValidation/TrigInDetValidation</package>
<group>TrigInDetValidation</group>
<queue>long</queue>
# include "samples/TrigInDetValidation_ttbar_sample2.xml"
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
<argvalue>TIDArdict.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
<argvalue>TIDAdata11-rtt.dat -f data-all.root -b Test_bin.dat </argvalue>
</arg>
</action>
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
<argvalue>TIDArun.sh</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
<argvalue>data-all.root data-beamspot_ttbar_pu40-reference.root HLT_beamspot_allTE_trkfast_InDetTrigTrackingxAODCnv_BeamSpot_FTF -d HLTL2-test-plots </argvalue>
</arg>
</action>
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
<testToRemove>
<jobGroupName>RTT:Top</jobGroupName>
<testidentifier>CheckFileRunner0</testidentifier>
</testToRemove>
# include "TrigInDetValidation_aux.xml"
<athenaCommonFlags /><alwaysRunPostProc />
</athena>
<athena trendId='all_pu40' userJobId='TrigInDetValidation_beamspot_ttbar_pu40_zfinder'>
<doc>BeamSpot slice, ttbar events, pu40, run2 chains</doc>
<displayName>BeamSpot slice, ttbar, pu40, run2 chains</displayName>
<commandLineFlags>EventMax=1000;runMergedChain=True;fastZFinder=True;rec.doFloatingPointException.set_Value_and_Lock(False)</commandLineFlags>
<options>TrigInDetValidation/TrigInDetValidation_RTT_topOptions_BeamspotSlice</options>
<package>Trigger/TrigValidation/TrigInDetValidation</package>
<group>TrigInDetValidation</group>
<queue>long</queue>
# include "samples/TrigInDetValidation_ttbar_sample2.xml"
<action position="01">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
<argvalue>TIDArdict.exe</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
<argvalue>TIDAdata11-rtt.dat -f data-all.root -b Test_bin.dat </argvalue>
</arg>
</action>
<action position="02">
<modulename>RttLibraryTools</modulename>
<testname>ExeRunner</testname>
<arg>
<argname>exeName</argname>
<argvalue>TIDArun.sh</argvalue>
</arg>
<arg>
<argname>exeParamString</argname>
<argvalue>data-all.root data-beamspot_ttbar_pu40_zfinder-reference.root HLT_beamspot_allTE_trkfast_InDetTrigTrackingxAODCnv_BeamSpot_FTF -d HLTL2-test-plots </argvalue>
</arg>
</action>
# include "TrigInDetValidation_expertMonitoring.xml"
# include "TrigInDetValidation_costMonitoring.xml"
# include "TrigInDetValidation_extra.xml"
<testToRemove>
<jobGroupName>RTT:Top</jobGroupName>
<testidentifier>CheckFileRunner0</testidentifier>
</testToRemove>
# include "TrigInDetValidation_aux.xml"
<athenaCommonFlags /><alwaysRunPostProc />
</athena>
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<group>TrigInDetValidation</group> <group>TrigInDetValidation</group>
<queue>long</queue> <queue>long</queue>
# include "samples/TrigInDetValidation_ttbar_sample1.xml" # include "samples/TrigInDetValidation_ttbar_sample2.xml"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<group>TrigInDetValidation</group> <group>TrigInDetValidation</group>
<queue>long</queue> <queue>long</queue>
# include "samples/TrigInDetValidation_ttbar_sample1.xml" # include "samples/TrigInDetValidation_ttbar_sample2.xml"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<group>TrigInDetValidation</group> <group>TrigInDetValidation</group>
<queue>long</queue> <queue>long</queue>
# include "samples/TrigInDetValidation_ttbar_sample1.xml" # include "samples/TrigInDetValidation_ttbar_sample2.xml"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<group>TrigInDetValidation</group> <group>TrigInDetValidation</group>
<queue>long</queue> <queue>long</queue>
# include "samples/TrigInDetValidation_ttbar_sample1.xml" # include "samples/TrigInDetValidation_ttbar_sample2.xml"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<group>TrigInDetValidation</group> <group>TrigInDetValidation</group>
<queue>long</queue> <queue>long</queue>
# include "samples/TrigInDetValidation_ttbar_sample1.xml" # include "samples/TrigInDetValidation_ttbar_sample2.xml"
<action position="01"> <action position="01">
<modulename>RttLibraryTools</modulename> <modulename>RttLibraryTools</modulename>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<group>TrigInDetValidation</group> <group>TrigInDetValidation</group>
<queue>long</queue> <queue>long</queue>
# include "samples/TrigInDetValidation_ttbar_sample1.xml" # include "samples/TrigInDetValidation_ttbar_sample2.xml"
<action position="01"> <action position="01">
<modulename>RttLibraryTools</modulename> <modulename>RttLibraryTools</modulename>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<group>TrigInDetValidation</group> <group>TrigInDetValidation</group>
<queue>long</queue> <queue>long</queue>
# include "samples/TrigInDetValidation_ttbar_sample1.xml" # include "samples/TrigInDetValidation_ttbar_sample2.xml"
<action position="01"> <action position="01">
<modulename>RttLibraryTools</modulename> <modulename>RttLibraryTools</modulename>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<group>TrigInDetValidation</group> <group>TrigInDetValidation</group>
<queue>long</queue> <queue>long</queue>
# include "samples/TrigInDetValidation_ttbar_sample1.xml" # include "samples/TrigInDetValidation_ttbar_sample2.xml"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<group>TrigInDetValidation</group> <group>TrigInDetValidation</group>
<queue>long</queue> <queue>long</queue>
# include "samples/TrigInDetValidation_ttbar_sample1.xml" # include "samples/TrigInDetValidation_ttbar_sample2.xml"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<group>TrigInDetValidation</group> <group>TrigInDetValidation</group>
<queue>long</queue> <queue>long</queue>
# include "samples/TrigInDetValidation_ttbar_sample1.xml" # include "samples/TrigInDetValidation_ttbar_sample2.xml"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<group>TrigInDetValidation</group> <group>TrigInDetValidation</group>
<queue>long</queue> <queue>long</queue>
# include "samples/TrigInDetValidation_ttbar_sample1.xml" # include "samples/TrigInDetValidation_ttbar_sample2.xml"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<group>TrigInDetValidation</group> <group>TrigInDetValidation</group>
<queue>long</queue> <queue>long</queue>
# include "samples/TrigInDetValidation_ttbar_sample1.xml" # include "samples/TrigInDetValidation_ttbar_sample2.xml"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<group>TrigInDetValidation</group> <group>TrigInDetValidation</group>
<queue>long</queue> <queue>long</queue>
# include "samples/TrigInDetValidation_ttbar_sample2.xml" # include "samples/TrigInDetValidation_ttbar_sample1.xml"
......
<dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.valid1.110401.ttbar.RDO_FTK.july28.64tower.PCM101.FixEndcapFalse.e3099_s2578_r7579.redoNov1_EXT2/user.jahreda.9778320.EXT2._000010.RDO_FTK.root</dataset> <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.digit.RDO_FTK.e4993_s2887_r8937_r9119/RDO_FTK.10733709._000015.pool.root.1</dataset>
<dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.valid1.110401.ttbar.RDO_FTK.july28.64tower.PCM101.FixEndcapFalse.e3099_s2578_r7579.redoNov1_EXT2/user.jahreda.9778320.EXT2._000017.RDO_FTK.root</dataset> <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.digit.RDO_FTK.e4993_s2887_r8937_r9119/RDO_FTK.10733709._000020.pool.root.1</dataset>
<dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.valid1.110401.ttbar.RDO_FTK.july28.64tower.PCM101.FixEndcapFalse.e3099_s2578_r7579.redoNov1_EXT2/user.jahreda.9778320.EXT2._000031.RDO_FTK.root</dataset> <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.digit.RDO_FTK.e4993_s2887_r8937_r9119/RDO_FTK.10733709._000023.pool.root.1</dataset>
<dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.valid1.110401.ttbar.RDO_FTK.july28.64tower.PCM101.FixEndcapFalse.e3099_s2578_r7579.redoNov1_EXT2/user.jahreda.9778320.EXT2._000039.RDO_FTK.root</dataset> <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.digit.RDO_FTK.e4993_s2887_r8937_r9119/RDO_FTK.10733709._000027.pool.root.1</dataset>
<dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.valid1.110401.ttbar.RDO_FTK.july28.64tower.PCM101.FixEndcapFalse.e3099_s2578_r7579.redoNov1_EXT2/user.jahreda.9778320.EXT2._000049.RDO_FTK.root</dataset> <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.digit.RDO_FTK.e4993_s2887_r8937_r9119/RDO_FTK.10733709._000031.pool.root.1</dataset>
<dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.valid1.110401.ttbar.RDO_FTK.july28.64tower.PCM101.FixEndcapFalse.e3099_s2578_r7579.redoNov1_EXT2/user.jahreda.9778320.EXT2._000063.RDO_FTK.root</dataset> <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.digit.RDO_FTK.e4993_s2887_r8937_r9119/RDO_FTK.10733709._000035.pool.root.1</dataset>
<dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.valid1.110401.ttbar.RDO_FTK.july28.64tower.PCM101.FixEndcapFalse.e3099_s2578_r7579.redoNov1_EXT2/user.jahreda.9778320.EXT2._000079.RDO_FTK.root</dataset> <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.digit.RDO_FTK.e4993_s2887_r8937_r9119/RDO_FTK.10733709._000051.pool.root.1</dataset>
<dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.valid1.110401.ttbar.RDO_FTK.july28.64tower.PCM101.FixEndcapFalse.e3099_s2578_r7579.redoNov1_EXT2/user.jahreda.9778320.EXT2._000082.RDO_FTK.root</dataset> <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.digit.RDO_FTK.e4993_s2887_r8937_r9119/RDO_FTK.10733709._000055.pool.root.1</dataset>
<dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.valid1.110401.ttbar.RDO_FTK.july28.64tower.PCM101.FixEndcapFalse.e3099_s2578_r7579.redoNov1_EXT2/user.jahreda.9778320.EXT2._000091.RDO_FTK.root</dataset> <dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.digit.RDO_FTK.e4993_s2887_r8937_r9119/RDO_FTK.10733709._000072.pool.root.1</dataset>
<dataset>/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/user.jahreda.valid1.110401.ttbar.RDO_FTK.july28.64tower.PCM101.FixEndcapFalse.e3099_s2578_r7579.redoNov1_EXT2/user.jahreda.9778320.EXT2._000094.RDO_FTK.root</dataset>
...@@ -215,14 +215,15 @@ def beamspotChains(runMergedChain, doIDNewTracking, doFTK): ...@@ -215,14 +215,15 @@ def beamspotChains(runMergedChain, doIDNewTracking, doFTK):
idTrigChainlist.append(['beamspot_allTE_trkfast', 'L1_4J15', [], ['Main'], ['RATE:BeamSpot', 'BW:BeamSpot'], 1]) idTrigChainlist.append(['beamspot_allTE_trkfast', 'L1_4J15', [], ['Main'], ['RATE:BeamSpot', 'BW:BeamSpot'], 1])
if doFTK: if doFTK:
idTrigChainlist.append(['beamspot_allTE_FTK', 'L1_4J15', [], ['Main'], ['RATE:BeamSpot', 'BW:BeamSpot'], 1]) idTrigChainlist.append(['beamspot_allTE_FTK', 'L1_4J15', [], ['Main'], ['RATE:BeamSpot', 'BW:BeamSpot'], 1])
idTrigChainlist.append(['beamspot_allTE_FTKRefit', 'L1_4J15', [], ['Main'], ['RATE:BeamSpot', 'BW:BeamSpot'], 1])
idTrigChainlist.append(['beamspot_idperf_FTK', 'L1_4J15', [], ['Main'], ['RATE:BeamSpot', 'BW:BeamSpot'], 1]) idTrigChainlist.append(['beamspot_idperf_FTK', 'L1_4J15', [], ['Main'], ['RATE:BeamSpot', 'BW:BeamSpot'], 1])
tidaAnalysischains += [ tidaAnalysischains += [
'HLT_beamspot_allTE_L2StarB:TrigL2SiTrackFinder_BeamSpotB', 'HLT_beamspot_allTE_L2StarB:TrigL2SiTrackFinder_BeamSpotB',
'HLT_beamspot_allTE_trkfast:TrigFastTrackFinder_BeamSpot_IDTrig', 'HLT_beamspot_allTE_trkfast:TrigFastTrackFinder_BeamSpot_IDTrig',
'HLT_beamspot_allTE_trkfast:InDetTrigTrackingxAODCnv_BeamSpot_FTF', 'HLT_beamspot_allTE_trkfast:InDetTrigTrackingxAODCnv_BeamSpot_FTF',
'HLT_beamspot_allTE_FTK:InDetTrigTrackingxAODCnv_BeamSpot_FTK', 'HLT_beamspot_allTE_FTK:InDetTrigTrackingxAODCnv_BeamSpot_FTK',
'HLT_beamspot_allTE_FTKRefit:InDetTrigTrackingxAODCnv_BeamSpot_FTKRefit',
'HLT_beamspot_idperf_FTK:InDetTrigTrackingxAODCnv_BeamSpot_FTKMon', 'HLT_beamspot_idperf_FTK:InDetTrigTrackingxAODCnv_BeamSpot_FTKMon',
'HLT_beamspot_idperf_FTK:InDetTrigTrackingxAODCnv_BeamSpot_FTF', 'HLT_beamspot_idperf_FTK:InDetTrigTrackingxAODCnv_BeamSpot_FTF',
] ]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment