From dd6356ce2297cec8f4742ce8d9193424bce332c3 Mon Sep 17 00:00:00 2001 From: Jean Yves Beaucamp <jean.yves.beaucamp@cern.ch> Date: Sun, 24 Nov 2024 22:27:31 +0100 Subject: [PATCH 1/2] Remove name overrides for all HLT tau monitored histograms --- .../TrigTauRec/python/TrigTauRecMonitoring.py | 50 +++++++++---------- .../python/TrigTauHypoMonitoring.py | 33 ++++++------ .../python/TrigTauMonitoringConfig.py | 12 ++--- 3 files changed, 46 insertions(+), 49 deletions(-) diff --git a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecMonitoring.py b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecMonitoring.py index 813485280e0c..589f507b9703 100644 --- a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecMonitoring.py +++ b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecMonitoring.py @@ -8,24 +8,24 @@ def tauMonitoringCaloOnlyMVA(flags, name: str = 'CaloMVA', RoI_name: str = 'L1') # After the validation we are removing the name overrides - monTool.defineHistogram('NTauCandidates;nCand', path='EXPERT', type='TH1F', title=name+' Tau candidates; N Tau; Entries', xbins=10, xmin=-1.0, xmax=9) + monTool.defineHistogram('NTauCandidates', path='EXPERT', type='TH1F', title=name+' Tau candidates; N Tau; Entries', xbins=10, xmin=-1.0, xmax=9) # Tau kinematics (from TauJet) - monTool.defineHistogram('Pt;EtFinal', path='EXPERT', type='TH1F', title=name+' Tau E_{T}; E_{T} [GeV]; Entries', xbins=100, xmin=0, xmax=1000) - monTool.defineHistogram('Eta;EtaEF', path='EXPERT', type='TH1F', title=name+' Tau #eta; #eta; Entries', xbins=100, xmin=-2.6, xmax=2.6) - monTool.defineHistogram('Phi;PhiEF', path='EXPERT', type='TH1F', title=name+' Tau #phi; #phi; Entries', xbins=100, xmin=-3.2, xmax=3.2) - monTool.defineHistogram('Eta, Phi;EtaEF_vs_PhiEF', path='EXPERT', type='TH2F', title=name+' Tau #eta vs #phi; #eta; #phi', xbins=100, xmin=-2.6, xmax=2.6, ybins=100, ymin=-3.2, ymax=3.2) - monTool.defineHistogram('Pt, Eta;EtFinal_vs_EtaEF', path='EXPERT', type='TH2F', title=name+' Tau E_{T} vs #eta; E_{T} [GeV]; #eta', xbins=100 , xmin=0, xmax=1000, ybins=100, ymin=-2.6, ymax=2.6) - monTool.defineHistogram('Pt, Phi;EtFinal_vs_PhiEF', path='EXPERT', type='TH2F', title=name+' Tau E_{T} vs #phi; E_{T} [GeV]; #phi', xbins=100 , xmin=0, xmax=1000, ybins=100, ymin=-3.2, ymax=3.2) + monTool.defineHistogram('Pt', path='EXPERT', type='TH1F', title=name+' Tau E_{T}; E_{T} [GeV]; Entries', xbins=100, xmin=0, xmax=1000) + monTool.defineHistogram('Eta', path='EXPERT', type='TH1F', title=name+' Tau #eta; #eta; Entries', xbins=100, xmin=-2.6, xmax=2.6) + monTool.defineHistogram('Phi', path='EXPERT', type='TH1F', title=name+' Tau #phi; #phi; Entries', xbins=100, xmin=-3.2, xmax=3.2) + monTool.defineHistogram('Eta, Phi', path='EXPERT', type='TH2F', title=name+' Tau #eta vs #phi; #eta; #phi', xbins=100, xmin=-2.6, xmax=2.6, ybins=100, ymin=-3.2, ymax=3.2) + monTool.defineHistogram('Pt, Eta', path='EXPERT', type='TH2F', title=name+' Tau E_{T} vs #eta; E_{T} [GeV]; #eta', xbins=100 , xmin=0, xmax=1000, ybins=100, ymin=-2.6, ymax=2.6) + monTool.defineHistogram('Pt, Phi', path='EXPERT', type='TH2F', title=name+' Tau E_{T} vs #phi; E_{T} [GeV]; #phi', xbins=100 , xmin=0, xmax=1000, ybins=100, ymin=-3.2, ymax=3.2) # RoI kinematics (from the step RoI) - monTool.defineHistogram('EtaRoI;EtaL1', path='EXPERT', type='TH1F', title=RoI_name+' RoI #eta; #eta; Entries', xbins=100, xmin=-2.6, xmax=2.6) - monTool.defineHistogram('PhiRoI;PhiL1', path='EXPERT', type='TH1F', title=RoI_name+' RoI #phi; #phi; Entries', xbins=100, xmin=-3.2, xmax=3.2) - monTool.defineHistogram('EtaRoI, PhiRoI;EtaL1_vs_PhiL1', path='EXPERT', type='TH2F', title=RoI_name+' RoI #eta vs #phi; #eta; #phi', xbins=100, xmin=-2.6, xmax=2.6, ybins=100, ymin=-3.2, ymax=3.2) + monTool.defineHistogram('EtaRoI', path='EXPERT', type='TH1F', title=RoI_name+' RoI #eta; #eta; Entries', xbins=100, xmin=-2.6, xmax=2.6) + monTool.defineHistogram('PhiRoI', path='EXPERT', type='TH1F', title=RoI_name+' RoI #phi; #phi; Entries', xbins=100, xmin=-3.2, xmax=3.2) + monTool.defineHistogram('EtaRoI, PhiRoI', path='EXPERT', type='TH2F', title=RoI_name+' RoI #eta vs #phi; #eta; #phi', xbins=100, xmin=-2.6, xmax=2.6, ybins=100, ymin=-3.2, ymax=3.2) - monTool.defineHistogram('dEtaTau_RoI;dEtaEFTau_RoI', path='EXPERT', type='TH1F', title=name+' #Delta#eta(Tau, '+RoI_name+' RoI); #Delta#eta(Tau, '+RoI_name+' RoI); Entries', xbins=100, xmin=-0.4, xmax=0.4) - monTool.defineHistogram('dPhiTau_RoI;dPhiEFTau_RoI', path='EXPERT', type='TH1F', title=name+' #Delta#phi(Tau, '+RoI_name+' RoI); #Delta#phi(Tau, '+RoI_name+' RoI); Entries', xbins=100, xmin=-0.15, xmax=0.15) - monTool.defineHistogram('dEtaTau_RoI, dPhiTau_RoI;dEtaEFTau_RoI_vs_dPhiEFTau_RoI', path='EXPERT', type='TH2F', title=name+' #Delta#eta(Tau, '+RoI_name+' RoI) vs #Delta#phi(Tau, '+RoI_name+' RoI); #Delta#eta(Tau, '+RoI_name+' RoI); #Delta#phi(Tau, '+RoI_name+' RoI)', + monTool.defineHistogram('dEtaTau_RoI', path='EXPERT', type='TH1F', title=name+' #Delta#eta(Tau, '+RoI_name+' RoI); #Delta#eta(Tau, '+RoI_name+' RoI); Entries', xbins=100, xmin=-0.4, xmax=0.4) + monTool.defineHistogram('dPhiTau_RoI', path='EXPERT', type='TH1F', title=name+' #Delta#phi(Tau, '+RoI_name+' RoI); #Delta#phi(Tau, '+RoI_name+' RoI); Entries', xbins=100, xmin=-0.15, xmax=0.15) + monTool.defineHistogram('dEtaTau_RoI, dPhiTau_RoI', path='EXPERT', type='TH2F', title=name+' #Delta#eta(Tau, '+RoI_name+' RoI) vs #Delta#phi(Tau, '+RoI_name+' RoI); #Delta#eta(Tau, '+RoI_name+' RoI); #Delta#phi(Tau, '+RoI_name+' RoI)', xbins=100 , xmin=-0.4, xmax=0.4, ybins=100 , ymin=-0.15, ymax=0.15) @@ -38,7 +38,7 @@ def tauMonitoringCaloOnlyMVA(flags, name: str = 'CaloMVA', RoI_name: str = 'L1') monTool.defineHistogram('ptDetectorAxis_log', path='EXPERT', type='TH1F', title=name+' TauJet Log10(ptDetectorAxis); Log10(ptDetectorAxis); Entries', xbins=50, xmin=0, xmax=5) # TauJet low-level Calorimeter variables - monTool.defineHistogram('NCaloCells;nRoI_EFTauCells', path='EXPERT', type='TH1F', title=name+' TauJet calorimeter cells; N Cells; Entries', xbins=100, xmin=0, xmax=6000) + monTool.defineHistogram('NCaloCells', path='EXPERT', type='TH1F', title=name+' TauJet calorimeter cells; N Cells; Entries', xbins=100, xmin=0, xmax=6000) monTool.defineHistogram('EMRadius', path='EXPERT', type='TH1F', title=name+' TauJet EM radius; EM radius; Entries', xbins=50, xmin=-0.1, xmax=1) monTool.defineHistogram('HadRadius', path='EXPERT', type='TH1F', title=name+' TauJet Had radius; Had radius; Entries', xbins=50, xmin=-0.1, xmax=1) monTool.defineHistogram('EtHad, EtEm', path='EXPERT', type='TH2F', title=name+' TauJet E_{T}^{Had} vs E_{T}^{EM}; E_{T}^{Had} (at EM scale) [GeV]; E_{T}^{EM} (at EM scale) [GeV]', @@ -46,7 +46,7 @@ def tauMonitoringCaloOnlyMVA(flags, name: str = 'CaloMVA', RoI_name: str = 'L1') ybins=30, ymin=0, ymax=150) monTool.defineHistogram('EMFrac', path='EXPERT', type='TH1F', title=name+' TauJet EM fraction; E_{T}^{EM} / (E_{T}^{EM} + E_{T}^{Had}) (at EM scale); Entries', xbins=70, xmin=-0.1, xmax=1.3) monTool.defineHistogram('IsoFrac', path='EXPERT', type='TH1F', title=name+' TauJet Isolation fraction; Isolation fraction; Entries', xbins=80, xmin=-0.4, xmax=1.2) - monTool.defineHistogram('CentFrac;centFrac', path='EXPERT', type='TH1F', title=name+' TauJet Central fraction; Central fraction; Entries', xbins=80, xmin=-0.4, xmax=1.2) + monTool.defineHistogram('CentFrac', path='EXPERT', type='TH1F', title=name+' TauJet Central fraction; Central fraction; Entries', xbins=80, xmin=-0.4, xmax=1.2) # TauJet clusters mean variables monTool.defineHistogram('clustersMeanCenterLambda', path='EXPERT', type='TH1F', title=name+' TauJet clustersMeanCenterLambda; clustersMeanCenterLambda; Entries', xbins=40, xmin=0, xmax=2500) @@ -56,7 +56,7 @@ def tauMonitoringCaloOnlyMVA(flags, name: str = 'CaloMVA', RoI_name: str = 'L1') monTool.defineHistogram('clustersMeanEMProbability', path='EXPERT', type='TH1F', title=name+' TauJet clustersMeanEMProbability; clustersMeanEMProbability; Entries', xbins=20, xmin=0, xmax=1) # Cluster variables - monTool.defineHistogram('NClusters;RNN_clusternumber', path='EXPERT', type='TH1F', title=name+' TauJet calorimeter clusters; N Clusters; Entries', xbins=15, xmin=0, xmax=15) + monTool.defineHistogram('NClusters', path='EXPERT', type='TH1F', title=name+' TauJet calorimeter clusters; N Clusters; Entries', xbins=15, xmin=0, xmax=15) monTool.defineHistogram('cluster_et_log', path='EXPERT', type='TH1F', title=name+' TauJet Log10(Cluster E_{T}); Log10(Cluster E_{T}); Entries', xbins=50, xmin=1, xmax=7) monTool.defineHistogram('cluster_dEta', path='EXPERT', type='TH1F', title=name+' TauJet #Delta#eta(Cluster, Tau); #Delta#eta(Cluster, Tau); Entries', xbins=50, xmin=-0.5, xmax=0.5) monTool.defineHistogram('cluster_dPhi', path='EXPERT', type='TH1F', title=name+' TauJet #Delta#phi(Cluster, Tau); #Delta#phi(Cluster, Tau); Entries', xbins=50, xmin=-0.5, xmax=0.5) @@ -77,8 +77,8 @@ def tauMonitoringPrecision(flags, name: str = 'Precision', RoI_name: str = 'tauI # After the validation we are removing the name overrides # TauJet track variables - monTool.defineHistogram('NTracks;NTrk', path='EXPERT', type='TH1F', title=name+' TauJet core tracks; N Tracks; Entries', xbins=17, xmin=-2.0, xmax=15) - monTool.defineHistogram('NIsoTracks;nWideTrk', path='EXPERT', type='TH1F', title=name+' TauJet wide tracks; N Tracks; Entries', xbins=17, xmin=-2.0, xmax=15) + monTool.defineHistogram('NTracks', path='EXPERT', type='TH1F', title=name+' TauJet core tracks; N Tracks; Entries', xbins=17, xmin=-2.0, xmax=15) + monTool.defineHistogram('NIsoTracks', path='EXPERT', type='TH1F', title=name+' TauJet wide tracks; N Tracks; Entries', xbins=17, xmin=-2.0, xmax=15) monTool.defineHistogram('ipSigLeadTrk', path='EXPERT', type='TH1F', title=name+' TauJet leading track IPsig; Leading Track IPsig; Entries', xbins=100, xmin=-50, xmax=50) monTool.defineHistogram('trFlightPathSig', path='EXPERT', type='TH1F', title=name+' TauJet track FlightPath sig.; Track FlightPath sig.; Entries', xbins=100, xmin=-20, xmax=40) @@ -96,7 +96,7 @@ def tauMonitoringPrecision(flags, name: str = 'Precision', RoI_name: str = 'tauI monTool.defineHistogram('vertex_z', path='EXPERT', type='TH1F', title=name+' TauJet Vertex z; Vertex z; Entries', xbins=120, xmin=-120, xmax=120) # TauJet Track variables - monTool.defineHistogram('NAllTracks;RNN_tracknumber', path='EXPERT', type='TH1F', title=name+' TauJet total tracks; N Tracks; Entries', xbins=20, xmin=0, xmax=20) + monTool.defineHistogram('NAllTracks', path='EXPERT', type='TH1F', title=name+' TauJet total tracks; N Tracks; Entries', xbins=20, xmin=0, xmax=20) monTool.defineHistogram('track_pt_log', path='EXPERT', type='TH1F', title=name+' TauJet Log10(Track p_{T}); Log10(Track p_{T}); Entries', xbins=50, xmin=2.7, xmax=7) monTool.defineHistogram('track_dEta', path='EXPERT', type='TH1F', title=name+' TauJet #Delta#eta(Track, Tau); #Delta#eta(Track, Tau); Entries', xbins=50, xmin=-0.5, xmax=0.5) monTool.defineHistogram('track_dPhi', path='EXPERT', type='TH1F', title=name+' TauJet #Delta#phi(Track, Tau); #Delta#phi(Track, Tau); Entries', xbins=50, xmin=-0.5, xmax=0.5) @@ -112,13 +112,13 @@ def tauMonitoringPrecision(flags, name: str = 'Precision', RoI_name: str = 'tauI if tau_id in ['DeepSet', 'RNNLLP']: xbins, xmax = 40, 1 else: xbins, xmax = 100, 5 - monTool.defineHistogram(f'{tau_id}_TauJetScore_0p;RNNJetScore_0p', path='EXPERT', type='TH1F', title=f'{name} 0-prong TauJet {tau_id} Tau ID score; Score; Entries', xbins=xbins, xmin=0, xmax=xmax) - monTool.defineHistogram(f'{tau_id}_TauJetScoreTrans_0p;RNNJetScoreSigTrans_0p', path='EXPERT', type='TH1F', title=f'{name} 0-prong TauJet {tau_id} Tau ID transformed score; Transformed Signal Score; Entries', xbins=xbins, xmin=0, xmax=xmax) + monTool.defineHistogram(f'{tau_id}_TauJetScore_0p', path='EXPERT', type='TH1F', title=f'{name} 0-prong TauJet {tau_id} Tau ID score; Score; Entries', xbins=xbins, xmin=0, xmax=xmax) + monTool.defineHistogram(f'{tau_id}_TauJetScoreTrans_0p', path='EXPERT', type='TH1F', title=f'{name} 0-prong TauJet {tau_id} Tau ID transformed score; Transformed Signal Score; Entries', xbins=xbins, xmin=0, xmax=xmax) - monTool.defineHistogram(f'{tau_id}_TauJetScore_1p;RNNJetScore_1p', path='EXPERT', type='TH1F', title=f'{name} 1-prong TauJet {tau_id} Tau ID score; Score; Entries', xbins=xbins, xmin=0, xmax=xmax) - monTool.defineHistogram(f'{tau_id}_TauJetScoreTrans_1p;RNNJetScoreSigTrans_1p', path='EXPERT', type='TH1F', title=f'{name} 1-prong TauJet {tau_id} Tau ID transformed score; Transformed Signal Score; Entries', xbins=xbins, xmin=0, xmax=xmax) + monTool.defineHistogram(f'{tau_id}_TauJetScore_1p', path='EXPERT', type='TH1F', title=f'{name} 1-prong TauJet {tau_id} Tau ID score; Score; Entries', xbins=xbins, xmin=0, xmax=xmax) + monTool.defineHistogram(f'{tau_id}_TauJetScoreTrans_1p', path='EXPERT', type='TH1F', title=f'{name} 1-prong TauJet {tau_id} Tau ID transformed score; Transformed Signal Score; Entries', xbins=xbins, xmin=0, xmax=xmax) - monTool.defineHistogram(f'{tau_id}_TauJetScore_mp;RNNJetScore_mp', path='EXPERT', type='TH1F', title=f'{name} multi-prong TauJet {tau_id} Tau ID score; Score; Entries', xbins=xbins, xmin=0, xmax=xmax) - monTool.defineHistogram(f'{tau_id}_TauJetScoreTrans_mp;RNNJetScoreSigTrans_mp', path='EXPERT', type='TH1F', title=f'{name} multi-prong TauJet {tau_id} Tau ID transformed score; Transformed Signal Score; Entries', xbins=xbins, xmin=0, xmax=xmax) + monTool.defineHistogram(f'{tau_id}_TauJetScore_mp', path='EXPERT', type='TH1F', title=f'{name} multi-prong TauJet {tau_id} Tau ID score; Score; Entries', xbins=xbins, xmin=0, xmax=xmax) + monTool.defineHistogram(f'{tau_id}_TauJetScoreTrans_mp', path='EXPERT', type='TH1F', title=f'{name} multi-prong TauJet {tau_id} Tau ID transformed score; Transformed Signal Score; Entries', xbins=xbins, xmin=0, xmax=xmax) return monTool diff --git a/Trigger/TrigHypothesis/TrigTauHypo/python/TrigTauHypoMonitoring.py b/Trigger/TrigHypothesis/TrigTauHypo/python/TrigTauHypoMonitoring.py index d188ecbcee86..ee8a5bbd955f 100644 --- a/Trigger/TrigHypothesis/TrigTauHypo/python/TrigTauHypoMonitoring.py +++ b/Trigger/TrigHypothesis/TrigTauHypo/python/TrigTauHypoMonitoring.py @@ -4,33 +4,30 @@ from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool def getTrigTauPrecisionIDHypoToolMonitoring(flags, name: str, tau_ids: list[str]): monTool = GenericMonitoringTool(flags, f'MonTool_{name}') - #monTool.HistPath = f'TrigTauRecMerged_TrigTauPrecisionIDHypo/{name}' - monTool.HistPath = f'TrigTauRecMerged_TrigEFTauMVHypo/{name}' # The name override will be removed after the validation - - # We will fix the naming convention as soon as the first weekly HLT Reprocessing validation goes through, because it will break the references + monTool.HistPath = f'TrigTauRecMerged_TrigTauPrecisionIDHypo/{name}' # Define quantities to be monitored - monTool.defineHistogram('NInputTaus;nInputTaus', path='EXPERT', type='TH1F', title='Input Taus (before selection); N Taus; Entries', xbins=10, xmin=0, xmax=10) + monTool.defineHistogram('NInputTaus', path='EXPERT', type='TH1F', title='Input Taus (before selection); N Taus; Entries', xbins=10, xmin=0, xmax=10) labels = ['Initial', 'p_{T}', 'NTracks & NIsoTracks', 'ID'] monTool.defineHistogram('CutCounter', path='EXPERT', type='TH1I', title='Passed Tau cuts; Cut; Entries', xbins=len(labels), xmin=0, xmax=len(labels), xlabels=labels) - monTool.defineHistogram('PtAccepted;ptAccepted', path='EXPERT', type='TH1F', title='Accepted Tau p_{T}; p_{T} [GeV]; Entries', xbins=80, xmin=0, xmax=800) - monTool.defineHistogram('NTracksAccepted;nTrackAccepted', path='EXPERT', type='TH1F', title='Accepted Tau Tracks; N Tracks; Entries', xbins=10, xmin=0, xmax=10) - monTool.defineHistogram('NIsoTracksAccepted;nWideTrackAccepted', path='EXPERT', type='TH1F', title='Accepted Tau Isolation Tracks; N Isolation Tracks; Entries', xbins=10, xmin=0, xmax=10) + monTool.defineHistogram('PtAccepted', path='EXPERT', type='TH1F', title='Accepted Tau p_{T}; p_{T} [GeV]; Entries', xbins=80, xmin=0, xmax=800) + monTool.defineHistogram('NTracksAccepted', path='EXPERT', type='TH1F', title='Accepted Tau Tracks; N Tracks; Entries', xbins=10, xmin=0, xmax=10) + monTool.defineHistogram('NIsoTracksAccepted', path='EXPERT', type='TH1F', title='Accepted Tau Isolation Tracks; N Isolation Tracks; Entries', xbins=10, xmin=0, xmax=10) for tau_id in tau_ids: if tau_id in ['DeepSet', 'RNNLLP']: xbins, xmax = 40, 1 else: xbins, xmax = 100, 5 - monTool.defineHistogram(f'{tau_id}_TauJetScoreAccepted_0p;RNNJetScoreAccepted_0p', path='EXPERT', type='TH1F', title=f'Accepted 0-prong {tau_id} Tau ID score; Score; Entries', xbins=xbins, xmin=0, xmax=xmax) - monTool.defineHistogram(f'{tau_id}_TauJetScoreTransAccepted_0p;RNNJetScoreSigTransAccepted_0p', path='EXPERT', type='TH1F', title=f'Accepted 0-prong {tau_id} Tau ID transformed score; Transformed Signal Score; Entries', xbins=xbins, xmin=0, xmax=xmax) + monTool.defineHistogram(f'{tau_id}_TauJetScoreAccepted_0p', path='EXPERT', type='TH1F', title=f'Accepted 0-prong {tau_id} Tau ID score; Score; Entries', xbins=xbins, xmin=0, xmax=xmax) + monTool.defineHistogram(f'{tau_id}_TauJetScoreTransAccepted_0p', path='EXPERT', type='TH1F', title=f'Accepted 0-prong {tau_id} Tau ID transformed score; Transformed Signal Score; Entries', xbins=xbins, xmin=0, xmax=xmax) - monTool.defineHistogram(f'{tau_id}_TauJetScoreAccepted_1p;RNNJetScoreAccepted_1p', path='EXPERT', type='TH1F', title=f'Accepted 1-prong {tau_id} Tau ID score; Score; Entries', xbins=xbins, xmin=0, xmax=xmax) - monTool.defineHistogram(f'{tau_id}_TauJetScoreTransAccepted_1p;RNNJetScoreSigTransAccepted_1p', path='EXPERT', type='TH1F', title=f'Accepted 1-prong {tau_id} Tau ID transformed score; Transformed Signal Score; Entries', xbins=xbins, xmin=0, xmax=xmax) + monTool.defineHistogram(f'{tau_id}_TauJetScoreAccepted_1p', path='EXPERT', type='TH1F', title=f'Accepted 1-prong {tau_id} Tau ID score; Score; Entries', xbins=xbins, xmin=0, xmax=xmax) + monTool.defineHistogram(f'{tau_id}_TauJetScoreTransAccepted_1p', path='EXPERT', type='TH1F', title=f'Accepted 1-prong {tau_id} Tau ID transformed score; Transformed Signal Score; Entries', xbins=xbins, xmin=0, xmax=xmax) - monTool.defineHistogram(f'{tau_id}_TauJetScoreAccepted_mp;RNNJetScoreAccepted_mp', path='EXPERT', type='TH1F', title=f'Accepted multi-prong {tau_id} Tau ID score; Score; Entries', xbins=xbins, xmin=0, xmax=xmax) - monTool.defineHistogram(f'{tau_id}_TauJetScoreTransAccepted_mp;RNNJetScoreSigTransAccepted_mp', path='EXPERT', type='TH1F', title=f'Accepted multi-prong {tau_id} Tau ID transformed score; Transformed Signal Score; Entries', xbins=xbins, xmin=0, xmax=xmax) + monTool.defineHistogram(f'{tau_id}_TauJetScoreAccepted_mp', path='EXPERT', type='TH1F', title=f'Accepted multi-prong {tau_id} Tau ID score; Score; Entries', xbins=xbins, xmin=0, xmax=xmax) + monTool.defineHistogram(f'{tau_id}_TauJetScoreTransAccepted_mp', path='EXPERT', type='TH1F', title=f'Accepted multi-prong {tau_id} Tau ID transformed score; Transformed Signal Score; Entries', xbins=xbins, xmin=0, xmax=xmax) return monTool @@ -41,11 +38,11 @@ def getTrigTauPrecisionDiKaonHypoToolMonitoring(flags, name: str): # We will fix the naming convention as soon as the first weekly HLT Reprocessing validation goes through, because it will break the references - monTool.defineHistogram('NInputTaus;nInputTaus', path='EXPERT', type='TH1F', title='Input Taus (before selection); N Taus; Entries', xbins=10, xmin=0, xmax=10) + monTool.defineHistogram('NInputTaus', path='EXPERT', type='TH1F', title='Input Taus (before selection); N Taus; Entries', xbins=10, xmin=0, xmax=10) - monTool.defineHistogram('PtAccepted;ptAccepted', path='EXPERT', type='TH1F', title='Accepted Tau p_{T}; p_{T} [GeV]; Entries', xbins=80, xmin=0, xmax=800) - monTool.defineHistogram('NTracksAccepted;nTrackAccepted', path='EXPERT', type='TH1F', title='Accepted Tau Tracks; N Tracks; Entries', xbins=10, xmin=0, xmax=10) - monTool.defineHistogram('NIsoTracksAccepted;nWideTrackAccepted', path='EXPERT', type='TH1F', title='Accepted Tau Isolation Tracks; N Isolation Tracks; Entries', xbins=10, xmin=0, xmax=10) + monTool.defineHistogram('PtAccepted', path='EXPERT', type='TH1F', title='Accepted Tau p_{T}; p_{T} [GeV]; Entries', xbins=80, xmin=0, xmax=800) + monTool.defineHistogram('NTracksAccepted', path='EXPERT', type='TH1F', title='Accepted Tau Tracks; N Tracks; Entries', xbins=10, xmin=0, xmax=10) + monTool.defineHistogram('NIsoTracksAccepted', path='EXPERT', type='TH1F', title='Accepted Tau Isolation Tracks; N Isolation Tracks; Entries', xbins=10, xmin=0, xmax=10) monTool.defineHistogram('dRAccepted', path='EXPERT', type='TH1F', title='Accepted Tau Maximum #DeltaR(Tau, Tracks); Maximum #DeltaR(Tau, Tracks); Entries', xbins=40, xmin=0, xmax=0.4) monTool.defineHistogram('massTrkSysAccepted', path='EXPERT', type='TH1F', title='Accepted Tau Di-pion system Mass; m_{#pi#pi} [GeV]; Entries', xbins=50, xmin=0, xmax=3) diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py index b66fdb3c5afe..593e86c1c4a6 100644 --- a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py +++ b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py @@ -416,7 +416,7 @@ class TrigTauMonAlgBuilder: def bookIDInputScalar(self, mon_alg, base_path, trigger, n_prong, online): type_str = 'HLT' if online else 'Offline' mon_group_name = f'{trigger}_ID_{type_str}_InputScalar_{n_prong}' - mon_group_path = f'{base_path}/RNNVars/InputScalar_{n_prong}/{trigger}/{type_str}' + mon_group_path = f'{base_path}/TauIDVars/InputScalar_{n_prong}/{trigger}/{type_str}' mon_group = self.helper.addGroup(mon_alg, mon_group_name, mon_group_path) mon_group.defineHistogram('centFrac', title=f'Centrality Fraction ({n_prong}); centFrac; Events', xbins=50, xmin=-0.05, xmax=1.2, opt='kAlwaysCreate') @@ -436,7 +436,7 @@ class TrigTauMonAlgBuilder: def bookIDInputTrack(self, mon_alg, base_path, trigger, online): type_str = 'HLT' if online else 'Offline' mon_group_name = f'{trigger}_ID_{type_str}_InputTrack' - mon_group_path = f'{base_path}/RNNVars/InputTrack/{trigger}/{type_str}' + mon_group_path = f'{base_path}/TauIDVars/InputTrack/{trigger}/{type_str}' mon_group = self.helper.addGroup(mon_alg, mon_group_name, mon_group_path) mon_group.defineHistogram('n_track', title='Number of tracks; N_{track}; Events', xbins=15, xmin=0, xmax=15, opt='kAlwaysCreate') @@ -458,7 +458,7 @@ class TrigTauMonAlgBuilder: def bookIDInputCluster(self, mon_alg, base_path, trigger, online): type_str = 'HLT' if online else 'Offline' mon_group_name = f'{trigger}_ID_{type_str}_InputCluster' - mon_group_path = f'{base_path}/RNNVars/InputCluster/{trigger}/{type_str}' + mon_group_path = f'{base_path}/TauIDVars/InputCluster/{trigger}/{type_str}' mon_group = self.helper.addGroup(mon_alg, mon_group_name, mon_group_path) mon_group.defineHistogram('n_cluster', title='Number of clusters; N_{cluster}; Events', xbins=30, xmin=0, xmax=30, opt='kAlwaysCreate') @@ -498,8 +498,8 @@ class TrigTauMonAlgBuilder: if tau_id in ['RNN', 'DeepSet', 'RNNLLP']: xbins, xmax = 20, 1 else: xbins, xmax = 100, 5 - mon_group.defineHistogram(f'{tau_id}_TauIDScore;RNNScore', title=f'{type_str} {tau_id} TauID score; TauID score; Events', xbins=xbins, xmin=0, xmax=xmax, opt='kAlwaysCreate') - mon_group.defineHistogram(f'{tau_id}_TauIDScoreSigTrans;RNNScoreSigTrans', title=f'{type_str} {tau_id} TauID score sig. transformed; TauID score sig. transformed; Events', xbins=xbins, xmin=0, xmax=xmax, opt='kAlwaysCreate') + mon_group.defineHistogram(f'{tau_id}_TauIDScore', title=f'{type_str} {tau_id} TauID score; TauID score; Events', xbins=xbins, xmin=0, xmax=xmax, opt='kAlwaysCreate') + mon_group.defineHistogram(f'{tau_id}_TauIDScoreSigTrans', title=f'{type_str} {tau_id} TauID score sig. transformed; TauID score sig. transformed; Events', xbins=xbins, xmin=0, xmax=xmax, opt='kAlwaysCreate') def bookBasicVars(self, mon_alg, base_path, trigger, n_prong, online): @@ -517,7 +517,7 @@ class TrigTauMonAlgBuilder: mon_group.defineHistogram('Eta,Phi', type='TH2F', title=f'{type_str} #eta vs #phi; #eta; #phi', xbins=26, xmin=-2.6, xmax=2.6, ybins=16, ymin=-3.2, ymax=3.2, opt='kAlwaysCreate') mon_group.defineHistogram('Pt,Phi', type='TH2F', title=f'{type_str} p_{{T}} vs #phi; p_{{T}} [GeV]; #phi', xbins=binning, ybins=16, ymin=-3.2, ymax=3.2, opt='kAlwaysCreate') mon_group.defineHistogram('Pt,Eta', type='TH2F', title=f'{type_str} p_{{T}} vs #eta; p_{{T}} [GeV]; #eta', xbins=binning, ybins=26, ymin=-2.6, ymax=2.6, opt='kAlwaysCreate') - mon_group.defineHistogram('nIsoTrack;nWideTrack', title=f'{type_str} Number of isolation tracks; N_{{track}}^{{iso}}; Events', xbins=10, xmin=0, xmax=10, opt='kAlwaysCreate') + mon_group.defineHistogram('nIsoTrack', title=f'{type_str} Number of isolation tracks; N_{{track}}^{{iso}}; Events', xbins=10, xmin=0, xmax=10, opt='kAlwaysCreate') mon_group.defineHistogram('averageMu', title=f'{type_str} Average #mu; #LT#mu$GT; Events', xbins=20, xmin=0, xmax=80, opt='kAlwaysCreate') mon_group.defineHistogram('TauVertexX', title=f'{type_str} Tau Vertex X; x [mm]; Events', xbins=100, xmin=-1, xmax=1, opt='kAlwaysCreate') mon_group.defineHistogram('TauVertexY', title=f'{type_str} Tau Vertex Y; y [mm]; Events', xbins=100, xmin=-2, xmax=0, opt='kAlwaysCreate') -- GitLab From ddd82444d148b6a4c7d683fd1547da2e3a3c9a46 Mon Sep 17 00:00:00 2001 From: Jean Yves Beaucamp <jean.yves.beaucamp@cern.ch> Date: Mon, 25 Nov 2024 18:40:18 +0100 Subject: [PATCH 2/2] Fix TrigTauRec folders --- .../TrigTauRec/python/TrigTauRecMonitoring.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecMonitoring.py b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecMonitoring.py index 589f507b9703..d5df1eaaf14e 100644 --- a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecMonitoring.py +++ b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecMonitoring.py @@ -4,9 +4,7 @@ from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool def tauMonitoringCaloOnlyMVA(flags, name: str = 'CaloMVA', RoI_name: str = 'L1'): monTool = GenericMonitoringTool(flags, 'MonTool') - monTool.HistPath = 'TrigTauRecMerged_TauCaloOnlyMVA' # The name override will be removed after the validation - - # After the validation we are removing the name overrides + monTool.HistPath = 'TrigTauRecMerged_CaloMVA' monTool.defineHistogram('NTauCandidates', path='EXPERT', type='TH1F', title=name+' Tau candidates; N Tau; Entries', xbins=10, xmin=-1.0, xmax=9) @@ -72,9 +70,7 @@ def tauMonitoringCaloOnlyMVA(flags, name: str = 'CaloMVA', RoI_name: str = 'L1') def tauMonitoringPrecision(flags, name: str = 'Precision', RoI_name: str = 'tauIso', tau_ids: list[str] = [], alg_name: str = ''): monTool = tauMonitoringCaloOnlyMVA(flags, name, RoI_name) - monTool.HistPath = f'TrigTauRecMerged_TauPrecision_Precision{alg_name}' # The name override will be removed after the validation - - # After the validation we are removing the name overrides + monTool.HistPath = f'TrigTauRecMerged_{name}' + (f'_{alg_name}' if alg_name else '') # TauJet track variables monTool.defineHistogram('NTracks', path='EXPERT', type='TH1F', title=name+' TauJet core tracks; N Tracks; Entries', xbins=17, xmin=-2.0, xmax=15) -- GitLab