diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitCategory.py b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitCategory.py
index 607538445c4935ec5aed9ec833041e67a240fa97..1db745a39111dd6cbdc7d698f0335ec184fed513 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitCategory.py
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitCategory.py
@@ -5,8 +5,8 @@ monitoring_singleTau = [
]
monitoring_tau = [
- 'tau0_perf_ptonly_L1TAU12',
- 'tau0_perf_ptonly_L1TAU60',
+ 'tau0_ptonly_L1TAU8',
+ 'tau0_ptonly_L1TAU60',
'tau25_idperf_track',
'tau25_idperf_tracktwo',
'tau25_perf_tracktwo',
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py
index 261714ee6722bef36950cd3f904a392cbeb14920..3173ee194ca4785349a038d5f0b5f263e26e3431 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py
@@ -52,8 +52,6 @@ def TrigTauMonitoringTool():
'tau25_mediumRNN_tracktwoMVABDT_L1TAU12IM',
'tau25_tightRNN_tracktwoMVA_L1TAU12IM',
'tau25_tightRNN_tracktwoMVABDT_L1TAU12IM',
- 'tau25_medium1_tracktwoMVA_L1TAU12IM',
- 'tau25_medium1_tracktwoMVABDT_L1TAU12IM',
'tau35_idperf_tracktwoMVA_L1TAU12IM',
'tau35_idperf_tracktwoMVABDT_L1TAU12IM',
'tau35_perf_tracktwoMVA_L1TAU12IM',
@@ -70,8 +68,6 @@ def TrigTauMonitoringTool():
'tau160_perf_tracktwoMVABDT_L1TAU100',
'tau160_mediumRNN_tracktwoMVA_L1TAU100',
'tau160_mediumRNN_tracktwoMVABDT_L1TAU100',
- 'tau160_medium1_tracktwoMVA_L1TAU100',
- 'tau160_medium1_tracktwoMVABDT_L1TAU100',
]
RNN_chains = [
@@ -94,8 +90,8 @@ def TrigTauMonitoringTool():
BDTRNN_chains = [
'tau0_idperf_tracktwoMVA_L1eTAU12',
'tau0_idperf_tracktwoMVA_L1eTAU5',
- 'tau0_perf_ptonly_L1TAU12',
- 'tau0_perf_ptonly_L1TAU60',
+ 'tau0_ptonly_L1TAU8',
+ 'tau0_ptonly_L1TAU60',
'tau25_ptonly_L1TAU12IM',
'tau25_idperf_track_L1TAU12IM',
'tau25_idperf_tracktwo_L1TAU12IM',
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx
index 86d609a8e073911d1c7d27d937ddce9661532147..0e68f3a2cc096507a2ce54eb888527c679f46523 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx
@@ -1003,8 +1003,25 @@ StatusCode HLTTauMonTool::fillHistogramsForItem(const std::string & trigItem, co
ATH_CHECK(fillPreselTau(*tauJetEL));
setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/PrecisionVsOffline");
ATH_CHECK(fillPreselTauVsOffline(*tauJetEL,goodTauRefType));
+
+ if(*tauJetEL) sc = fillEFTau(*tauJetEL, trigItem, "basicVars", monRNN, monBDT);
+ if (monBDT) {
+ if(*tauJetEL) sc = fillEFTau(*tauJetEL, trigItem, "1p_NonCorr", monRNN, monBDT);
+ if(*tauJetEL) sc = fillEFTau(*tauJetEL, trigItem, "mp_NonCorr", monRNN, monBDT);
+ }
+ if(!sc.isSuccess()){ ATH_MSG_WARNING("Failed to Fill BDT input histograms for fillEFTau(). Exiting!"); return sc;}
+
+ if(m_truth) if(*tauJetEL) sc = fillEFTauVsTruth(*tauJetEL, trigItem);
+ if(*tauJetEL) sc = fillEFTauVsOffline(*tauJetEL, trigItem, "basicVars", goodTauRefType);
+ if (monBDT) {
+ if(*tauJetEL) sc = fillEFTauVsOffline(*tauJetEL, trigItem, "1p_NonCorr", goodTauRefType);
+ if(*tauJetEL) sc = fillEFTauVsOffline(*tauJetEL, trigItem, "mp_NonCorr", goodTauRefType);
+ }
+ if(!sc.isSuccess()){ ATH_MSG_WARNING("Failed to Fill histograms for fillEFTauVsOffline(). Exiting!"); return sc;}
+
} // end comb loop
+
const std::vector< TrigCompositeUtils::LinkInfo<xAOD::TauJetContainer> > featuresMerged
= getTDT()->features<xAOD::TauJetContainer>( trig_item_EF, m_HLTTriggerCondition, "HLT_TrigTauRecMerged_MVA");
@@ -1020,12 +1037,13 @@ StatusCode HLTTauMonTool::fillHistogramsForItem(const std::string & trigItem, co
}
const ElementLink<xAOD::TauJetContainer> tauJetEL = tauJetLinkInfo.link;
if(!Selection(*tauJetEL)) continue;
+
+ setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/PrecisionTau");
+ ATH_CHECK(fillPreselTau(*tauJetEL));
+ setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/PrecisionVsOffline");
+ ATH_CHECK(fillPreselTauVsOffline(*tauJetEL,goodTauRefType));
+
if(*tauJetEL) sc = fillEFTau(*tauJetEL, trigItem, "basicVars", monRNN, monBDT);
- if (monBDT) {
- if(*tauJetEL) sc = fillEFTau(*tauJetEL, trigItem, "1p_NonCorr", monRNN, monBDT);
- if(*tauJetEL) sc = fillEFTau(*tauJetEL, trigItem, "mp_NonCorr", monRNN, monBDT);
- }
- if(!sc.isSuccess()){ ATH_MSG_WARNING("Failed to Fill BDT input histograms for fillEFTau(). Exiting!"); return sc;}
if(monRNN) {
if(*tauJetEL) sc = fillEFTau(*tauJetEL, trigItem, "RNN_inScalar_1P", monRNN, monBDT);
if(*tauJetEL) sc = fillEFTau(*tauJetEL, trigItem, "RNN_inScalar_3P", monRNN, monBDT);
@@ -1036,10 +1054,6 @@ StatusCode HLTTauMonTool::fillHistogramsForItem(const std::string & trigItem, co
}
if(m_truth) if(*tauJetEL) sc = fillEFTauVsTruth(*tauJetEL, trigItem);
if(*tauJetEL) sc = fillEFTauVsOffline(*tauJetEL, trigItem, "basicVars", goodTauRefType);
- if (monBDT) {
- if(*tauJetEL) sc = fillEFTauVsOffline(*tauJetEL, trigItem, "1p_NonCorr", goodTauRefType);
- if(*tauJetEL) sc = fillEFTauVsOffline(*tauJetEL, trigItem, "mp_NonCorr", goodTauRefType);
- }
if(!sc.isSuccess()){ ATH_MSG_WARNING("Failed to Fill histograms for fillEFTauVsOffline(). Exiting!"); return sc;}
} // end comb loop
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool_bookHistograms.cxx b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool_bookHistograms.cxx
index c909317ce337771642728399318579cfbebb30de..b4ce756e433d6bf4582437eb1f075c0e313092ca 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool_bookHistograms.cxx
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool_bookHistograms.cxx
@@ -105,23 +105,21 @@ void HLTTauMonTool::bookHistogramsForItem(const std::string & trigItem){
// Precision Tau
//--------------------
- if(trigItem.find("tracktwoMVA")==string::npos && trigItem.find("tracktwoEF")==string::npos) {
- addMonGroup(new MonGroup(this,"HLT/TauMon/Expert/"+trigItemShort+"/PrecisionTau",run));
- setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/PrecisionTau");
- addHistogram(new TH1F("hEFEt","EF Et;E_{T}[GeV];Nevents",40,0.0,100.0));
- addHistogram(new TH1F("hEFEt2","EF Et;E_{T}[GeV];Nevents",100,0.0,1000.0));
- addHistogram(new TH1F("hFTFnTrack","EF number of tracks;number of tracks;Nevents",10,0,10));
- addHistogram(new TH1F("hEta","EF TrigCaloCluster Eta; #eta ; Nevents",26,-2.6,2.6));
- addHistogram(new TH1F("hPhi","EF TrigCaloCluster Phi; #phi ; Nevents",32,-3.2,3.2));
- addHistogram(new TH2F("hEFEtaVsPhi","EF TrigCaloCluster Eta vs Phi; #eta ; #phi ; Nevents",
+ addMonGroup(new MonGroup(this,"HLT/TauMon/Expert/"+trigItemShort+"/PrecisionTau",run));
+ setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/PrecisionTau");
+ addHistogram(new TH1F("hEFEt","EF Et;E_{T}[GeV];Nevents",40,0.0,100.0));
+ addHistogram(new TH1F("hEFEt2","EF Et;E_{T}[GeV];Nevents",100,0.0,1000.0));
+ addHistogram(new TH1F("hFTFnTrack","EF number of tracks;number of tracks;Nevents",10,0,10));
+ addHistogram(new TH1F("hEta","EF TrigCaloCluster Eta; #eta ; Nevents",26,-2.6,2.6));
+ addHistogram(new TH1F("hPhi","EF TrigCaloCluster Phi; #phi ; Nevents",32,-3.2,3.2));
+ addHistogram(new TH2F("hEFEtaVsPhi","EF TrigCaloCluster Eta vs Phi; #eta ; #phi ; Nevents",
26,-2.6,2.6,32,-3.2,3.2));
- addHistogram(new TH2F("hEtVsEta","Et from tau Jet vs #eta; #eta^{EF}; Raw E_{T}[GeV]",
+ addHistogram(new TH2F("hEtVsEta","Et from tau Jet vs #eta; #eta^{EF}; Raw E_{T}[GeV]",
26,-2.6,2.6,40,0.0,100.0));
- addHistogram(new TH2F("hEtVsPhi","Et from tau Jet vs #phi; #phi^{EF}; Raw E_{T} [GeV]",
+ addHistogram(new TH2F("hEtVsPhi","Et from tau Jet vs #phi; #phi^{EF}; Raw E_{T} [GeV]",
32,-3.2,3.2,40,0.0,100.0));
- addHistogram(new TH1F("hFTFnWideTrack","EF number of wide tracks;number of tracks;Nevents",10,0,10));
- }
-
+ addHistogram(new TH1F("hFTFnWideTrack","EF number of wide tracks;number of tracks;Nevents",10,0,10));
+
//--------------------
// EF
//--------------------
@@ -330,15 +328,13 @@ void HLTTauMonTool::bookHistogramsForItem(const std::string & trigItem){
//--------------------
// Precision vs Offline
//--------------------
- if(trigItem.find("tracktwoMVA")==string::npos && trigItem.find("tracktwoEF")==string::npos) {
- addMonGroup(new MonGroup(this,"HLT/TauMon/Expert/"+trigItemShort+"/PrecisionVsOffline",run));
- setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/PrecisionVsOffline");
- addHistogram(new TH2F("hPreselvsOffnTrks","nTrks at FTF vs Off; nTrks off; nTrks FTF",10,0,10,10,0,10));
- addHistogram(new TH2F("hPreselvsOffnWideTrks","nWideTrks at FTF vs Off; nWideTrks off; nWideTrks FTF",10,0,10,10,0,10));
- addHistogram(new TH1F("hEFEtRatio","FTF-Offline Et Relative difference; Et relative diff; Et relative diff",50,-0.3,0.3));
- addHistogram(new TH1F("hEtaRatio","FTF-Offline Eta Relative difference; Eta relative diff; Eta relative diff",50,-0.3,0.3));
- addHistogram(new TH1F("hPhiRatio","FTF-Offline Phi Relative difference; Phi relative diff; Phi relative diff",50,-0.05,0.05));
- }
+ addMonGroup(new MonGroup(this,"HLT/TauMon/Expert/"+trigItemShort+"/PrecisionVsOffline",run));
+ setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/PrecisionVsOffline");
+ addHistogram(new TH2F("hPreselvsOffnTrks","nTrks at FTF vs Off; nTrks off; nTrks FTF",10,0,10,10,0,10));
+ addHistogram(new TH2F("hPreselvsOffnWideTrks","nWideTrks at FTF vs Off; nWideTrks off; nWideTrks FTF",10,0,10,10,0,10));
+ addHistogram(new TH1F("hEFEtRatio","FTF-Offline Et Relative difference; Et relative diff; Et relative diff",50,-0.3,0.3));
+ addHistogram(new TH1F("hEtaRatio","FTF-Offline Eta Relative difference; Eta relative diff; Eta relative diff",50,-0.3,0.3));
+ addHistogram(new TH1F("hPhiRatio","FTF-Offline Phi Relative difference; Phi relative diff; Phi relative diff",50,-0.05,0.05));
if(m_truth){
//----------------