diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/TrigL2MuonSA/MuFastSteering.h b/Trigger/TrigAlgorithms/TrigL2MuonSA/TrigL2MuonSA/MuFastSteering.h
index 4dae48e81cb9962318ba8c4d4d460a3e14df8db2..9b2cbcb778e768527ea465c62c7c1b2d21bc00a1 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/TrigL2MuonSA/MuFastSteering.h
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/TrigL2MuonSA/MuFastSteering.h
@@ -84,7 +84,8 @@ class MuFastSteering : public HLT::FexAlgo,
DataVector<xAOD::L2StandAloneMuon>& outputTracks,
TrigRoiDescriptorCollection& outputID,
TrigRoiDescriptorCollection& outputMS,
- DataVector<xAOD::TrigComposite>& outputComposite);
+ DataVector<xAOD::TrigComposite>& outputComposite,
+ Monitored::MonitoredTimer::MonitoredTimer& prepTimer );
int L2MuonAlgoMap(const std::string& name);
@@ -147,8 +148,7 @@ class MuFastSteering : public HLT::FexAlgo,
*/
StatusCode updateMonitor(const LVL1::RecMuonRoI* roi,
const TrigL2MuonSA::MdtHits& mdtHits,
- std::vector<TrigL2MuonSA::TrackPattern>& trackPatterns);
-
+ std::vector<TrigL2MuonSA::TrackPattern>& trackPatterns );
protected:
// Services
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/python/TrigL2MuonSAMonitoring.py b/Trigger/TrigAlgorithms/TrigL2MuonSA/python/TrigL2MuonSAMonitoring.py
index 09af791bf94eb7114073ec5c5dcc6aeffba24a0f..3ab87e1b651f22b5d2be3eba8d9d16bb11d26712 100755
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/python/TrigL2MuonSAMonitoring.py
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/python/TrigL2MuonSAMonitoring.py
@@ -8,21 +8,28 @@ class TrigL2MuonSAMonitoring(GenericMonitoringTool):
super(TrigL2MuonSAMonitoring, self).__init__( name )
self.HistPath = name
- self.Histograms = [ defineHistogram('InnMdtHits', type='TH1F', title="Hit multiplicity in the INNER road; MDT hits", xbins=50, xmin=-0.5, xmax=50.5),
- defineHistogram('MidMdtHits', type='TH1F', title="Hit multiplicity in the MIDDLE road; MDT hits", xbins=50, xmin=-0.5, xmax=50.5),
- defineHistogram('OutMdtHits', type='TH1F', title="Hit multiplicity in the OUTER road; MDT hits", xbins=50, xmin=-0.5, xmax=50.5),
- defineHistogram('FitResiduals', type='TH1F', title="Fit Residual; Residuals (cm)", xbins=400, xmin=-0.4, xmax=0.4),
- defineHistogram('Efficiency', type='TH1F', title="Track finding efficiency", xbins=2, xmin=-0.5, xmax=1.5),
- defineHistogram('Address', type='TH1F', title="S_address;S_address", xbins=5, xmin=-1.5, xmax=3.5 ),
- defineHistogram('AbsPt', type='TH1F', title="absolute P_{T};P_{T} (GeV)", xbins=100, xmin=0, xmax=100 ),
- defineHistogram('TrackPt', type='TH1F', title="P_{T};P_{T} (GeV)", xbins=100, xmin=-100, xmax=100 ),
+ self.Histograms = [ defineHistogram('InnMdtHits', type='TH1F', title="Hit multiplicity in the INNER road; MDT hits", xbins=50, xmin=-0.5, xmax=50.5),
+ defineHistogram('MidMdtHits', type='TH1F', title="Hit multiplicity in the MIDDLE road; MDT hits", xbins=50, xmin=-0.5, xmax=50.5),
+ defineHistogram('OutMdtHits', type='TH1F', title="Hit multiplicity in the OUTER road; MDT hits", xbins=50, xmin=-0.5, xmax=50.5),
+ defineHistogram('FitResiduals', type='TH1F', title="Fit Residual; Residuals (cm)", xbins=400, xmin=-0.4, xmax=0.4),
+ defineHistogram('Efficiency', type='TH1F', title="Track finding efficiency", xbins=2, xmin=-0.5, xmax=1.5),
+ defineHistogram('Address', type='TH1F', title="S_address;S_address", xbins=5, xmin=-1.5, xmax=3.5 ),
+ defineHistogram('AbsPt', type='TH1F', title="absolute P_{T};P_{T} (GeV)", xbins=100, xmin=0, xmax=100 ),
+ defineHistogram('TrackPt', type='TH1F', title="P_{T};P_{T} (GeV)", xbins=100, xmin=-100, xmax=100 ),
defineHistogram('AbsPt, SagInv', type='TH2F', title="1/s as a function of P_{T}; P_{T} (GeV); 1/s (cm^{-1})", xbins=50, xmin=0, xmax=100, ybins=15, ymin=0, ymax=3 ),
- defineHistogram('Sagitta', type='TH1F', title="Reconstructed Sagitta; Sagitta (cm)", xbins=100, xmin=-10., xmax=10.),
- defineHistogram('ResInner', type='TH1F', title="Residual from Trigger track in INNER Station; Residuals (cm)", xbins=100, xmin=-10., xmax=10. ),
- defineHistogram('ResMiddle', type='TH1F', title="Residual from Trigger track in MIDDLE Station; Residuals (cm)", xbins=100, xmin=-10., xmax=10. ),
- defineHistogram('ResOuter', type='TH1F', title="Residual from Trigger track in OUTER Station; Residuals (cm)", xbins=100, xmin=-10., xmax=10. ),
- defineHistogram('TrackEta, TrackPhi', type='TH2F', title="Distribution of reconstructed LVL2 tracks; Eta; Phi", xbins=108, xmin=-2.7, xmax=2.7, ybins=96, ymin=-3.1416, ymax=3.1416 ),
- defineHistogram('FailedRoIEta, FailedRoIPhi', type='TH2F', title="Location of LVL2 track failure; Eta; Phi", xbins=108, xmin=-2.7, xmax=2.7, ybins=96, ymin=-3.1416, ymax=3.1416 ) ]
+ defineHistogram('Sagitta', type='TH1F', title="Reconstructed Sagitta; Sagitta (cm)", xbins=100, xmin=-10., xmax=10.),
+ defineHistogram('ResInner', type='TH1F', title="Residual from Trigger track in INNER Station; Residuals (cm)", xbins=100, xmin=-10., xmax=10. ),
+ defineHistogram('ResMiddle', type='TH1F', title="Residual from Trigger track in MIDDLE Station; Residuals (cm)", xbins=100, xmin=-10., xmax=10. ),
+ defineHistogram('ResOuter', type='TH1F', title="Residual from Trigger track in OUTER Station; Residuals (cm)", xbins=100, xmin=-10., xmax=10. ),
+ defineHistogram('TrackEta, TrackPhi', type='TH2F', title="Distribution of reconstructed LVL2 tracks; Eta; Phi", xbins=108, xmin=-2.7, xmax=2.7, ybins=96, ymin=-3.1416, ymax=3.1416 ),
+ defineHistogram('FailedRoIEta, FailedRoIPhi', type='TH2F', title="Location of LVL2 track failure; Eta; Phi", xbins=108, xmin=-2.7, xmax=2.7, ybins=96, ymin=-3.1416, ymax=3.1416 ),
+ defineHistogram('TIME_Total', type='TH1F', title="Total processing time (us)", xbins=100, xmin=0, xmax=100000 ),
+ defineHistogram('TIME_Data_Preparator', type='TH1F', title="Data preparator time (us)", xbins=100, xmin=0, xmax=50000 ),
+ defineHistogram('TIME_Pattern_Finder', type='TH1F', title="Pattern finder time (us)", xbins=100, xmin=0, xmax=5000 ),
+ defineHistogram('TIME_Station_Fitter', type='TH1F', title="Station fitter time (us)", xbins=100, xmin=0, xmax=5000 ),
+ defineHistogram('TIME_Track_Fitter', type='TH1F', title="Track fitter time (us)", xbins=100, xmin=0, xmax=300 ),
+ defineHistogram('TIME_Track_Extrapolator', type='TH1F', title="Track extrapolator time (us)", xbins=100, xmin=0, xmax=300 ),
+ defineHistogram('TIME_Calibration_Streamer', type='TH1F', title="Calibration streamer time (us)", xbins=100, xmin=0, xmax=50000 ) ]
class TrigL2MuonSAValidationMonitoring(TrigGenericMonitoringToolConfig):
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastSteering.cxx b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastSteering.cxx
index 2794e3ec5700fafba7c1d4b82065bd8c7775d8cc..8a541b56148a74308b9a5093918df44a8b842bd2 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastSteering.cxx
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastSteering.cxx
@@ -272,7 +272,17 @@ const LVL1::RecMuonRoI* matchingRecRoI( uint32_t roiWord,
StatusCode MuFastSteering::execute()
{
- ATH_MSG_DEBUG("StatusCode MuFastSteering::execute() start");
+ ATH_MSG_DEBUG("StatusCode MuFastSteering::execute start");
+
+ // TimerSvc
+ using namespace Monitored;
+ auto totalTimer = MonitoredTimer::declare( "TIME_Total" );
+ auto prepTimer = MonitoredTimer::declare( "TIME_Data_Preparator" );
+
+ auto monitorIt = MonitoredScope::declare(m_monTool, totalTimer, prepTimer );
+
+ totalTimer.start();
+ prepTimer.start();
auto ctx = getContext();
ATH_MSG_DEBUG("Get event context << " << ctx );
@@ -333,7 +343,7 @@ StatusCode MuFastSteering::execute()
// to StatusCode findMuonSignature()
ATH_CHECK(findMuonSignature(*internalRoI, *recRoIVector,
- *muFastContainer, *muIdContainer, *muMsContainer, *muCompositeContainer));
+ *muFastContainer, *muIdContainer, *muMsContainer, *muCompositeContainer, prepTimer ));
// DEBUG TEST: Recorded data objects
@@ -362,6 +372,8 @@ StatusCode MuFastSteering::execute()
ATH_MSG_DEBUG("REGTEST: Recorded data objects DONE");
+ totalTimer.stop();
+
ATH_MSG_DEBUG("StatusCode MuFastSteering::execute() success");
return StatusCode::SUCCESS;
}
@@ -374,6 +386,16 @@ HLT::ErrorCode MuFastSteering::hltExecute(const HLT::TriggerElement* /*inputTE*/
{
ATH_MSG_DEBUG("hltExecute called");
+ // TimerSvc
+ using namespace Monitored;
+ auto totalTimer = MonitoredTimer::declare( "TIME_Total" );
+ auto prepTimer = MonitoredTimer::declare( "TIME_Data_Preparator" );
+
+ auto monitorIt = MonitoredScope::declare(m_monTool, totalTimer, prepTimer );
+
+ totalTimer.start();
+ prepTimer.start();
+
std::vector< const TrigRoiDescriptor*> roids;
std::vector< const TrigRoiDescriptor*>::const_iterator p_roids;
HLT::ErrorCode hec2 = getFeatures(outputTE, roids);
@@ -431,7 +453,7 @@ HLT::ErrorCode MuFastSteering::hltExecute(const HLT::TriggerElement* /*inputTE*/
// to StatusCode findMuonSignature()
StatusCode sc = findMuonSignature(*internalRoI, *internalRecRoI,
- *outputTracks, *outputID, *outputMS, *outputComposite);
+ *outputTracks, *outputID, *outputMS, *outputComposite, prepTimer );
HLT::ErrorCode code = HLT::OK;
// in case of findMuonSignature failed
@@ -486,9 +508,6 @@ HLT::ErrorCode MuFastSteering::hltExecute(const HLT::TriggerElement* /*inputTE*/
if (outputID->empty()) {
delete outputID;
- //ActiveState = false;
- //outputTE -> setActiveState(ActiveState);
- //code = attachFeature(outputTE, new TrigRoiDescriptorCollection(SG::VIEW_ELEMENTS), "forID");
} else {
ActiveState = true;
outputTE -> setActiveState(ActiveState);
@@ -509,9 +528,6 @@ HLT::ErrorCode MuFastSteering::hltExecute(const HLT::TriggerElement* /*inputTE*/
if (outputMS->empty()) {
delete outputMS;
- //ActiveState = false;
- //outputTE -> setActiveState(ActiveState);
- //code = attachFeature(outputTE, new TrigRoiDescriptorCollection(SG::VIEW_ELEMENTS), "forMS");
} else {
ActiveState = true;
outputTE -> setActiveState(ActiveState);
@@ -543,6 +559,8 @@ HLT::ErrorCode MuFastSteering::hltExecute(const HLT::TriggerElement* /*inputTE*/
return false;
}
}
+
+ totalTimer.stop();
return HLT::OK;
}
@@ -554,13 +572,23 @@ StatusCode MuFastSteering::findMuonSignature(const DataVector<const TrigRoiDescr
DataVector<xAOD::L2StandAloneMuon>& outputTracks,
TrigRoiDescriptorCollection& outputID,
TrigRoiDescriptorCollection& outputMS,
- DataVector<xAOD::TrigComposite>& outputComposite)
+ DataVector<xAOD::TrigComposite>& outputComposite,
+ Monitored::MonitoredTimer::MonitoredTimer& prepTimer )
{
ATH_MSG_DEBUG("StatusCode MuFastSteering::findMuonSignature start");
-
StatusCode sc = StatusCode::SUCCESS;
+ using namespace Monitored;
+ auto patternTimer = MonitoredTimer::declare( "TIME_Pattern_Finder" );
+ auto stationFitterTimer = MonitoredTimer::declare( "TIME_Station_Fitter" );
+ auto trackFitterTimer = MonitoredTimer::declare( "TIME_Track_Fitter" );
+ auto trackExtraTimer = MonitoredTimer::declare( "TIME_Track_Extrapolator" );
+ auto calibrationTimer = MonitoredTimer::declare( "TIME_Calibration_Streamer" );
+
+ auto monitorIt = MonitoredScope::declare(m_monTool, patternTimer, stationFitterTimer,
+ trackFitterTimer, trackExtraTimer, calibrationTimer );
+
if (m_use_timer) {
for (unsigned int i_timer=0; i_timer<m_timingTimers.size(); i_timer++) {
m_timingTimers[i_timer]->start();
@@ -568,9 +596,6 @@ StatusCode MuFastSteering::findMuonSignature(const DataVector<const TrigRoiDescr
}
}
- ATH_MSG_DEBUG("REGTEST: " << m_roiCollectionKey.key() << " size = " << roids.size() << " (argument)");
- ATH_MSG_DEBUG("REGTEST: " << m_recRoiCollectionKey.key() << " size = " << muonRoIs.size() << " (argument)");
-
if (m_use_timer) m_timingTimers[ITIMER_TOTAL_PROCESSING]->resume();
if (m_use_timer) m_timingTimers[ITIMER_DATA_PREPARATOR]->resume();
@@ -581,19 +606,6 @@ StatusCode MuFastSteering::findMuonSignature(const DataVector<const TrigRoiDescr
p_roids = roids.begin();
for (p_roi=(muonRoIs).begin(); p_roi!=(muonRoIs).end(); ++p_roi) {
- double roiEta = (*p_roids)->eta();
- double roiPhi = (*p_roids)->phi();
- double roiZed = (*p_roids)->zed();
- ATH_MSG_DEBUG("REGTEST: " << m_roiCollectionKey.key() << " eta = " << "(" << (*p_roids)->etaMinus() << ")" << roiEta << "(" << (*p_roids)->etaPlus() << ")" << " (argument)");
- ATH_MSG_DEBUG("REGTEST: " << m_roiCollectionKey.key() << " phi = " << "(" << (*p_roids)->phiMinus() << ")" << roiPhi << "(" << (*p_roids)->phiPlus() << ")" << " (argument)");
- ATH_MSG_DEBUG("REGTEST: " << m_roiCollectionKey.key() << " zed = " << "(" << (*p_roids)->zedMinus() << ")" << roiZed << "(" << (*p_roids)->zedPlus() << ")" << " (argument)");
-
- double recroiEta = (*p_roi)->eta();
- double recroiPhi = (*p_roi)->phi();
- ATH_MSG_DEBUG("REGTEST: " << m_recRoiCollectionKey.key() << " eta/phi = " << recroiEta << "/" << recroiPhi << " (argument)");
- ATH_MSG_DEBUG("REGTEST: " << m_recRoiCollectionKey.key() << " ID = " << (*p_roi)->sectorID() << " (argument)");
- ATH_MSG_DEBUG("REGTEST: DONE");
-
std::vector<TrigL2MuonSA::TrackPattern> trackPatterns;
m_mdtHits_normal.clear();
m_mdtHits_overlap.clear();
@@ -633,6 +645,7 @@ StatusCode MuFastSteering::findMuonSignature(const DataVector<const TrigRoiDescr
return StatusCode::SUCCESS;
}
if (m_use_timer) m_timingTimers[ITIMER_DATA_PREPARATOR]->pause();
+ prepTimer.stop();
if ( m_rpcErrToDebugStream && m_dataPreparator->isRpcFakeRoi() ) {
ATH_MSG_ERROR("Invalid RoI in RPC data found: event to debug stream");
@@ -647,6 +660,7 @@ StatusCode MuFastSteering::findMuonSignature(const DataVector<const TrigRoiDescr
// Pattern finding
if (m_use_timer) m_timingTimers[ITIMER_PATTERN_FINDER]->resume();
+ patternTimer.start();
sc = m_patternFinder->findPatterns(m_muonRoad,
m_mdtHits_normal,
trackPatterns);
@@ -659,9 +673,11 @@ StatusCode MuFastSteering::findMuonSignature(const DataVector<const TrigRoiDescr
return StatusCode::SUCCESS;
}
if (m_use_timer) m_timingTimers[ITIMER_PATTERN_FINDER]->pause();
+ patternTimer.stop();
// Superpoint fit
if (m_use_timer) m_timingTimers[ITIMER_STATION_FITTER]->resume();
+ stationFitterTimer.start();
sc = m_stationFitter->findSuperPoints(*p_roi,
m_rpcFitResult,
trackPatterns);
@@ -674,9 +690,11 @@ StatusCode MuFastSteering::findMuonSignature(const DataVector<const TrigRoiDescr
return StatusCode::SUCCESS;
}
if (m_use_timer) m_timingTimers[ITIMER_STATION_FITTER]->pause();
+ stationFitterTimer.stop();
// Track fitting
if (m_use_timer) m_timingTimers[ITIMER_TRACK_FITTER]->resume();
+ trackFitterTimer.start();
sc = m_trackFitter->findTracks(*p_roi,
m_rpcFitResult,
trackPatterns);
@@ -690,6 +708,7 @@ StatusCode MuFastSteering::findMuonSignature(const DataVector<const TrigRoiDescr
return StatusCode::SUCCESS;
}
if (m_use_timer) m_timingTimers[ITIMER_TRACK_FITTER]->pause();
+ trackFitterTimer.stop();
} else { // Endcap
ATH_MSG_DEBUG("Endcap");
@@ -717,9 +736,11 @@ StatusCode MuFastSteering::findMuonSignature(const DataVector<const TrigRoiDescr
return StatusCode::SUCCESS;
}
if (m_use_timer) m_timingTimers[ITIMER_DATA_PREPARATOR]->pause();
+ prepTimer.stop();
// Pattern finding
if (m_use_timer) m_timingTimers[ITIMER_PATTERN_FINDER]->resume();
+ patternTimer.start();
sc = m_patternFinder->findPatterns(m_muonRoad,
m_mdtHits_normal,
trackPatterns);
@@ -734,9 +755,11 @@ StatusCode MuFastSteering::findMuonSignature(const DataVector<const TrigRoiDescr
return StatusCode::SUCCESS;
}
if (m_use_timer) m_timingTimers[ITIMER_PATTERN_FINDER]->pause();
+ patternTimer.stop();
// Superpoint fit
if (m_use_timer) m_timingTimers[ITIMER_STATION_FITTER]->resume();
+ stationFitterTimer.start();
if(!m_use_new_segmentfit){
sc = m_stationFitter->findSuperPoints(*p_roi,
m_tgcFitResult,
@@ -760,9 +783,11 @@ StatusCode MuFastSteering::findMuonSignature(const DataVector<const TrigRoiDescr
}
if (m_use_timer) m_timingTimers[ITIMER_STATION_FITTER]->pause();
+ stationFitterTimer.stop();
// Track fittingh
if (m_use_timer) m_timingTimers[ITIMER_TRACK_FITTER]->resume();
+ trackFitterTimer.start();
sc = m_trackFitter->findTracks(*p_roi,
m_tgcFitResult,
trackPatterns,
@@ -777,6 +802,7 @@ StatusCode MuFastSteering::findMuonSignature(const DataVector<const TrigRoiDescr
return StatusCode::SUCCESS;
}
if (m_use_timer) m_timingTimers[ITIMER_TRACK_FITTER]->pause();
+ trackFitterTimer.stop();
}
// fix if eta is strange
@@ -794,6 +820,7 @@ StatusCode MuFastSteering::findMuonSignature(const DataVector<const TrigRoiDescr
// Track extrapolation for ID combined
if (m_use_timer) m_timingTimers[ITIMER_TRACK_EXTRAPOLATOR]->resume();
+ trackExtraTimer.start();
sc = m_trackExtrapolator->extrapolateTrack(trackPatterns, m_winPt);
@@ -806,9 +833,10 @@ StatusCode MuFastSteering::findMuonSignature(const DataVector<const TrigRoiDescr
return StatusCode::SUCCESS;
}
if (m_use_timer) m_timingTimers[ITIMER_TRACK_EXTRAPOLATOR]->pause();
+ trackExtraTimer.stop();
// Update monitoring variables
- sc = updateMonitor(*p_roi, m_mdtHits_normal, trackPatterns);
+ sc = updateMonitor(*p_roi, m_mdtHits_normal, trackPatterns );
if (sc != StatusCode::SUCCESS) {
ATH_MSG_WARNING("Failed to update monitoring variables");
// Update output trigger element
@@ -826,6 +854,7 @@ StatusCode MuFastSteering::findMuonSignature(const DataVector<const TrigRoiDescr
if (m_doCalStream && trackPatterns.size()>0 ) {
TrigL2MuonSA::TrackPattern tp = trackPatterns[0];
if (m_use_timer) m_timingTimers[ITIMER_CALIBRATION_STREAMER]->resume();
+ calibrationTimer.start();
// m_calStreamer->setInstanceName(this->name());
@@ -841,6 +870,7 @@ StatusCode MuFastSteering::findMuonSignature(const DataVector<const TrigRoiDescr
ATH_MSG_WARNING("Calibration streamer: create Roi Fragment failed");
}
if (m_use_timer) m_timingTimers[ITIMER_CALIBRATION_STREAMER]->pause();
+ calibrationTimer.stop();
// if it's a data scouting chain check the buffer length
if ( m_calDataScouting ) {
@@ -1361,8 +1391,6 @@ bool MuFastSteering::storeIDRoiDescriptor(const TrigRoiDescriptor*
const xAOD::L2StandAloneMuon* muonSA = outputTracks[0];
- ATH_MSG_INFO("DEBUG::muonSA->pt() << " << muonSA->pt());
-
// store TrigRoiDescriptor
if (fabs(muonSA->pt()) > ZERO_LIMIT ) {
@@ -1629,9 +1657,9 @@ ECRegions MuFastSteering::whichECRegion( const float eta, const float phi ) cons
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------------
-StatusCode MuFastSteering::updateMonitor(const LVL1::RecMuonRoI* roi,
- const TrigL2MuonSA::MdtHits& mdtHits,
- std::vector<TrigL2MuonSA::TrackPattern>& trackPatterns)
+StatusCode MuFastSteering::updateMonitor(const LVL1::RecMuonRoI* roi,
+ const TrigL2MuonSA::MdtHits& mdtHits,
+ std::vector<TrigL2MuonSA::TrackPattern>& trackPatterns )
{
using namespace Monitored;
// initialize monitored variable
@@ -1672,7 +1700,7 @@ StatusCode MuFastSteering::updateMonitor(const LVL1::RecMuonRoI*
auto monitorIt = MonitoredScope::declare(m_monTool, inner_mdt_hits, middle_mdt_hits, outer_mdt_hits,
efficiency, sag_inverse, address, absolute_pt, sagitta, track_pt,
track_eta, track_phi, failed_eta, failed_phi,
- res_inner, res_middle, res_outer, fit_residuals);
+ res_inner, res_middle, res_outer, fit_residuals );
const float ZERO_LIMIT = 1e-5;
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/mu.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/mu.withViews.py
index a63c496091f9274cb410dff6cefe2dadbc52ae3a..b4a8f2b43d53ceb9d9aded9adb08ea46b43dccd0 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/mu.withViews.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/mu.withViews.py
@@ -8,16 +8,21 @@ include("TrigUpgradeTest/testHLT_MT.py")
from AthenaCommon.DetFlags import DetFlags
+TriggerFlags.doID = False;
+TriggerFlags.doMuon = True;
### Set muon sequence ###
if not 'doL2SA' in dir():
- doL2SA=True
+ doL2SA = True
if not 'doL2CB' in dir():
- doL2CB=True
+ doL2CB = True
+ TriggerFlags.doID = True
if not 'doL2ISO' in dir():
doL2ISO = True
if not 'doEFSA' in dir():
- doEFSA=True
+ doEFSA = True
+if not 'doEFISO' in dir():
+ doEFISO=True
### workaround to prevent online trigger folders to be enabled ###
if doL2CB or doL2ISO:
@@ -74,20 +79,6 @@ AlgScheduler.setDataLoaderAlg( 'SGInputLoader' )
from AthenaCommon.CfgGetter import getPublicTool, getPublicToolClone
from AthenaCommon import CfgMgr
-TriggerFlags.doID = False;
-TriggerFlags.doMuon = True;
-
-### Set muon sequence ###
-if not 'doL2SA' in dir():
- doL2SA = True
-if not 'doL2CB' in dir():
- doL2CB = True
- TriggerFlags.doID = True
-if not 'doL2ISO' in dir():
- doL2ISO = True
-if not 'doEFSA' in dir():
- doEFSA = True
-
### muon thresholds ###
CTPToChainMapping = {"HLT_mu6": "L1_MU6",
"HLT_2mu6": "L1_2MU4" }
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_mu_run_data.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_mu_run_data.sh
index 880934e77c38e1b45d0fdfb6caee9bce89ae3559..2cace0f291d6fe3efe1bb32c4a5105d503608bdf 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_mu_run_data.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_mu_run_data.sh
@@ -3,6 +3,6 @@
# art-ci: master
### BSfile ###
-athena --threads=1 --skipEvents=30 --evtMax=10 --filesInput="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1" -c 'doL2CB=False;doL2ISO=False;doEFSA=True' TrigUpgradeTest/mu.withViews.py
+athena --threads=1 --skipEvents=30 --evtMax=10 --filesInput="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1" -c 'doL2CB=False;doL2ISO=False' TrigUpgradeTest/mu.withViews.py
### RDOfile ###
#athena --threads=1 -c 'EvtMax=50;FilesInput="/afs/cern.ch/user/s/shhayash/workspace/public/RDOfile/ttbar/RDO_TRIG.root"' TrigUpgradeTest/mu.withViews.py