diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAhisto-panel-vtx.dat b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAhisto-panel-vtx.dat index d6933c847c57146bbb673a6411ae78de94a10604..bb9c224cc634416a398c9d8b8f6a9134ef8ffa92 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAhisto-panel-vtx.dat +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAhisto-panel-vtx.dat @@ -24,12 +24,12 @@ vtx_res_panel = { "rdz_vs_ntrax/mean", "Offset z vs N_{tracks}", "xaxis:lin:auto", "Offline track multiplicity", "yaxis:auto:lin:-1:1.", "z_{0} mean [mm]" , "rdz_vs_zed/mean", "Offset z vs z", "xaxis:lin:-175:175", "Offline vertex z [mm]", "yaxis:auto:lin:-1:1", "z_{0} mean [mm]" , - "rdz_vs_zed/1d+rebin10", "Residual z", "xaxis:lin:-5:5", "#Delta z [mm]", "yaxis:log:auton", "(1/N)dN/dz [mm^{-1}]" , + "rdz_vs_zed/1d+rebin10", "Residual z", "xaxis:lin:-5:5", "#Delta z [mm]", "yaxis:log:auton", "(1/N)dN/dz [mm^{-1}]" , - "rdz_vs_ntrax/sigma", "Offset z vs N_{tracks}", "xaxis:lin:auto", "Offline track multiplicity", "yaxis:auto:lin:0:2.", "z_{0} resolution [mm]" , - "rdz_vs_zed/sigma", "Resolution z vs z", "xaxis:lin:-175:175", "Offline vertex z [mm]", "yaxis:lin:auto:0:2", "z_{0} resolution [mm]" , - "rdz_vs_zed/1d+lin+rebin10", "Residual z", "xaxis:lin:-5:5", "#Delta z [mm]", "yaxis:lin:auton", "(1/N)dN/dz [mm^{-1}]" + "rdz_vs_ntrax/sigma", "Offset z vs N_{tracks}", "xaxis:lin:auto", "Offline track multiplicity", "yaxis:log:auto:0.003:2.", "z_{0} resolution [mm]" , + "rdz_vs_zed/sigma", "Resolution z vs z", "xaxis:lin:-175:175", "Offline vertex z [mm]", "yaxis:log:auto:0.003:2", "z_{0} resolution [mm]" , + "rdz_vs_zed/1d+lin+rebin10", "Residual z", "xaxis:lin:-5:5", "#Delta z [mm]", "yaxis:lin:auton", "(1/N)dN/dz [mm^{-1}]" }; diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_NewBase.py b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_NewBase.py index afbbee8fe1517ac2b4ab9d19595a00183dc151a5..7edd9a5a291ff049541897102aabdf879e763731 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_NewBase.py +++ b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_NewBase.py @@ -32,7 +32,7 @@ except getopt.GetoptError: print("-n N run only on N events per job") print("-c(--config) run with config_only and print to a pkl file") print("") - + sys.exit(1) Events_local = 0 local = False diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40_new.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40_new.py index 65623557b83d2a53f8c2e41c9d2d65e89af9f97d..a510619a43950a9c541882e14d09734cfa890819 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40_new.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40_new.py @@ -32,20 +32,21 @@ Threads = 8 Slots = 8 Input = 'ttbar_ID' # defined in TrigValTools/share/TrigValInputs.json -Jobs = [ ( "Offline", " TIDAdata-run3-offline.dat -o data-hists.root" ) ] +Jobs = [ ( "Offline", " TIDAdata-run3-offline.dat -o data-hists-offline.root" ), + ( "OfflineVtx", " TIDAdata-run3-offline-vtx.dat -o data-hists-offline-vtx.root" ) ] +Comp = [ ( "L2muon", "L2muon", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-muon " ), + ( "L2electron", "L2electron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-electron " ), + ( "L2tau", "L2tau", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-tau " ), + ( "L2bjet", "L2bjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-bjet " ), + ( "FSjetoffline", "L2fsjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-FS " ), + ( "FSvtx", "L2fsjetvtx", "data-hists-offline-vtx.root", " -c TIDAhisto-panel-vtx.dat -d HLTL2-plots-vtx --ncols 3" ), + ( "FSvtxall", "L2fsjetvtx", "data-hists-offline.root", " -c TIDAhisto-panel-vtx.dat -d HLTL2-plots-vtxall --ncols 3" ), -Comp = [ ( "L2muon", "L2muon", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-muon " ), - ( "L2electron", "L2electron", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-electron " ), - ( "L2tau", "L2tau", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-tau " ), - ( "L2bjet", "L2bjet", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-bjet " ), - ( "FSjetoffline", "L2fsjet", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-FS " ), - ( "FSvtx", "L2fsjetvtx", "data-hists.root", " -c TIDAhistos-vtx.dat -d HLTL2-plots-vtx " ), - - ( "EFmuon", "EFmuon", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-muon " ), - ( "EFelectron", "EFelectron", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-electron " ), - ( "EFtau", "EFtau", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-tau " ), - ( "EFbjet", "EFmuon", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-bjet " ) ] + ( "EFmuon", "EFmuon", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-muon " ), + ( "EFelectron", "EFelectron", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-electron " ), + ( "EFtau", "EFtau", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-tau " ), + ( "EFbjet", "EFmuon", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-bjet " ) ] from AthenaCommon.Include import include include("TrigInDetValidation/TrigInDetValidation_NewBase.py")