diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat index 3ad4f02618010761c8d824b58caad17219a705c2..11153f96a2ec372b2e3e56c487961ecfa2c50471 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat @@ -6,12 +6,14 @@ testChains = { // "Truth", - "HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_FTF", + //"HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_FTF", "HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon", - "HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_IDTrig", - "HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_FTF", - "HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuonforEF", - "HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_IDTrig", + //"HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_IDTrig", + "HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_IDTrig:HLT_Roi_L2SAMuon", + //"HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_FTF", + "HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon", + //"HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_IDTrig", + "HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_IDTrig:HLT_Roi_L2SAMuonforEF", "HLT_e5_etcut_L1EM3:HLT_IDTrack_Electron_FTF", "HLT_e5_etcut_L1EM3:HLT_IDTrack_Electron_IDTrig", diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py index 5e316a7bee3649aaf1c0326d00ae54478d777c11..dce517b9b1d764e1380ec2302d8e6f789aed9ae6 100644 --- a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py +++ b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py @@ -164,8 +164,10 @@ if ( True ) : "HLT_j.*perf.*:HLT_IDTrack_Bjet_FTF", "HLT_j.*perf.*:HLT_IDTrack_Bjet_IDTrig", - "HLT_e.*_etcut.*:HLT_IDTrack_Electron_FTF", - "HLT_e.*_etcut.*:HLT_IDTrack_Electron_IDTrig", +# "HLT_e.*_etcut.*:HLT_IDTrack_Electron_FTF", +# "HLT_e.*_etcut.*:HLT_IDTrack_Electron_IDTrig", + "HLT_e.*:HLT_IDTrack_Electron_FTF", + "HLT_e.*:HLT_IDTrack_Electron_IDTrig", "HLT_tau.*_idperf.*:HLT_IDTrack_Tau_FTF", "HLT_tau.*_idperf.*:HLT_IDTrack_Tau_FTF:roi=HLT_TAURoI" diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/comparitor.json b/Trigger/TrigValidation/TrigInDetValidation/share/comparitor.json index af7d7e3118738344d004819564b6c901eda38d6e..7f835dbbfe0e56c0dd4ae53bd2d6a9fffa597043 100644 --- a/Trigger/TrigValidation/TrigInDetValidation/share/comparitor.json +++ b/Trigger/TrigValidation/TrigInDetValidation/share/comparitor.json @@ -1,20 +1,26 @@ { "L2muon":{ - "chains" : "HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_FTF" + "chains" : "HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_FTF:HLT_RoI_L2SAMuon" }, "EFmuon":{ - "chains" : "HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_FTF HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_IDTrig" + "chains" : "HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_FTF:HLT_RoI_L2SAMuon HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_IDTrig:HLT_RoI_L2SAMuonforEF" }, - "L2ele":{ + "L2muonLowpt":{ + "chains" : "HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_FTF:HLT_RoI_L2SAMuon" + }, + "EFmuonLowpt":{ + "chains" : "HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_FTF:HLT_RoI_L2SAMuon HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_IDTrig:HLT_RoI_L2SAMuonforEF" + }, + "L2electron":{ "chains" : "HLT_e17_lhvloose_nod0_L1EM15VH:HLT_IDTrack_Electron_FTF" }, - "EFele":{ + "EFelectron":{ "chains" : "HLT_e17_lhvloose_nod0_L1EM15VH:HLT_IDTrack_Electron_FTF HLT_e17_lhvloose_nod0_L1EM15VH:HLT_IDTrack_Electron_IDTrig" }, - "L2eleLowpt":{ + "L2electronLowpt":{ "chains" : "HLT_e5_etcut_L1EM3:HLT_IDTrack_Electron_FTF" }, - "EFeleLowpt":{ + "EFelectronLowpt":{ "chains" : "HLT_e5_etcut_L1EM3:HLT_IDTrack_Electron_FTF HLT_e5_etcut_L1EM3:HLT_IDTrack_Electron_IDTrig" }, "L2tau":{ diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40.py index 1d6f5b974f73d0ae1303999e79a6f453ad27d628..1e81a1f8047bb1231fb7eea8b44d298a228f7793 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40.py @@ -104,11 +104,11 @@ comp6=TrigInDetCompStep('Comp_EFtau','EF','tau') comp6.test='ttbar' test.check_steps.append(comp6) -comp7=TrigInDetCompStep('Comp_L2ele','L2','ele') +comp7=TrigInDetCompStep('Comp_L2ele','L2','electron') comp7.test='ttbar' test.check_steps.append(comp7) -comp8=TrigInDetCompStep('Comp_EFele','EF','ele') +comp8=TrigInDetCompStep('Comp_EFele','EF','electron') comp8.test='ttbar' test.check_steps.append(comp8) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40_mt.py index 2286e6774c3b6d3ce8bc4cc599b5057cf7710e45..1a109d69602acffe9819799693251de394fa7256 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40_mt.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40_mt.py @@ -104,11 +104,11 @@ comp6=TrigInDetCompStep('Comp_EFtau','EF','tau') comp6.test='ttbar' test.check_steps.append(comp6) -comp7=TrigInDetCompStep('Comp_L2ele','L2','ele') +comp7=TrigInDetCompStep('Comp_L2ele','L2','electron') comp7.test='ttbar' test.check_steps.append(comp7) -comp8=TrigInDetCompStep('Comp_EFele','EF','ele') +comp8=TrigInDetCompStep('Comp_EFele','EF','electron') comp8.test='ttbar' test.check_steps.append(comp8) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80.py index ea11adeb8acd1fd25d9f2c5598e66bdb1bd38f8e..7bcc7ded921fda77e35ccf4be737a9f8b42c1f79 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80.py @@ -104,11 +104,11 @@ comp6=TrigInDetCompStep('Comp_EFtau','EF','tau') comp6.test='ttbar' test.check_steps.append(comp6) -comp7=TrigInDetCompStep('Comp_L2ele','L2','ele') +comp7=TrigInDetCompStep('Comp_L2ele','L2','electron') comp7.test='ttbar' test.check_steps.append(comp7) -comp8=TrigInDetCompStep('Comp_EFele','EF','ele') +comp8=TrigInDetCompStep('Comp_EFele','EF','electron') comp8.test='ttbar' test.check_steps.append(comp8) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt.py index 066a3bb71dab996117a4942cabffe22bba00c916..40340a0c3a250ea705778583bb399f6df019e901 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt.py @@ -104,11 +104,11 @@ comp6=TrigInDetCompStep('Comp_EFtau','EF','tau') comp6.test='ttbar' test.check_steps.append(comp6) -comp7=TrigInDetCompStep('Comp_L2ele','L2','ele') +comp7=TrigInDetCompStep('Comp_L2ele','L2','electron') comp7.test='ttbar' test.check_steps.append(comp7) -comp8=TrigInDetCompStep('Comp_EFele','EF','ele') +comp8=TrigInDetCompStep('Comp_EFele','EF','electron') comp8.test='ttbar' test.check_steps.append(comp8) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt2.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt2.py index 2efc254f266887da848d67872a5ccac9fecb7287..6ba9a89522f8c55eb1f1d0c44d3649436844b0d9 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt2.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt2.py @@ -104,11 +104,11 @@ comp6=TrigInDetCompStep('Comp_EFtau','EF','tau') comp6.test='ttbar' test.check_steps.append(comp6) -comp7=TrigInDetCompStep('Comp_L2ele','L2','ele') +comp7=TrigInDetCompStep('Comp_L2ele','L2','electron') comp7.test='ttbar' test.check_steps.append(comp7) -comp8=TrigInDetCompStep('Comp_EFele','EF','ele') +comp8=TrigInDetCompStep('Comp_EFele','EF','electron') comp8.test='ttbar' test.check_steps.append(comp8) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt3.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt3.py index 770e0afe154c865b128abb757a52d671c4e6712b..1bdf788263d16d2d8cedb88b40dafc12e9570578 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt3.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt3.py @@ -103,11 +103,11 @@ comp6=TrigInDetCompStep('Comp_EFtau','EF','tau') comp6.test='ttbar' test.check_steps.append(comp6) -comp7=TrigInDetCompStep('Comp_L2ele','L2','ele') +comp7=TrigInDetCompStep('Comp_L2ele','L2','electron') comp7.test='ttbar' test.check_steps.append(comp7) -comp8=TrigInDetCompStep('Comp_EFele','EF','ele') +comp8=TrigInDetCompStep('Comp_EFele','EF','electron') comp8.test='ttbar' test.check_steps.append(comp8) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40.py index fc1ecdd703ad1508c9cae3676fcb3933ccb705e3..81ccb5ba4b9c5f9d5da268415225d92bcc902379 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40.py @@ -83,12 +83,34 @@ if ((not exclude) or postproc ): # Now the comparitor steps -comp=TrigInDetCompStep('Comp_L2ele','L2','ele') +comp=TrigInDetCompStep('Comp_L2ele','L2','electron') test.check_steps.append(comp) -comp2=TrigInDetCompStep('Comp_EFele','EF','ele') +comp2=TrigInDetCompStep('Comp_EFele','EF','electron') test.check_steps.append(comp2) +comp3=TrigInDetCompStep('Comp_L2eleLowpt','L2','electron',lowpt=True) +test.check_steps.append(comp3) + +comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True) +test.check_steps.append(comp4) + +comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron') +comp5.type='offl' +test.check_steps.append(comp5) + +comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron') +comp6.type='offl' +test.check_steps.append(comp6) + +comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True) +comp7.type='offl' +test.check_steps.append(comp7) + +comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True) +comp8.type='offl' +test.check_steps.append(comp8) + # CPU cost steps cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40_mt.py index 08350c1487810e3192eaab6a4abac9c2f4a6acad..46112b85709b83a1392e01d55288414e424d516c 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40_mt.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40_mt.py @@ -80,15 +80,40 @@ if ((not exclude) or postproc ): rdict = TrigInDetdictStep() rdict.args='TIDAdata-run3.dat -f data-hists.root -p 11 -b Test_bin.dat ' test.check_steps.append(rdict) + rdict2 = TrigInDetdictStep('TrigInDetDict2') + rdict2.args='TIDAdata-run3.dat -r Offline -f data-hists-offline.root -b Test_bin.dat ' + test.check_steps.append(rdict2) # Now the comparitor steps -comp=TrigInDetCompStep('Comp_L2ele','L2','ele') +comp=TrigInDetCompStep('Comp_L2ele','L2','electron') test.check_steps.append(comp) -comp2=TrigInDetCompStep('Comp_EFele','EF','ele') +comp2=TrigInDetCompStep('Comp_EFele','EF','electron') test.check_steps.append(comp2) +comp3=TrigInDetCompStep('Comp_L2eleLowpt','L2','electron',lowpt=True) +test.check_steps.append(comp3) + +comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True) +test.check_steps.append(comp4) + +comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron') +comp5.type='offl' +test.check_steps.append(comp5) + +comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron') +comp6.type='offl' +test.check_steps.append(comp6) + +comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True) +comp7.type='offl' +test.check_steps.append(comp7) + +comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True) +comp8.type='offl' +test.check_steps.append(comp8) + # CPU cost steps cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80.py index f4eaba4b53e6ad48f89b48976b0416beea98fd39..ff53bba222a46a59bcadee577f494950fcb05ec9 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80.py @@ -80,15 +80,40 @@ if ((not exclude) or postproc ): rdict = TrigInDetdictStep() rdict.args='TIDAdata-run3.dat -f data-hists.root -p 11 -b Test_bin.dat ' test.check_steps.append(rdict) + rdict2 = TrigInDetdictStep('TrigInDetDict2') + rdict2.args='TIDAdata-run3.dat -r Offline -f data-hists-offline.root -b Test_bin.dat ' + test.check_steps.append(rdict2) # Now the comparitor steps -comp=TrigInDetCompStep('Comp_L2ele','L2','ele') +comp=TrigInDetCompStep('Comp_L2ele','L2','electron') test.check_steps.append(comp) -comp2=TrigInDetCompStep('Comp_EFele','EF','ele') +comp2=TrigInDetCompStep('Comp_EFele','EF','electron') test.check_steps.append(comp2) +comp3=TrigInDetCompStep('Comp_L2eleLowpt','L2','electron',lowpt=True) +test.check_steps.append(comp3) + +comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True) +test.check_steps.append(comp4) + +comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron') +comp5.type='offl' +test.check_steps.append(comp5) + +comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron') +comp6.type='offl' +test.check_steps.append(comp6) + +comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True) +comp7.type='offl' +test.check_steps.append(comp7) + +comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True) +comp8.type='offl' +test.check_steps.append(comp8) + # CPU cost steps cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0.py index 011d84506de064b402e13533ab7277ddad12b002..5c77e74e43592298a56473f87269ac1f61feeaf8 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0.py @@ -80,15 +80,40 @@ if ((not exclude) or postproc ): rdict = TrigInDetdictStep() rdict.args='TIDAdata-run3.dat -f data-hists.root -p 11 -b Test_bin.dat ' test.check_steps.append(rdict) + rdict2 = TrigInDetdictStep('TrigInDetDict2') + rdict2.args='TIDAdata-run3.dat -r Offline -f data-hists-offline.root -b Test_bin.dat ' + test.check_steps.append(rdict2) # Now the comparitor steps -comp=TrigInDetCompStep('Comp_L2ele','L2','ele') +comp=TrigInDetCompStep('Comp_L2ele','L2','electron') test.check_steps.append(comp) -comp2=TrigInDetCompStep('Comp_EFele','EF','ele') +comp2=TrigInDetCompStep('Comp_EFele','EF','electron') test.check_steps.append(comp2) +comp3=TrigInDetCompStep('Comp_L2eleLowpt','L2','electron',lowpt=True) +test.check_steps.append(comp3) + +comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True) +test.check_steps.append(comp4) + +comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron') +comp5.type='offl' +test.check_steps.append(comp5) + +comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron') +comp6.type='offl' +test.check_steps.append(comp6) + +comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True) +comp7.type='offl' +test.check_steps.append(comp7) + +comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True) +comp8.type='offl' +test.check_steps.append(comp8) + # CPU cost steps cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_mt.py index 3860270b5b8e19e8ed6d9f6135771f16af525fa3..0803e57c112974937648e68843e8f26a339a9add 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_mt.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_mt.py @@ -80,15 +80,40 @@ if ((not exclude) or postproc ): rdict = TrigInDetdictStep() rdict.args='TIDAdata-run3.dat -f data-hists.root -p 11 -b Test_bin.dat ' test.check_steps.append(rdict) + rdict2 = TrigInDetdictStep('TrigInDetDict2') + rdict2.args='TIDAdata-run3.dat -r Offline -f data-hists-offline.root -b Test_bin.dat ' + test.check_steps.append(rdict2) # Now the comparitor steps -comp=TrigInDetCompStep('Comp_L2ele','L2','ele') +comp=TrigInDetCompStep('Comp_L2ele','L2','electron') test.check_steps.append(comp) -comp2=TrigInDetCompStep('Comp_EFele','EF','ele') +comp2=TrigInDetCompStep('Comp_EFele','EF','electron') test.check_steps.append(comp2) +comp3=TrigInDetCompStep('Comp_L2eleLowpt','L2','electron',lowpt=True) +test.check_steps.append(comp3) + +comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True) +test.check_steps.append(comp4) + +comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron') +comp5.type='offl' +test.check_steps.append(comp5) + +comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron') +comp6.type='offl' +test.check_steps.append(comp6) + +comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True) +comp7.type='offl' +test.check_steps.append(comp7) + +comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True) +comp8.type='offl' +test.check_steps.append(comp8) + # CPU cost steps cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu.py index 18857ae3b095deb7a4410f18c13a49b923154927..4ffd5df12dbfe5a744f7b06fb83419162eb9f183 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu.py @@ -83,12 +83,33 @@ if ((not exclude) or postproc ): # Now the comparitor steps -comp=TrigInDetCompStep('Comp_L2ele','L2','ele') +comp=TrigInDetCompStep('Comp_L2ele','L2','electron') test.check_steps.append(comp) -comp2=TrigInDetCompStep('Comp_EFele','EF','ele') +comp2=TrigInDetCompStep('Comp_EFele','EF','electron') test.check_steps.append(comp2) +comp3=TrigInDetCompStep('Comp_L2eleLowpt','L2','electron',lowpt=True) +test.check_steps.append(comp3) + +comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True) +test.check_steps.append(comp4) + +comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron') +comp5.type='offl' +test.check_steps.append(comp5) + +comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron') +comp6.type='offl' +test.check_steps.append(comp6) + +comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True) +comp7.type='offl' +test.check_steps.append(comp7) + +comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True) +comp8.type='offl' +test.check_steps.append(comp8) # CPU cost steps cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu_mt.py index 7bba0867ba0fec067785cb3a462782acd480618e..19119606eae579e276d1258096f9fc2b839936bf 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu_mt.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu_mt.py @@ -80,15 +80,39 @@ if ((not exclude) or postproc ): rdict = TrigInDetdictStep() rdict.args='TIDAdata-run3.dat -f data-hists.root -p 11 -b Test_bin.dat ' test.check_steps.append(rdict) + rdict2 = TrigInDetdictStep('TrigInDetDict2') + rdict2.args='TIDAdata-run3.dat -r Offline -f data-hists-offline.root -b Test_bin.dat ' + test.check_steps.append(rdict2) # Now the comparitor steps -comp=TrigInDetCompStep('Comp_L2ele','L2','ele') +comp=TrigInDetCompStep('Comp_L2ele','L2','electron') test.check_steps.append(comp) -comp2=TrigInDetCompStep('Comp_EFele','EF','ele') +comp2=TrigInDetCompStep('Comp_EFele','EF','electron') test.check_steps.append(comp2) +comp3=TrigInDetCompStep('Comp_L2eleLowpt','L2','electron',lowpt=True) +test.check_steps.append(comp3) + +comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True) +test.check_steps.append(comp4) + +comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron') +comp5.type='offl' +test.check_steps.append(comp5) + +comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron') +comp6.type='offl' +test.check_steps.append(comp6) + +comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True) +comp7.type='offl' +test.check_steps.append(comp7) + +comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True) +comp8.type='offl' +test.check_steps.append(comp8) # CPU cost steps cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_mt.py index 3a72be122dec073fc805dc94e554589fa2582fd1..58396e47f29abb82f761786712bae1f1b6aeb35c 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_mt.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_mt.py @@ -83,12 +83,34 @@ if ((not exclude) or postproc ): # Now the comparitor steps -comp=TrigInDetCompStep('Comp_L2ele','L2','ele') +comp=TrigInDetCompStep('Comp_L2ele','L2','electron') test.check_steps.append(comp) -comp2=TrigInDetCompStep('Comp_EFele','EF','ele') +comp2=TrigInDetCompStep('Comp_EFele','EF','electron') test.check_steps.append(comp2) +comp3=TrigInDetCompStep('Comp_L2eleLowpt','L2','electron',lowpt=True) +test.check_steps.append(comp3) + +comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True) +test.check_steps.append(comp4) + +comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron') +comp5.type='offl' +test.check_steps.append(comp5) + +comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron') +comp6.type='offl' +test.check_steps.append(comp6) + +comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True) +comp7.type='offl' +test.check_steps.append(comp7) + +comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True) +comp8.type='offl' +test.check_steps.append(comp8) + # CPU cost steps cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40.py index 2ada102b07d05f01736cd7a34ba0c4c88f4082a9..efe7ed36cc10a95390a46f95700b01a393b47a6a 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40.py @@ -80,15 +80,40 @@ if ((not exclude) or postproc ): rdict = TrigInDetdictStep() rdict.args='TIDAdata-run3.dat -f data-hists.root -p 11 -b Test_bin.dat ' test.check_steps.append(rdict) + rdict2 = TrigInDetdictStep('TrigInDetDict2') + rdict2.args='TIDAdata-run3.dat -r Offline -f data-hists-offline.root -b Test_bin.dat ' + test.check_steps.append(rdict2) # Now the comparitor steps -comp=TrigInDetCompStep('Comp_L2ele','L2','ele') +comp=TrigInDetCompStep('Comp_L2ele','L2','electron') test.check_steps.append(comp) -comp2=TrigInDetCompStep('Comp_EFele','EF','ele') +comp2=TrigInDetCompStep('Comp_EFele','EF','electron') test.check_steps.append(comp2) +comp3=TrigInDetCompStep('Comp_L2eleLowpt','L2','electron',lowpt=True) +test.check_steps.append(comp3) + +comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True) +test.check_steps.append(comp4) + +comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron') +comp5.type='offl' +test.check_steps.append(comp5) + +comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron') +comp6.type='offl' +test.check_steps.append(comp6) + +comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True) +comp7.type='offl' +test.check_steps.append(comp7) + +comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True) +comp8.type='offl' +test.check_steps.append(comp8) + # CPU cost steps cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40_mt.py index 119fcb322290f9d00f963513f7b0067a2dfae111..2beb57eff13e02d9419e549acd36d984386c5adb 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40_mt.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40_mt.py @@ -80,15 +80,40 @@ if ((not exclude) or postproc ): rdict = TrigInDetdictStep() rdict.args='TIDAdata-run3.dat -f data-hists.root -p 11 -b Test_bin.dat ' test.check_steps.append(rdict) + rdict2 = TrigInDetdictStep('TrigInDetDict2') + rdict2.args='TIDAdata-run3.dat -r Offline -f data-hists-offline.root -b Test_bin.dat ' + test.check_steps.append(rdict2) # Now the comparitor steps -comp=TrigInDetCompStep('Comp_L2ele','L2','ele') +comp=TrigInDetCompStep('Comp_L2ele','L2','electron') test.check_steps.append(comp) -comp2=TrigInDetCompStep('Comp_EFele','EF','ele') +comp2=TrigInDetCompStep('Comp_EFele','EF','electron') test.check_steps.append(comp2) +comp3=TrigInDetCompStep('Comp_L2eleLowpt','L2','electron',lowpt=True) +test.check_steps.append(comp3) + +comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True) +test.check_steps.append(comp4) + +comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron') +comp5.type='offl' +test.check_steps.append(comp5) + +comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron') +comp6.type='offl' +test.check_steps.append(comp6) + +comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True) +comp7.type='offl' +test.check_steps.append(comp7) + +comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True) +comp8.type='offl' +test.check_steps.append(comp8) + # CPU cost steps cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40.py index 0ce19ec59ee3b91929b93dd40ebe1f21d530bd16..c84d08fd35eab96d36113e61f4ef75e5c17459be 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40.py @@ -80,21 +80,40 @@ if ((not exclude) or postproc ): rdict = TrigInDetdictStep() rdict.args='TIDAdata-run3.dat -f data-hists.root -p 11 -b Test_bin.dat ' test.check_steps.append(rdict) + rdict2 = TrigInDetdictStep('TrigInDetDict2') + rdict2.args='TIDAdata-run3.dat -r Offline -f data-hists-offline.root -b Test_bin.dat ' + test.check_steps.append(rdict2) # Now the comparitor steps -comp=TrigInDetCompStep('Comp_L2ele','L2','ele') +comp=TrigInDetCompStep('Comp_L2ele','L2','electron') test.check_steps.append(comp) -comp2=TrigInDetCompStep('Comp_EFele','EF','ele') +comp2=TrigInDetCompStep('Comp_EFele','EF','electron') test.check_steps.append(comp2) -comp3=TrigInDetCompStep('Comp_L2eleLowpt','L2','ele',lowpt=True) +comp3=TrigInDetCompStep('Comp_L2eleLowpt','L2','electron',lowpt=True) test.check_steps.append(comp3) -comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','ele',lowpt=True) +comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True) test.check_steps.append(comp4) +comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron') +comp5.type='offl' +test.check_steps.append(comp5) + +comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron') +comp6.type='offl' +test.check_steps.append(comp6) + +comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True) +comp7.type='offl' +test.check_steps.append(comp7) + +comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True) +comp8.type='offl' +test.check_steps.append(comp8) + # CPU cost steps cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40_mt.py index 32ec9c711886e53f2c3b2bc10cb7106a2fa563ea..4cf057e3f605b48f5e015a045e65225fc379a01b 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40_mt.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40_mt.py @@ -80,21 +80,40 @@ if ((not exclude) or postproc ): rdict = TrigInDetdictStep() rdict.args='TIDAdata-run3.dat -f data-hists.root -p 11 -b Test_bin.dat ' test.check_steps.append(rdict) + rdict2 = TrigInDetdictStep('TrigInDetDict2') + rdict2.args='TIDAdata-run3.dat -r Offline -f data-hists-offline.root -b Test_bin.dat ' + test.check_steps.append(rdict2) # Now the comparitor steps -comp=TrigInDetCompStep('Comp_L2ele','L2','ele') +comp=TrigInDetCompStep('Comp_L2ele','L2','electron') test.check_steps.append(comp) -comp2=TrigInDetCompStep('Comp_EFele','EF','ele') +comp2=TrigInDetCompStep('Comp_EFele','EF','electron') test.check_steps.append(comp2) -comp3=TrigInDetCompStep('Comp_L2eleLowpt','L2','ele',lowpt=True) +comp3=TrigInDetCompStep('Comp_L2eleLowpt','L2','electron',lowpt=True) test.check_steps.append(comp3) -comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','ele',lowpt=True) +comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True) test.check_steps.append(comp4) +comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron') +comp5.type='offl' +test.check_steps.append(comp5) + +comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron') +comp6.type='offl' +test.check_steps.append(comp6) + +comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True) +comp7.type='offl' +test.check_steps.append(comp7) + +comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True) +comp8.type='offl' +test.check_steps.append(comp8) + # CPU cost steps cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys.py index 073fefd4023e5fd58e5ed0444008487dc10535a7..4992954e7dc8e7a93bd863464527c1d04f61d68b 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys.py @@ -73,6 +73,9 @@ if ((not exclude) or postproc ): rdict = TrigInDetdictStep() rdict.args='TIDAdata-run3.dat -f data-hists.root -p 13 -b Test_bin.dat ' test.check_steps.append(rdict) + rdict2 = TrigInDetdictStep('TrigInDetDict2') + rdict2.args='TIDAdata-run3.dat -r Offline -f data-hists-offline.root -b Test_bin.dat ' + test.check_steps.append(rdict2) # Now the comparitor steps @@ -82,6 +85,28 @@ test.check_steps.append(comp) comp2=TrigInDetCompStep('Comp_EFmuon','EF','muon') test.check_steps.append(comp2) +comp3=TrigInDetCompStep('Comp_L2muonLowpt','L2','muon',lowpt=True) +test.check_steps.append(comp3) + +comp4=TrigInDetCompStep('Comp_EFmuonLowpt','EF','muon',lowpt=True) +test.check_steps.append(comp4) + +comp5=TrigInDetCompStep('Comp_L2muon_off','L2','muon') +comp5.type = 'offl' +test.check_steps.append(comp5) + +comp6=TrigInDetCompStep('Comp_EFmuon_off','EF','muon') +comp6.type = 'offl' +test.check_steps.append(comp6) + +comp7=TrigInDetCompStep('Comp_L2muonLowpt_off','L2','muon',lowpt=True) +comp7.type = 'offl' +test.check_steps.append(comp7) + +comp8=TrigInDetCompStep('Comp_EFmuonLowpt_off','EF','muon',lowpt=True) +comp8.type = 'offl' +test.check_steps.append(comp8) + # CPU cost steps cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) @@ -89,5 +114,6 @@ test.check_steps.append(cpucost) cpucost2=TrigInDetCpuCostStep('CpuCostStep2') test.check_steps.append(cpucost2) + import sys sys.exit(test.run()) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys_mt.py index 120f2589199b4146e55c73f878945c176dfdf57a..452c86cd0948ff32786a846ac39220e80bc63252 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys_mt.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys_mt.py @@ -73,6 +73,9 @@ if ((not exclude) or postproc ): rdict = TrigInDetdictStep() rdict.args='TIDAdata-run3.dat -f data-hists.root -p 13 -b Test_bin.dat ' test.check_steps.append(rdict) + rdict2 = TrigInDetdictStep('TrigInDetDict2') + rdict2.args='TIDAdata-run3.dat -r Offline -f data-hists-offline.root -b Test_bin.dat ' + test.check_steps.append(rdict2) # Now the comparitor steps @@ -82,6 +85,28 @@ test.check_steps.append(comp) comp2=TrigInDetCompStep('Comp_EFmuon','EF','muon') test.check_steps.append(comp2) +comp3=TrigInDetCompStep('Comp_L2muonLowpt','L2','muon',lowpt=True) +test.check_steps.append(comp3) + +comp4=TrigInDetCompStep('Comp_EFmuonLowpt','EF','muon',lowpt=True) +test.check_steps.append(comp4) + +comp5=TrigInDetCompStep('Comp_L2muon_off','L2','muon') +comp5.type = 'offl' +test.check_steps.append(comp5) + +comp6=TrigInDetCompStep('Comp_EFmuon_off','EF','muon') +comp6.type = 'offl' +test.check_steps.append(comp6) + +comp7=TrigInDetCompStep('Comp_L2muonLowpt_off','L2','muon',lowpt=True) +comp7.type = 'offl' +test.check_steps.append(comp7) + +comp8=TrigInDetCompStep('Comp_EFmuonLowpt_off','EF','muon',lowpt=True) +comp8.type = 'offl' +test.check_steps.append(comp8) + # CPU cost steps cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0.py index 614d156cc620ba10dfab409ce4bed6a189f0e0fb..02befe2d3ef0bd317131ab193fe24454598c6abb 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0.py @@ -80,6 +80,9 @@ if ((not exclude) or postproc ): rdict = TrigInDetdictStep() rdict.args='TIDAdata-run3.dat -f data-hists.root -p 13 -b Test_bin.dat ' test.check_steps.append(rdict) + rdict2 = TrigInDetdictStep('TrigInDetDict2') + rdict2.args='TIDAdata-run3.dat -r Offline -f data-hists-offline.root -b Test_bin.dat ' + test.check_steps.append(rdict2) # Now the comparitor steps @@ -89,6 +92,28 @@ test.check_steps.append(comp) comp2=TrigInDetCompStep('Comp_EFmuon','EF','muon') test.check_steps.append(comp2) +comp3=TrigInDetCompStep('Comp_L2muonLowpt','L2','muon',lowpt=True) +test.check_steps.append(comp3) + +comp4=TrigInDetCompStep('Comp_EFmuonLowpt','EF','muon',lowpt=True) +test.check_steps.append(comp4) + +comp5=TrigInDetCompStep('Comp_L2muon_off','L2','muon') +comp5.type = 'offl' +test.check_steps.append(comp5) + +comp6=TrigInDetCompStep('Comp_EFmuon_off','EF','muon') +comp6.type = 'offl' +test.check_steps.append(comp6) + +comp7=TrigInDetCompStep('Comp_L2muonLowpt_off','L2','muon',lowpt=True) +comp7.type = 'offl' +test.check_steps.append(comp7) + +comp8=TrigInDetCompStep('Comp_EFmuonLowpt_off','EF','muon',lowpt=True) +comp8.type = 'offl' +test.check_steps.append(comp8) + # CPU cost steps cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_mt.py index a11930f4f664c9e280faec82488988d7902c5505..33a704cb5aac1072d1edf3d1aad58ef28dc84d80 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_mt.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_mt.py @@ -80,6 +80,9 @@ if ((not exclude) or postproc ): rdict = TrigInDetdictStep() rdict.args='TIDAdata-run3.dat -f data-hists.root -p 13 -b Test_bin.dat ' test.check_steps.append(rdict) + rdict2 = TrigInDetdictStep('TrigInDetDict2') + rdict2.args='TIDAdata-run3.dat -r Offline -f data-hists-offline.root -b Test_bin.dat ' + test.check_steps.append(rdict2) # Now the comparitor steps @@ -89,6 +92,28 @@ test.check_steps.append(comp) comp2=TrigInDetCompStep('Comp_EFmuon','EF','muon') test.check_steps.append(comp2) +comp3=TrigInDetCompStep('Comp_L2muonLowpt','L2','muon',lowpt=True) +test.check_steps.append(comp3) + +comp4=TrigInDetCompStep('Comp_EFmuonLowpt','EF','muon',lowpt=True) +test.check_steps.append(comp4) + +comp5=TrigInDetCompStep('Comp_L2muon_off','L2','muon') +comp5.type = 'offl' +test.check_steps.append(comp5) + +comp6=TrigInDetCompStep('Comp_EFmuon_off','EF','muon') +comp6.type = 'offl' +test.check_steps.append(comp6) + +comp7=TrigInDetCompStep('Comp_L2muonLowpt_off','L2','muon',lowpt=True) +comp7.type = 'offl' +test.check_steps.append(comp7) + +comp8=TrigInDetCompStep('Comp_EFmuonLowpt_off','EF','muon',lowpt=True) +comp8.type = 'offl' +test.check_steps.append(comp8) + # CPU cost steps cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu.py index 9dea8c840836e8276156b4b48bc2169c9e8f3fd5..9a64a0be59e26a94c3d5f7457a1436813f23dc08 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu.py @@ -80,6 +80,9 @@ if ((not exclude) or postproc ): rdict = TrigInDetdictStep() rdict.args='TIDAdata-run3.dat -f data-hists.root -p 13 -b Test_bin.dat ' test.check_steps.append(rdict) + rdict2 = TrigInDetdictStep('TrigInDetDict2') + rdict2.args='TIDAdata-run3.dat -r Offline -f data-hists-offline.root -b Test_bin.dat ' + test.check_steps.append(rdict2) # Now the comparitor steps @@ -89,6 +92,27 @@ test.check_steps.append(comp) comp2=TrigInDetCompStep('Comp_EFmuon','EF','muon') test.check_steps.append(comp2) +comp3=TrigInDetCompStep('Comp_L2muonLowpt','L2','muon',lowpt=True) +test.check_steps.append(comp3) + +comp4=TrigInDetCompStep('Comp_EFmuonLowpt','EF','muon',lowpt=True) +test.check_steps.append(comp4) + +comp5=TrigInDetCompStep('Comp_L2muon_off','L2','muon') +comp5.type = 'offl' +test.check_steps.append(comp5) + +comp6=TrigInDetCompStep('Comp_EFmuon_off','EF','muon') +comp6.type = 'offl' +test.check_steps.append(comp6) + +comp7=TrigInDetCompStep('Comp_L2muonLowpt_off','L2','muon',lowpt=True) +comp7.type = 'offl' +test.check_steps.append(comp7) + +comp8=TrigInDetCompStep('Comp_EFmuonLowpt_off','EF','muon',lowpt=True) +comp8.type = 'offl' +test.check_steps.append(comp8) # CPU cost steps cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu_mt.py index 5a6c29e3dab2e6e4401e7360d12e90e168674c79..4c8958edb38f184407da0acea064b07baa7363dc 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu_mt.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu_mt.py @@ -80,6 +80,9 @@ if ((not exclude) or postproc ): rdict = TrigInDetdictStep() rdict.args='TIDAdata-run3.dat -f data-hists.root -p 13 -b Test_bin.dat ' test.check_steps.append(rdict) + rdict2 = TrigInDetdictStep('TrigInDetDict2') + rdict2.args='TIDAdata-run3.dat -r Offline -f data-hists-offline.root -b Test_bin.dat ' + test.check_steps.append(rdict2) # Now the comparitor steps @@ -89,6 +92,28 @@ test.check_steps.append(comp) comp2=TrigInDetCompStep('Comp_EFmuon','EF','muon') test.check_steps.append(comp2) +comp3=TrigInDetCompStep('Comp_L2muonLowpt','L2','muon',lowpt=True) +test.check_steps.append(comp3) + +comp4=TrigInDetCompStep('Comp_EFmuonLowpt','EF','muon',lowpt=True) +test.check_steps.append(comp4) + +comp5=TrigInDetCompStep('Comp_L2muon_off','L2','muon') +comp5.type = 'offl' +test.check_steps.append(comp5) + +comp6=TrigInDetCompStep('Comp_EFmuon_off','EF','muon') +comp6.type = 'offl' +test.check_steps.append(comp6) + +comp7=TrigInDetCompStep('Comp_L2muonLowpt_off','L2','muon',lowpt=True) +comp7.type = 'offl' +test.check_steps.append(comp7) + +comp8=TrigInDetCompStep('Comp_EFmuonLowpt_off','EF','muon',lowpt=True) +comp8.type = 'offl' +test.check_steps.append(comp8) + # CPU cost steps cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40.py index b33838ea75a15a28b68cda2efad596ca306664b2..5c253a98bd12a98cf1f1dc5ac7bf5c9d53a8103a 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40.py @@ -100,6 +100,19 @@ comp4=TrigInDetCompStep('Comp_EFmuon_off','EF','muon') comp4.type = 'offl' test.check_steps.append(comp4) +comp5=TrigInDetCompStep('Comp_L2muonLowpt','L2','muon',lowpt=True) +test.check_steps.append(comp5) + +comp6=TrigInDetCompStep('Comp_EFmuonLowpt','EF','muon',lowpt=True) +test.check_steps.append(comp6) + +comp7=TrigInDetCompStep('Comp_L2muonLowpt_off','L2','muon',lowpt=True) +comp7.type = 'offl' +test.check_steps.append(comp7) + +comp8=TrigInDetCompStep('Comp_EFmuonLowpt_off','EF','muon',lowpt=True) +comp8.type = 'offl' +test.check_steps.append(comp8) # CPU cost steps cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_mt.py index 1692e7658bc1764e2e767fc2861438467b225be2..bf5914208cee1236c5cdb717623cfc3f0bec7b70 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_mt.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_mt.py @@ -100,6 +100,19 @@ comp4=TrigInDetCompStep('Comp_EFmuon_off','EF','muon') comp4.type = 'offl' test.check_steps.append(comp4) +comp5=TrigInDetCompStep('Comp_L2muonLowpt','L2','muon',lowpt=True) +test.check_steps.append(comp5) + +comp6=TrigInDetCompStep('Comp_EFmuonLowpt','EF','muon',lowpt=True) +test.check_steps.append(comp6) + +comp7=TrigInDetCompStep('Comp_L2muonLowpt_off','L2','muon',lowpt=True) +comp7.type = 'offl' +test.check_steps.append(comp7) + +comp8=TrigInDetCompStep('Comp_EFmuonLowpt_off','EF','muon',lowpt=True) +comp8.type = 'offl' +test.check_steps.append(comp8) # CPU cost steps cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False)