diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/DecisionCollectorTool.cxx b/Trigger/TrigMonitoring/TrigSteerMonitor/src/DecisionCollectorTool.cxx
index bea67badfe883f15ee9a9818afd69dc8f20e74b1..a3d5eb66447f96deb82305bf5b0278c60426565a 100644
--- a/Trigger/TrigMonitoring/TrigSteerMonitor/src/DecisionCollectorTool.cxx
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/DecisionCollectorTool.cxx
@@ -21,12 +21,14 @@ StatusCode DecisionCollectorTool::finalize() {
-StatusCode DecisionCollectorTool::getDecisions( TrigCompositeUtils::DecisionIDContainer& output ) const {
+StatusCode DecisionCollectorTool::getDecisions( std::vector<TrigCompositeUtils::DecisionID>& output ) const {
for (auto decisionKey: m_decisionsKey ) {
auto handle = SG::makeHandle( decisionKey );
if ( handle.isValid() ) {
- for ( const TrigCompositeUtils::Decision* d : *handle.cptr() ) {
- TrigCompositeUtils::decisionIDs( d, output );
+ for ( const TrigCompositeUtils::Decision* d : *handle.cptr() ) {
+ output.insert( output.end(),
+ TrigCompositeUtils::decisionIDs( d ).begin(),
+ TrigCompositeUtils::decisionIDs( d ).end() );
}
}
}
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/DecisionCollectorTool.h b/Trigger/TrigMonitoring/TrigSteerMonitor/src/DecisionCollectorTool.h
index df2c310811b043e7830234bf8cd247953587d1a1..cf17067d307153c135be7adb57ed420dc4f8a26b 100644
--- a/Trigger/TrigMonitoring/TrigSteerMonitor/src/DecisionCollectorTool.h
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/DecisionCollectorTool.h
@@ -21,7 +21,7 @@ public:
DecisionCollectorTool(const std::string& type, const std::string& name, const IInterface* parent);
virtual ~DecisionCollectorTool() override;
- virtual StatusCode getDecisions( TrigCompositeUtils::DecisionIDContainer& ) const override;
+ virtual StatusCode getDecisions( std::vector<TrigCompositeUtils::DecisionID>& ) const override;
virtual StatusCode initialize() override;
virtual StatusCode finalize() override;
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/IDecisionCollector.h b/Trigger/TrigMonitoring/TrigSteerMonitor/src/IDecisionCollector.h
index 9113639dd93558296cac3a05ee5e2aaefb7fe517..2cefaea7cedead42d4fec50e6b7e859cd1a749f0 100644
--- a/Trigger/TrigMonitoring/TrigSteerMonitor/src/IDecisionCollector.h
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/IDecisionCollector.h
@@ -15,7 +15,7 @@ class IDecisionCollector : virtual public IAlgTool {
public:
DeclareInterfaceID(IDecisionCollector, 1, 0);
- virtual StatusCode getDecisions( TrigCompositeUtils::DecisionIDContainer& ) const = 0;
+ virtual StatusCode getDecisions( std::vector<TrigCompositeUtils::DecisionID>& ) const = 0;
virtual ~IDecisionCollector() override {}
};
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.cxx b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.cxx
index 7d4281860eae5e4e8389c571ddd4e2950be27655..b383cc9c9d900e70bdf20a388b60bc15d6407576 100644
--- a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.cxx
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.cxx
@@ -38,15 +38,23 @@ StatusCode TrigSignatureMoniMT::initialize() {
m_outputHistogram = m_histSvc.getHist( fullName );
*/
- m_outputHistogram = new TH2I( "SignatureAcceptance", "Raw acceptance of signatures in;chain;step",
+ m_passHistogram = new TH2I( "SignatureAcceptance", "Raw acceptance of signatures in;chain;step",
x, 1, x + 1,
y, 1, y + 1 ); // Fill and GetBinContent use the same indexing then
- const std::string fullName = m_bookingPath + "/SignatureAcceptance";
- m_histSvc->regHist( fullName, m_outputHistogram );
+
+ m_countHistogram = (TH2*)m_passHistogram->Clone("DecisionCount");
+ m_countHistogram->SetTitle("Positive decisions count per step;chain;step");
+
+
+ m_histSvc->regHist( m_bookingPath + "/"+m_passHistogram->GetName(), m_passHistogram );
+ m_histSvc->regHist( m_bookingPath + "/"+m_countHistogram->GetName(), m_countHistogram );
+
+
- ATH_MSG_DEBUG( "Registerd under " << fullName );
+
}
- CHECK( initHist() );
+ CHECK( initHist( m_passHistogram ) );
+ CHECK( initHist( m_countHistogram ) );
return StatusCode::SUCCESS;
@@ -54,33 +62,58 @@ StatusCode TrigSignatureMoniMT::initialize() {
StatusCode TrigSignatureMoniMT::finalize() {
- auto collToString = [&]( int xbin){
- std::string v;
- for ( int ybin = 1; ybin <= m_outputHistogram->GetYaxis()->GetNbins(); ++ybin ) {
- v += std::to_string( int(m_outputHistogram->GetBinContent( xbin, ybin )) );
- v += std::string( 10*ybin - v.size(), ' ' ); // fill with spaces
+ auto collToString = [&]( int xbin, const TH2* hist, int startOfset=0, int endOffset=0){
+ std::string v;
+ for ( int ybin = 1; ybin <= hist->GetYaxis()->GetNbins()-endOffset; ++ybin ) {
+ if ( ybin > startOfset ) {
+ v += std::to_string( int(hist->GetBinContent( xbin, ybin )) );
+ v += std::string( 10*ybin - v.size(), ' ' ); // fill with spaces
+ } else {
+ v += std::string( 10, ' ');
+ }
+ }
+
+ return v;
+ };
+
+ ATH_MSG_INFO( "Chains passing step (1st row events & 2nd row decision counts" );
+ ATH_MSG_INFO( "Chain name L1, AfterPS, [... steps ...], Output" );
+
+
+ auto fixedWidth = [](const std::string& s, size_t sz) {
+ return s.size() < sz ?
+ s+ std::string(sz - s.size(), ' ') : s; };
+
+ for ( int bin = 1; bin <= m_passHistogram->GetXaxis()->GetNbins(); ++bin ) {
+ const std::string chainName = m_passHistogram->GetXaxis()->GetBinLabel(bin);
+ ATH_MSG_INFO( fixedWidth(chainName, 30) << collToString( bin, m_passHistogram ) );
+ if ( chainName.find("HLT") == 0 ) { // print only for chains
+ ATH_MSG_INFO( fixedWidth(chainName +" decisions", 30) << collToString( bin, m_countHistogram, 2, 1 ) );
}
+ }
- return v;
- };
+
+ return StatusCode::SUCCESS;
+}
- ATH_MSG_INFO("Chain name L1, AfterPS, [... steps ...], Output" );
- for ( int bin = 1; bin <= m_outputHistogram->GetXaxis()->GetNbins(); ++bin ) {
- const std::string chainName = m_outputHistogram->GetXaxis()->GetBinLabel(bin);
- ATH_MSG_INFO( chainName << std::string( 30 - chainName.size(), ' ' ) << collToString( bin ) );
+StatusCode TrigSignatureMoniMT::fillPass(const TrigCompositeUtils::DecisionIDContainer& dc, int row) {
+ for ( auto id : dc ) {
+ auto id2bin = m_chainIDToBinMap.find( id );
+ if ( id2bin == m_chainIDToBinMap.end() ) {
+ ATH_MSG_WARNING( "HLT chain " << HLT::Identifier(id) << " not configured to be monitored" );
+ } else {
+ m_passHistogram->Fill( id2bin->second, double(row) );
+ }
}
-
return StatusCode::SUCCESS;
}
-StatusCode TrigSignatureMoniMT::fillChains(const TrigCompositeUtils::DecisionIDContainer& dc, int row) {
+StatusCode TrigSignatureMoniMT::fillCount(const std::vector<TrigCompositeUtils::DecisionID>& dc, int row) {
for ( auto id : dc ) {
- ATH_MSG_DEBUG( "row " << row << " " << HLT::Identifier(id) );
auto id2bin = m_chainIDToBinMap.find( id );
if ( id2bin == m_chainIDToBinMap.end() ) {
- ATH_MSG_WARNING( "HLT chain " << HLT::Identifier(id) << " not configured to be monitored" );
} else {
- m_outputHistogram->Fill( id2bin->second, double(row) );
+ m_countHistogram->Fill( id2bin->second, double(row) );
}
}
return StatusCode::SUCCESS;
@@ -97,9 +130,9 @@ StatusCode TrigSignatureMoniMT::execute() {
TrigCompositeUtils::DecisionIDContainer ids;
TrigCompositeUtils::decisionIDs( l1Decisions->at( index ), ids );
ATH_MSG_DEBUG( "L1 " << index << " N positive decisions " << ids.size() );
- CHECK( fillChains( ids, index + 1 ) );
+ CHECK( fillPass( ids, index + 1 ) );
if ( not ids.empty() )
- m_outputHistogram->Fill( 1, double(index + 1) );
+ m_passHistogram->Fill( 1, double(index + 1) );
return StatusCode::SUCCESS;
};
@@ -107,23 +140,26 @@ StatusCode TrigSignatureMoniMT::execute() {
CHECK( fillL1(1) );
int step = 0;
for ( auto& ctool: m_collectorTools ) {
- TrigCompositeUtils::DecisionIDContainer stepSum;
+ std::vector<TrigCompositeUtils::DecisionID> stepSum;
ctool->getDecisions( stepSum );
ATH_MSG_DEBUG( " Step " << step << " decisions " << stepSum.size() );
- ATH_CHECK( fillChains( stepSum, 3+step ) );
+ TrigCompositeUtils::DecisionIDContainer stepUniqueSum( stepSum.begin(), stepSum.end() );
+ ATH_CHECK( fillPass( stepUniqueSum, 3+step ) );
+ ATH_CHECK( fillCount( stepSum, 3+step ) );
+
++step;
}
- const int row = m_outputHistogram->GetYaxis()->GetNbins();
+ const int row = m_passHistogram->GetYaxis()->GetNbins();
auto finalDecisionsHandle = SG::makeHandle( m_finalDecisionKey );
ATH_CHECK( finalDecisionsHandle.isValid() );
ATH_CHECK( finalDecisionsHandle->size() == 1 );
TrigCompositeUtils::DecisionIDContainer finalIDs;
TrigCompositeUtils::decisionIDs( finalDecisionsHandle->at(0), finalIDs );
- ATH_CHECK( fillChains( finalIDs, row ) );
+ ATH_CHECK( fillPass( finalIDs, row ) );
if ( not finalIDs.empty() ) {
- m_outputHistogram->Fill( 1, double( row ) );
+ m_passHistogram->Fill( 1, double( row ) );
}
return StatusCode::SUCCESS;
@@ -136,9 +172,9 @@ int TrigSignatureMoniMT::nBinsY() const {
return m_collectorTools.size()+3; // in, after ps, out
}
-StatusCode TrigSignatureMoniMT::initHist() {
+StatusCode TrigSignatureMoniMT::initHist(TH2* hist) {
- TAxis* x = m_outputHistogram->GetXaxis();
+ TAxis* x = hist->GetXaxis();
x->SetBinLabel(1, "All");
int bin = 2; // 1 is for total count, (remember bins numbering in ROOT start from 1)
@@ -152,7 +188,7 @@ StatusCode TrigSignatureMoniMT::initHist() {
}
- TAxis* y = m_outputHistogram->GetYaxis();
+ TAxis* y = hist->GetYaxis();
y->SetBinLabel( 1, "L1" );
y->SetBinLabel( 2, "AfterPS" );
for ( size_t i = 0; i < m_collectorTools.size(); ++i ) {
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.h b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.h
index d73407e2ad7584a1393ae7da07e0717611ec5488..efae5dc32066d8f9c8028e0edf14ea64d8fa2a62 100644
--- a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.h
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.h
@@ -46,14 +46,16 @@ class TrigSignatureMoniMT : public ::AthAlgorithm
ServiceHandle<ITHistSvc> m_histSvc{ this, "THistSvc", "THistSvc/THistSvc", "Histogramming svc" };
Gaudi::Property<std::string> m_bookingPath{ this, "HistParh", "/EXPERT/TrigSteer_HLT", "Booking path for the histogram"};
- TH2* m_outputHistogram;
+ TH2* m_passHistogram;
+ TH2* m_countHistogram;
ToolHandleArray<DecisionCollectorTool> m_collectorTools{ this, "CollectorTools", {}, "Tools that collect decisions for steps" };
int nBinsX() const { return m_allChains.size() +1; }
int nBinsY() const;
- StatusCode initHist();
- StatusCode fillChains(const TrigCompositeUtils::DecisionIDContainer& dc, int row);
+ StatusCode initHist(TH2*);
+ StatusCode fillCount(const std::vector<TrigCompositeUtils::DecisionID>& dc, int row);
+ StatusCode fillPass(const TrigCompositeUtils::DecisionIDContainer& dc, int row);
};
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessing.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessing.ref
index c98107b15439532bfbcad474e673d252ba77be1a..e2ca96fd64a36a54b6769b1d4c2c32e78a1b38d3 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessing.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessing.ref
@@ -1,9 +1,18 @@
TrigSignatureMoniMT INFO HLT_e20 2 2 2 2 2
+TrigSignatureMoniMT INFO HLT_e20 decisions 4 4
TrigSignatureMoniMT INFO HLT_e5 1 1 1 1 1
+TrigSignatureMoniMT INFO HLT_e5 decisions 2 2
TrigSignatureMoniMT INFO HLT_e5_e8 1 1 1 0 1
+TrigSignatureMoniMT INFO HLT_e5_e8 decisions 6 0
TrigSignatureMoniMT INFO HLT_e8 3 3 3 3 3
+TrigSignatureMoniMT INFO HLT_e8 decisions 5 5
TrigSignatureMoniMT INFO HLT_g5 1 1 1 0 1
+TrigSignatureMoniMT INFO HLT_g5 decisions 2 0
TrigSignatureMoniMT INFO HLT_mu20 1 1 0 0 0
+TrigSignatureMoniMT INFO HLT_mu20 decisions 0 0
TrigSignatureMoniMT INFO HLT_mu8 2 2 2 2 2
+TrigSignatureMoniMT INFO HLT_mu8 decisions 2 2
TrigSignatureMoniMT INFO HLT_mu81step 2 2 2 0 2
+TrigSignatureMoniMT INFO HLT_mu81step decisions 2 0
TrigSignatureMoniMT INFO HLT_mu8_e8 1 1 1 1 1
+TrigSignatureMoniMT INFO HLT_mu8_e8 decisions 4 4
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/NewJO.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/NewJO.ref
index 4141b9c5e110c05a2b82af77f5bb910f0c56e0a7..e588126c958b2e63e63f8539822d0bdef62cd4d5 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/NewJO.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/NewJO.ref
@@ -1,9 +1,15 @@
Storing config in the config newJOtest.pkl
Py:Athena INFO now loading newJOtest.pkl ...
+TrigSignatureMoniMT INFO Chains passing step (1st row events & 2nd row decision counts
TrigSignatureMoniMT INFO Chain name L1, AfterPS, [... steps ...], Output
TrigSignatureMoniMT INFO All 20 20 0 0 15
TrigSignatureMoniMT INFO HLT_e3_etcut 20 20 15 0 15
+TrigSignatureMoniMT INFO HLT_e3_etcut decisions 44 0
TrigSignatureMoniMT INFO HLT_e5_etcut 20 20 14 0 14
+TrigSignatureMoniMT INFO HLT_e5_etcut decisions 41 0
TrigSignatureMoniMT INFO HLT_e7_etcut 20 20 8 0 8
+TrigSignatureMoniMT INFO HLT_e7_etcut decisions 13 0
TrigSignatureMoniMT INFO HLT_g10_etcut 20 20 8 8 8
+TrigSignatureMoniMT INFO HLT_g10_etcut decisions 12 12
TrigSignatureMoniMT INFO HLT_g15_etcut 20 20 5 8 8
+TrigSignatureMoniMT INFO HLT_g15_etcut decisions 6 12
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/bJetMenu.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/bJetMenu.ref
index 8480f51fbb13040a37e8fc70fd657973f15bd72e..4e770b61763cf69ce1f73751fcd99b23476c335c 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/bJetMenu.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/bJetMenu.ref
@@ -1,3 +1,6 @@
TrigSignatureMoniMT INFO HLT_j35_gsc45_bmv2c1070 20 20 0 0
+TrigSignatureMoniMT INFO HLT_j35_gsc45_bmv2c1070 decisions 0
TrigSignatureMoniMT INFO HLT_j35_gsc45_bmv2c1070_split 20 20 0 0
+TrigSignatureMoniMT INFO HLT_j35_gsc45_bmv2c1070_split decisions 0
TrigSignatureMoniMT INFO HLT_j35_gsc45_boffperf_split 20 20 0 0
+TrigSignatureMoniMT INFO HLT_j35_gsc45_boffperf_split decisions 0
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/electronMenu.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/electronMenu.ref
index 6091ab75721b3353551c3d1ae3ea82d8d38ffce8..8e8cfe440bebbaa461fd8c198a1a0359ce07b417 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/electronMenu.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/electronMenu.ref
@@ -94,6 +94,10 @@ TriggerSummaryStep1 19 0 DEBUG +++ HLT_e7_etcut ID#243
TriggerSummaryStep2 19 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep2 19 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TrigSignatureMoniMT INFO HLT_e3_etcut 20 9 8 7 7
+TrigSignatureMoniMT INFO HLT_e3_etcut decisions 22 105
TrigSignatureMoniMT INFO HLT_e3_etcut1step 20 20 18 0 18
+TrigSignatureMoniMT INFO HLT_e3_etcut1step decisions 54 0
TrigSignatureMoniMT INFO HLT_e5_etcut 20 20 17 16 16
+TrigSignatureMoniMT INFO HLT_e5_etcut decisions 50 251
TrigSignatureMoniMT INFO HLT_e7_etcut 20 20 15 14 14
+TrigSignatureMoniMT INFO HLT_e7_etcut decisions 36 205
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.ref
index 34ebbe260050bf993ee5995036f4f07c2c142cf0..b9b48953fdd837efef64871f689f80daad6c7bac 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.ref
@@ -123,11 +123,20 @@ TriggerSummaryStep2 19 0 DEBUG +++ HLT_e5_etcut ID#607
TriggerSummaryStep2 19 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 19 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TrigSignatureMoniMT INFO HLT_2mu6 20 20 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu6 decisions 0 0
TrigSignatureMoniMT INFO HLT_2mu6Comb 20 20 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu6Comb decisions 0 0
TrigSignatureMoniMT INFO HLT_e3_etcut 20 20 18 17 17
+TrigSignatureMoniMT INFO HLT_e3_etcut decisions 54 262
TrigSignatureMoniMT INFO HLT_e3_etcut1step 20 20 18 0 18
+TrigSignatureMoniMT INFO HLT_e3_etcut1step decisions 54 0
TrigSignatureMoniMT INFO HLT_e3_etcut_mu6 20 20 10 0 1
+TrigSignatureMoniMT INFO HLT_e3_etcut_mu6 decisions 17 0
TrigSignatureMoniMT INFO HLT_e5_etcut 20 20 17 16 16
+TrigSignatureMoniMT INFO HLT_e5_etcut decisions 50 251
TrigSignatureMoniMT INFO HLT_e7_etcut 20 20 15 14 14
+TrigSignatureMoniMT INFO HLT_e7_etcut decisions 36 205
TrigSignatureMoniMT INFO HLT_mu6 20 20 3 0 3
+TrigSignatureMoniMT INFO HLT_mu6 decisions 3 0
TrigSignatureMoniMT INFO HLT_mu6Comb 20 20 3 2 2
+TrigSignatureMoniMT INFO HLT_mu6Comb decisions 3 2
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/jetMenu.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/jetMenu.ref
index 3892455aeded146b4e94c8f39316189037a66720..5ea9d5892c9c8a4e2f2fc6d6e4271e9d388ea424 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/jetMenu.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/jetMenu.ref
@@ -1,2 +1,4 @@
TrigSignatureMoniMT INFO HLT_j100 15 15 0 0
+TrigSignatureMoniMT INFO HLT_j100 decisions 0
TrigSignatureMoniMT INFO HLT_j85 15 15 0 0
+TrigSignatureMoniMT INFO HLT_j85 decisions 0
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/muMenu.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/muMenu.ref
index c898cf654d0c5e1a4240abf1848d3f0b15ab970e..cd03765a847f6f5429c53b07a751b7f932060c7e 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/muMenu.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/muMenu.ref
@@ -10,9 +10,15 @@ TriggerSummaryStep1 5 0 DEBUG +++ HLT_mu20_ivar ID#26
TriggerSummaryStep1 5 0 DEBUG +++ HLT_mu6Comb ID#393364983
TriggerSummaryStep1 5 0 DEBUG +++ HLT_mu6 ID#1672162766
TriggerSummaryStep1 5 0 DEBUG +++ HLT_mu6fast ID#2393852230
-TrigSignatureMoniMT INFO HLT_2mu6 10 10 1 0 0 0
-TrigSignatureMoniMT INFO HLT_2mu6Comb 10 10 1 0 0 0
-TrigSignatureMoniMT INFO HLT_mu20_ivar 10 10 1 0 0 0
-TrigSignatureMoniMT INFO HLT_mu6 10 10 3 0 0 0
-TrigSignatureMoniMT INFO HLT_mu6Comb 10 10 3 0 0 0
-TrigSignatureMoniMT INFO HLT_mu6fast 10 10 3 0 0 3
+TrigSignatureMoniMT INFO HLT_2mu6 10 10 1 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu6 decisions 2 0 0
+TrigSignatureMoniMT INFO HLT_2mu6Comb 10 10 1 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu6Comb decisions 2 0 0
+TrigSignatureMoniMT INFO HLT_mu20_ivar 10 10 1 0 0 0
+TrigSignatureMoniMT INFO HLT_mu20_ivar decisions 1 0 0
+TrigSignatureMoniMT INFO HLT_mu6 10 10 3 0 0 0
+TrigSignatureMoniMT INFO HLT_mu6 decisions 4 0 0
+TrigSignatureMoniMT INFO HLT_mu6Comb 10 10 3 0 0 0
+TrigSignatureMoniMT INFO HLT_mu6Comb decisions 4 0 0
+TrigSignatureMoniMT INFO HLT_mu6fast 10 10 3 0 0 3
+TrigSignatureMoniMT INFO HLT_mu6fast decisions 4 0 0
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/photonMenu.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/photonMenu.ref
index 98809b74761f7d8250c3c9bbbf7e9175535b506a..d8b5c2bb1ba672fea82c56c688de717791798efd 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/photonMenu.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/photonMenu.ref
@@ -7,3 +7,4 @@ TriggerSummaryStep2 8 0 DEBUG +++ HLT_g5_etcut ID#140
TriggerSummaryStep1 9 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 9 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TrigSignatureMoniMT INFO HLT_g5_etcut 10 10 4 4 4
+TrigSignatureMoniMT INFO HLT_g5_etcut decisions 12 12