diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestBase.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestBase.h index f85ae4c8e51bd00b603100ec199c3a953ec47ab0..01b23647325aa6870c724c880ffd6b48335b8909 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestBase.h +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestBase.h @@ -155,6 +155,9 @@ protected: /// also run purity analyses bool m_runPurity; + /// determine whether this should be treated as a shifter chain + bool m_shifter; + /// max number of shifter chains to use - must be < 2 at the moment int m_shifterChains; diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestBase.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestBase.cxx index 47d4bdacdb6867b896de12ab143495838039f55b..3596744f1199487bece4027edc61c158e1e7fb00 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestBase.cxx +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestBase.cxx @@ -35,6 +35,7 @@ TrigTestBase::TrigTestBase(const std::string & type, const std::string & name, c m_useHighestPT(false), m_vtxIndex(-1), m_runPurity(false), + m_shifter(false), m_shifterChains(1), m_sliceTag("") { @@ -86,10 +87,11 @@ TrigTestBase::TrigTestBase(const std::string & type, const std::string & name, c declareProperty( "InitialisePerRun", m_initialisePerRun = false ); declareProperty( "KeepAllEvents", m_keepAllEvents = false ); declareProperty( "UseHighestPT", m_useHighestPT = false ); - declareProperty( "Shifter", m_shifter = false ); declareProperty( "VtxIndex", m_vtxIndex = -1 ); declareProperty( "RunPurity", m_runPurity = false ); + declareProperty( "Shifter", m_shifter = false ); + declareProperty( "ShifterChains", m_shifterChains = 1 ); @@ -155,14 +157,11 @@ StatusCode TrigTestBase::book(bool newEventsBlock, bool newLumiBlock, bool newRu -#ifdef ManagedMonitorToolBase_Uses_API_201401 -#if 0 - // #ifndef ManagedMonitorToolBase_CXX +#ifdef ManagedMonitorToolBase_Uses_API_201704 bool newEventsBlock = newEventsBlockFlag(); bool newLumiBlock = newLumiBlockFlag(); bool newRun = newRunFlag(); #endif -#endif msg(MSG::DEBUG) << "TrigTestBase::book() buildNtuple " << m_buildNtuple @@ -460,11 +459,8 @@ StatusCode TrigTestBase::proc(bool /*endOfEventsBlock*/, bool /*endOfLumiBlock*/ #endif // StatusCode TrigTestBase::procHistograms() { -#ifdef ManagedMonitorToolBase_Uses_API_201401 -#if 0 - // #ifndef ManagedMonitorToolBase_CXX +#ifdef ManagedMonitorToolBase_Uses_API_201704 bool endOfRun = endOfRunFlag(); -#endif #endif msg(MSG::INFO) << " ----- enter proc() ----- " << endmsg;