Move flags from ByteStreamCnvSvc to ByteStreamCnvSvcBase

Event/ByteStreamCnvSvc/ByteStreamCnvSvc/ByteStreamCnvSvc.h

@@ -78,15 +78,6 @@ private:
    /// Services for writing output
    std::map<std::string, ByteStreamOutputSvc*> m_ioSvcMap;
 
-   /// flags for Simulation EventType
-   Gaudi::Property<bool> m_isSimulation;
-   /// flags for TestBeam EventType
-   Gaudi::Property<bool> m_isTestbeam;
-   /// flags for Calibration EventType
-   Gaudi::Property<bool> m_isCalibration;
-   /// flags for getting Detector Mask from COOL
-   Gaudi::Property<bool> m_getDetectorMask;
-
    /// Event store.
    ServiceHandle<StoreGateSvc> m_evtStore;
 

Event/ByteStreamCnvSvc/src/ByteStreamCnvSvc.cxx

@@ -36,10 +36,6 @@ ByteStreamCnvSvc::ByteStreamCnvSvc(const std::string& name, ISvcLocator* pSvcLoc
     m_evtStore ("StoreGateSvc", name)
 {
   declareProperty("ByteStreamOutputSvc",     m_ioSvcName);
-  declareProperty("IsSimulation",  m_isSimulation = false);
-  declareProperty("IsTestbeam",    m_isTestbeam   = false);
-  declareProperty("IsCalibration", m_isCalibration= false);
-  declareProperty("GetDetectorMask", m_getDetectorMask = false);
   declareProperty("UserType",      m_userType     = "RawEvent");
   declareProperty("EventStore",    m_evtStore);
 }

Event/ByteStreamCnvSvc/src/EventInfoByteStreamAuxCnv.cxx

@@ -3,7 +3,7 @@
 */
 
 #include "EventInfoByteStreamAuxCnv.h"
-#include "ByteStreamCnvSvc/ByteStreamCnvSvc.h"
+#include "ByteStreamCnvSvcBase/ByteStreamCnvSvcBase.h"
 #include "ByteStreamCnvSvcBase/ByteStreamAddress.h"
 #include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
 #include "ByteStreamCnvSvc/ByteStreamInputSvc.h"
@@ -62,9 +62,9 @@ StatusCode EventInfoByteStreamAuxCnv::initialize()
     ATH_MSG_ERROR("Cannot get ByteStreamCnvSvc ");
     return sc;
   }
-  m_ByteStreamCnvSvc = dynamic_cast<ByteStreamCnvSvc*>(svc);
+  m_ByteStreamCnvSvc = dynamic_cast<ByteStreamCnvSvcBase*>(svc);
   if (!m_ByteStreamCnvSvc) {
-    ATH_MSG_ERROR("Cannot cast to ByteStreamCnvSvc");
+    ATH_MSG_ERROR("Cannot cast to ByteStreamCnvSvcBase");
     return StatusCode::FAILURE;
   }
 

Event/ByteStreamCnvSvc/src/EventInfoByteStreamAuxCnv.h

@@ -19,7 +19,7 @@
 #include "GaudiKernel/ServiceHandle.h"
 #include "AthenaBaseComps/AthMessaging.h"
 
-class ByteStreamCnvSvc;
+class ByteStreamCnvSvcBase;
 class IROBDataProviderSvc;
 class StoreGateSvc;
 
@@ -47,7 +47,7 @@ class EventInfoByteStreamAuxCnv : public Converter, public AthMessaging
 
  private:
   std::string ascTime(unsigned int t);    //!< convert timestamp to ascii time.
-  ByteStreamCnvSvc* m_ByteStreamCnvSvc;   //!< pointer to BS CnvSvc
+  ByteStreamCnvSvcBase* m_ByteStreamCnvSvc;   //!< pointer to BS CnvSvc
   ServiceHandle<IROBDataProviderSvc> m_robDataProvider; //!< RODDataProviderSvc handle
   ServiceHandle<StoreGateSvc> m_mdSvc;                  //!< TDS handle
   

Event/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase.h

@@ -43,6 +43,20 @@ public:
 protected: // data
    std::vector<std::string> m_initCnvs;
    std::vector<std::string> m_ROD2ROBmap;
+
+private:
+   /** @name Flags which are not used by this service.
+    *  It only serves as an entity storing these values and some other components read it from here.
+    *  TODO: Remove this solution and move the properties where they are needed.
+    */
+   ///@{
+   /// flags for Simulation EventType
+   Gaudi::Property<bool> m_isSimulation{this, "IsSimulation", false};
+   /// flags for TestBeam EventType
+   Gaudi::Property<bool> m_isTestbeam{this, "IsTestbeam", false};
+   /// flags for Calibration EventType
+   Gaudi::Property<bool> m_isCalibration{this, "IsCalibration", false};
+   ///@}
 };
 
 #endif