diff --git a/Control/GaudiSequencer/src/AthEventCounter.h b/Control/GaudiSequencer/src/AthEventCounter.h index d5946aac999e548cffdf94daff40f8c25a9c4e91..053c86294ae5be701a4233e58891b4bb808030c4 100644 --- a/Control/GaudiSequencer/src/AthEventCounter.h +++ b/Control/GaudiSequencer/src/AthEventCounter.h @@ -47,7 +47,7 @@ private: ** should be reported. The default is 1, corresponding ** to every event. **/ - IntegerProperty m_frequency; + Gaudi::CheckedProperty<int> m_frequency; /** ** The number of events skipped since the last time diff --git a/Control/GaudiSequencer/src/AthPrescaler.cxx b/Control/GaudiSequencer/src/AthPrescaler.cxx index 02ae1ecc71de29fc02aeb1aae1a574c938afab24..97ccbb28adaf5f2a9ba020010f713c7c4451ecf5 100644 --- a/Control/GaudiSequencer/src/AthPrescaler.cxx +++ b/Control/GaudiSequencer/src/AthPrescaler.cxx @@ -28,7 +28,7 @@ StatusCode AthPrescaler::initialize() { ATH_MSG_INFO ("Initializing " << name() << "..." - << endreq + << endmsg << "initialize ==> pass: " << m_percentPass); return StatusCode::SUCCESS; } @@ -51,8 +51,8 @@ AthPrescaler::execute() StatusCode AthPrescaler::finalize() { - ATH_MSG_INFO ("finalize : " << endreq - << " - total events: " << m_seen << endreq + ATH_MSG_INFO ("finalize : " << endmsg + << " - total events: " << m_seen << endmsg << " - passed events: " << m_pass); return StatusCode::SUCCESS; diff --git a/Control/GaudiSequencer/src/AthPrescaler.h b/Control/GaudiSequencer/src/AthPrescaler.h index 697b5cac69860c8ad217b3e0471592f5c669c24b..d7ac062ef876d1764700b10611d839927cf98cf2 100644 --- a/Control/GaudiSequencer/src/AthPrescaler.h +++ b/Control/GaudiSequencer/src/AthPrescaler.h @@ -47,7 +47,7 @@ private: /** ** Percentage of events that should be passed **/ - DoubleProperty m_percentPass; + Gaudi::CheckedProperty<double> m_percentPass; /** ** Number of events passed diff --git a/Control/GaudiSequencer/src/AthSequencer.cxx b/Control/GaudiSequencer/src/AthSequencer.cxx index ebf5a1cc54131372c902258ac3e418852bb59c5e..58993c6781178622c520afcff73fd14a5d579531 100644 --- a/Control/GaudiSequencer/src/AthSequencer.cxx +++ b/Control/GaudiSequencer/src/AthSequencer.cxx @@ -458,7 +458,7 @@ AthSequencer::createAndAppend( const std::string& type, } StatusCode -AthSequencer::decodeNames( StringArrayProperty& theNames, +AthSequencer::decodeNames( Gaudi::Property<std::vector<std::string>>& theNames, std::vector<Algorithm*>* theAlgs ) { StatusCode result; @@ -552,7 +552,7 @@ AthSequencer::decodeNames( StringArrayProperty& theNames, else msg() << System::typeinfoName(typeid(*alg)) << "/" << alg->name(); } - msg(MSG::INFO) << endreq; + msg(MSG::INFO) << endmsg; } theAlgMgr->release(); return result; @@ -664,7 +664,7 @@ AthSequencer::cleanupAfterFPE(siginfo_t *info) this->msg() << " Algorithm stack: "; if ( algContextSvc->algorithms().size()==0 ) { - this->msg() << "<EMPTY>" << endreq; + this->msg() << "<EMPTY>" << endmsg; } else { @@ -681,7 +681,7 @@ AthSequencer::cleanupAfterFPE(siginfo_t *info) while ( algContextSvc->algorithms().size() && algContextSvc->currentAlg()->name() != this->name() ) if ( algContextSvc->unSetCurrentAlg(algContextSvc->currentAlg()).isFailure() ) this->msg() << "cannot unwind: " << algContextSvc->currentAlg(); - this->msg() << endreq; + this->msg() << endmsg; } algContextSvc->release(); } @@ -692,7 +692,7 @@ AthSequencer::cleanupAfterFPE(siginfo_t *info) for (size_t i(0); i < s_curArraySize; i++) this->msg() << std::setw(10) << i << " : " << strings[i] << "\n"; - this->msg() << endreq; + this->msg() << endmsg; free (strings); } diff --git a/Control/GaudiSequencer/src/AthSequencer.h b/Control/GaudiSequencer/src/AthSequencer.h index 2cf982df45239b12eb10c411e1b815d36accd4db..d46f1b1e2bbe343cfde10e38d056e794c8e8105e 100644 --- a/Control/GaudiSequencer/src/AthSequencer.h +++ b/Control/GaudiSequencer/src/AthSequencer.h @@ -171,7 +171,7 @@ protected: /** ** Decode algorithm names, creating or appending algorithms as appropriate **/ - StatusCode decodeNames( StringArrayProperty& theNames, + StatusCode decodeNames( Gaudi::Property<std::vector<std::string>>& theNames, std::vector<Algorithm*>* theAlgs ); /** @@ -207,10 +207,10 @@ private: **************************/ /// Member names (of the form '<cppType>/<instanceName>') - StringArrayProperty m_names; + Gaudi::Property<std::vector<std::string>> m_names; /// Stop on filter failure Override flag - BooleanProperty m_stopOverride; + Gaudi::Property<bool> m_stopOverride; /// set optional algorithm / sequence time outs double m_timeout;