From 71d72546532b496499f41a0dff57b25aaffcdba4 Mon Sep 17 00:00:00 2001
From: Charles Leggett <charles.g.leggett@gmail.com>
Date: Tue, 20 Dec 2016 20:57:37 +0100
Subject: [PATCH] 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
---
Control/GaudiSequencer/src/AthEventCounter.h | 2 +-
Control/GaudiSequencer/src/AthPrescaler.cxx | 6 +++---
Control/GaudiSequencer/src/AthPrescaler.h | 2 +-
Control/GaudiSequencer/src/AthSequencer.cxx | 10 +++++-----
Control/GaudiSequencer/src/AthSequencer.h | 6 +++---
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Control/GaudiSequencer/src/AthEventCounter.h b/Control/GaudiSequencer/src/AthEventCounter.h
index d5946aac999..053c86294ae 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 02ae1ecc71d..97ccbb28ada 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 697b5cac698..d7ac062ef87 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 ebf5a1cc541..58993c67811 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 2cf982df452..d46f1b1e2bb 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;
--
GitLab