From fb200ffbcabca42254258c38c69514d927f4d6cb Mon Sep 17 00:00:00 2001
From: Charles Leggett <charles.g.leggett@gmail.com>
Date: Tue, 20 Dec 2016 20:59:56 +0100
Subject: [PATCH] Property modernization w/ Gaudi v28
(McEventSelector-02-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 McEventSelector-02-04-00
M McEventSelector/McEventSelector.h
2016-07-27 scott snyder <snyder@bnl.gov>
* Tagging McEventSelector-02-03-06.
* messageService -> msgSvc.
---
.../McEventSelector/McEventSelector.h | 22 +++++++++----------
Generators/McEventSelector/src/McCnvSvc.cxx | 2 +-
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Generators/McEventSelector/McEventSelector/McEventSelector.h b/Generators/McEventSelector/McEventSelector/McEventSelector.h
index bd4ac19d8cc..4604b8cd013 100644
--- a/Generators/McEventSelector/McEventSelector/McEventSelector.h
+++ b/Generators/McEventSelector/McEventSelector/McEventSelector.h
@@ -79,22 +79,22 @@ public:
private:
// EventSource* p_eventSource;
- IntegerProperty m_runNo;
- UnsignedLongLongProperty m_firstEventNo;
- UnsignedLongLongProperty m_eventsPerRun;
- IntegerProperty m_firstLBNo;
- IntegerProperty m_eventsPerLB;
- IntegerProperty m_initTimeStamp;
- IntegerProperty m_timeStampInterval;
+ Gaudi::CheckedProperty<int> m_runNo;
+ Gaudi::CheckedProperty<unsigned long long> m_firstEventNo;
+ Gaudi::CheckedProperty<unsigned long long> m_eventsPerRun;
+ Gaudi::CheckedProperty<int> m_firstLBNo;
+ Gaudi::CheckedProperty<int> m_eventsPerLB;
+ Gaudi::CheckedProperty<int> m_initTimeStamp;
+ Gaudi::Property<int> m_timeStampInterval;
/// Flags to indicate override of run/event/time
/// These are always true and are here for consistency
/// with other event selectors which only optionally
/// override these numbers.
- BooleanProperty m_overrideRunNumber;
- BooleanProperty m_overrideEventNumber;
- BooleanProperty m_overrideLBNumber;
- BooleanProperty m_overrideTimeStamp;
+ Gaudi::Property<bool> m_overrideRunNumber;
+ Gaudi::Property<bool> m_overrideEventNumber;
+ Gaudi::Property<bool> m_overrideLBNumber;
+ Gaudi::Property<bool> m_overrideTimeStamp;
mutable McContext *m_ctx;
diff --git a/Generators/McEventSelector/src/McCnvSvc.cxx b/Generators/McEventSelector/src/McCnvSvc.cxx
index 05ab52b4a75..11601d722fa 100644
--- a/Generators/McEventSelector/src/McCnvSvc.cxx
+++ b/Generators/McEventSelector/src/McCnvSvc.cxx
@@ -41,7 +41,7 @@ StatusCode McCnvSvc::initialize() {
/// Update state of the service
StatusCode McCnvSvc::updateServiceState(IOpaqueAddress* pAddress) {
- MsgStream log(messageService(), name());
+ MsgStream log(msgSvc(), name());
static bool first = true;
// static int fid = 0;
// static int recid = 0;
--
GitLab