Skip to content
Snippets Groups Projects
Commit f21bbe2f authored by Charles Leggett's avatar Charles Leggett Committed by Graeme Stewart
Browse files

Property modernization w/ Gaudi v28 (GaudiSequencer-00-04-00)

	* updates for Property modernization. see gaudi/Gaudi!182
	* requires Gaudi v28
	* made Property types explicit, eg IntegerProperty -> Gaudi::Property<int>
	* Property with verifiers are now Gaudi::CheckedProperty<TYPE>
	* tag GaudiSequencer-00-04-00

M       src/AthPrescaler.h
M       src/AthEventCounter.h
M       src/AthSequencer.cxx
M       src/AthSequencer.h

2016-07-28  Charles Leggett
	 * endreq -> endmsg
	 * tag GaudiSequencer-00-03-25

M       src/AthSequencer.cxx
M       src/AthPrescaler.cxx


Former-commit-id: 71d72546532b496499f41a0dff57b25aaffcdba4
parent edbe118a
No related branches found
No related tags found
No related merge requests found
...@@ -47,7 +47,7 @@ private: ...@@ -47,7 +47,7 @@ private:
** should be reported. The default is 1, corresponding ** should be reported. The default is 1, corresponding
** to every event. ** to every event.
**/ **/
IntegerProperty m_frequency; Gaudi::CheckedProperty<int> m_frequency;
/** /**
** The number of events skipped since the last time ** The number of events skipped since the last time
......
...@@ -28,7 +28,7 @@ StatusCode ...@@ -28,7 +28,7 @@ StatusCode
AthPrescaler::initialize() AthPrescaler::initialize()
{ {
ATH_MSG_INFO ("Initializing " << name() << "..." ATH_MSG_INFO ("Initializing " << name() << "..."
<< endreq << endmsg
<< "initialize ==> pass: " << m_percentPass); << "initialize ==> pass: " << m_percentPass);
return StatusCode::SUCCESS; return StatusCode::SUCCESS;
} }
...@@ -51,8 +51,8 @@ AthPrescaler::execute() ...@@ -51,8 +51,8 @@ AthPrescaler::execute()
StatusCode StatusCode
AthPrescaler::finalize() AthPrescaler::finalize()
{ {
ATH_MSG_INFO ("finalize : " << endreq ATH_MSG_INFO ("finalize : " << endmsg
<< " - total events: " << m_seen << endreq << " - total events: " << m_seen << endmsg
<< " - passed events: " << m_pass); << " - passed events: " << m_pass);
return StatusCode::SUCCESS; return StatusCode::SUCCESS;
......
...@@ -47,7 +47,7 @@ private: ...@@ -47,7 +47,7 @@ private:
/** /**
** Percentage of events that should be passed ** Percentage of events that should be passed
**/ **/
DoubleProperty m_percentPass; Gaudi::CheckedProperty<double> m_percentPass;
/** /**
** Number of events passed ** Number of events passed
......
...@@ -458,7 +458,7 @@ AthSequencer::createAndAppend( const std::string& type, ...@@ -458,7 +458,7 @@ AthSequencer::createAndAppend( const std::string& type,
} }
StatusCode StatusCode
AthSequencer::decodeNames( StringArrayProperty& theNames, AthSequencer::decodeNames( Gaudi::Property<std::vector<std::string>>& theNames,
std::vector<Algorithm*>* theAlgs ) std::vector<Algorithm*>* theAlgs )
{ {
StatusCode result; StatusCode result;
...@@ -552,7 +552,7 @@ AthSequencer::decodeNames( StringArrayProperty& theNames, ...@@ -552,7 +552,7 @@ AthSequencer::decodeNames( StringArrayProperty& theNames,
else else
msg() << System::typeinfoName(typeid(*alg)) << "/" << alg->name(); msg() << System::typeinfoName(typeid(*alg)) << "/" << alg->name();
} }
msg(MSG::INFO) << endreq; msg(MSG::INFO) << endmsg;
} }
theAlgMgr->release(); theAlgMgr->release();
return result; return result;
...@@ -664,7 +664,7 @@ AthSequencer::cleanupAfterFPE(siginfo_t *info) ...@@ -664,7 +664,7 @@ AthSequencer::cleanupAfterFPE(siginfo_t *info)
this->msg() << " Algorithm stack: "; this->msg() << " Algorithm stack: ";
if ( algContextSvc->algorithms().size()==0 ) if ( algContextSvc->algorithms().size()==0 )
{ {
this->msg() << "<EMPTY>" << endreq; this->msg() << "<EMPTY>" << endmsg;
} }
else else
{ {
...@@ -681,7 +681,7 @@ AthSequencer::cleanupAfterFPE(siginfo_t *info) ...@@ -681,7 +681,7 @@ AthSequencer::cleanupAfterFPE(siginfo_t *info)
while ( algContextSvc->algorithms().size() && algContextSvc->currentAlg()->name() != this->name() ) while ( algContextSvc->algorithms().size() && algContextSvc->currentAlg()->name() != this->name() )
if ( algContextSvc->unSetCurrentAlg(algContextSvc->currentAlg()).isFailure() ) if ( algContextSvc->unSetCurrentAlg(algContextSvc->currentAlg()).isFailure() )
this->msg() << "cannot unwind: " << algContextSvc->currentAlg(); this->msg() << "cannot unwind: " << algContextSvc->currentAlg();
this->msg() << endreq; this->msg() << endmsg;
} }
algContextSvc->release(); algContextSvc->release();
} }
...@@ -692,7 +692,7 @@ AthSequencer::cleanupAfterFPE(siginfo_t *info) ...@@ -692,7 +692,7 @@ AthSequencer::cleanupAfterFPE(siginfo_t *info)
for (size_t i(0); i < s_curArraySize; i++) for (size_t i(0); i < s_curArraySize; i++)
this->msg() << std::setw(10) << i << " : " << strings[i] << "\n"; this->msg() << std::setw(10) << i << " : " << strings[i] << "\n";
this->msg() << endreq; this->msg() << endmsg;
free (strings); free (strings);
} }
......
...@@ -171,7 +171,7 @@ protected: ...@@ -171,7 +171,7 @@ protected:
/** /**
** Decode algorithm names, creating or appending algorithms as appropriate ** 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 ); std::vector<Algorithm*>* theAlgs );
/** /**
...@@ -207,10 +207,10 @@ private: ...@@ -207,10 +207,10 @@ private:
**************************/ **************************/
/// Member names (of the form '<cppType>/<instanceName>') /// Member names (of the form '<cppType>/<instanceName>')
StringArrayProperty m_names; Gaudi::Property<std::vector<std::string>> m_names;
/// Stop on filter failure Override flag /// Stop on filter failure Override flag
BooleanProperty m_stopOverride; Gaudi::Property<bool> m_stopOverride;
/// set optional algorithm / sequence time outs /// set optional algorithm / sequence time outs
double m_timeout; double m_timeout;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment