diff --git a/Control/CalypsoExample/WaveformDataAccessExample/CMakeLists.txt b/Control/CalypsoExample/WaveformDataAccessExample/CMakeLists.txt
index 69bfbf2e24d75088351f75892d627d60e1ad302a..703ced096e170c92949af056d37cad12057b81cf 100644
--- a/Control/CalypsoExample/WaveformDataAccessExample/CMakeLists.txt
+++ b/Control/CalypsoExample/WaveformDataAccessExample/CMakeLists.txt
@@ -8,7 +8,7 @@ atlas_subdir( WaveformDataAccessExample )
atlas_add_component( WaveformDataAccessExample
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps ScintRawEvent )
+ LINK_LIBRARIES AthenaBaseComps WaveRawEvent )
atlas_install_python_modules( python/*.py )
diff --git a/Control/CalypsoExample/WaveformDataAccessExample/python/WaveformDataAccessExampleConfig.py b/Control/CalypsoExample/WaveformDataAccessExample/python/WaveformDataAccessExampleConfig.py
index 5d0cfcdeaaac4f96e094b635138edf66466208e2..1151c74dffc7ddaa0182df025e82dd243c36684a 100755
--- a/Control/CalypsoExample/WaveformDataAccessExample/python/WaveformDataAccessExampleConfig.py
+++ b/Control/CalypsoExample/WaveformDataAccessExample/python/WaveformDataAccessExampleConfig.py
@@ -14,7 +14,7 @@ def WaveformDataAccessExampleCfg(flags, name="WaveformDataAccessExampleAlg", **k
from FaserGeoModel.FaserGeoModelConfig import FaserGeometryCfg
a = FaserGeometryCfg(flags)
- WaveformDataAccessExampleAlg = CompFactory.ScintWaveformAccess
+ WaveformDataAccessExampleAlg = CompFactory.RawWaveformAccess
a.addEventAlgo(WaveformDataAccessExampleAlg(name, **kwargs))
from FaserByteStreamCnvSvc.FaserByteStreamCnvSvcConfig import FaserByteStreamCnvSvcCfg
@@ -56,7 +56,7 @@ if __name__ == "__main__":
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
itemList = [ "xAOD::EventInfo#*",
"xAOD::EventAuxInfo#*",
- "ScintWaveformContainer#*"
+ "RawWaveformContainer#*"
]
acc.merge(OutputStreamCfg(ConfigFlags, "RDO", itemList))
ostream = acc.getEventAlgo("OutputStreamRDO")
diff --git a/Control/CalypsoExample/WaveformDataAccessExample/src/ScintWaveformAccess.cxx b/Control/CalypsoExample/WaveformDataAccessExample/src/RawWaveformAccess.cxx
similarity index 54%
rename from Control/CalypsoExample/WaveformDataAccessExample/src/ScintWaveformAccess.cxx
rename to Control/CalypsoExample/WaveformDataAccessExample/src/RawWaveformAccess.cxx
index d3de51d50d765ad4c3ffc4908ab0f426ef80e0ca..0d06d587ddb18dc55bee24650e282af8fdd856e7 100644
--- a/Control/CalypsoExample/WaveformDataAccessExample/src/ScintWaveformAccess.cxx
+++ b/Control/CalypsoExample/WaveformDataAccessExample/src/RawWaveformAccess.cxx
@@ -3,28 +3,27 @@
*/
/*
- * ScintWaveformAccess.cxx
+ * RawWaveformAccess.cxx
*
* Simple algorithm to access waveform data from storegate.
* Try to write a proper thread-safe algorithm.
*
*/
-#include "ScintWaveformAccess.h"
-//#include "ScintRawEvent/ScintWaveform.h"
+#include "RawWaveformAccess.h"
-ScintWaveformAccess::ScintWaveformAccess(const std::string& name, ISvcLocator* pSvcLocator) : AthReentrantAlgorithm(name, pSvcLocator)
+RawWaveformAccess::RawWaveformAccess(const std::string& name, ISvcLocator* pSvcLocator) : AthReentrantAlgorithm(name, pSvcLocator)
{
}
-ScintWaveformAccess::~ScintWaveformAccess()
+RawWaveformAccess::~RawWaveformAccess()
{
}
StatusCode
-ScintWaveformAccess::initialize()
+RawWaveformAccess::initialize()
{
- ATH_MSG_DEBUG("ScintWaveformAccess::initialize() called");
+ ATH_MSG_DEBUG("RawWaveformAccess::initialize() called");
// Must initialize SG handles
ATH_CHECK( m_CaloWaveformContainer.initialize() );
@@ -38,40 +37,40 @@ ScintWaveformAccess::initialize()
}
StatusCode
-ScintWaveformAccess::finalize()
+RawWaveformAccess::finalize()
{
- ATH_MSG_DEBUG("ScintWaveformAccess::finalize() called");
+ ATH_MSG_DEBUG("RawWaveformAccess::finalize() called");
return StatusCode::SUCCESS;
}
StatusCode
-ScintWaveformAccess::execute(const EventContext& ctx) const
+RawWaveformAccess::execute(const EventContext& ctx) const
{
- ATH_MSG_DEBUG("ScintWaveformAccess::execute() called");
+ ATH_MSG_DEBUG("RawWaveformAccess::execute() called");
// Try reading all of the different containers
- SG::ReadHandle<ScintWaveformContainer> caloHandle(m_CaloWaveformContainer, ctx);
+ SG::ReadHandle<RawWaveformContainer> caloHandle(m_CaloWaveformContainer, ctx);
ATH_MSG_INFO("Found ReadHandle for CaloWaveforms");
ATH_MSG_INFO(*caloHandle);
- SG::ReadHandle<ScintWaveformContainer> vetoHandle(m_VetoWaveformContainer, ctx);
+ SG::ReadHandle<RawWaveformContainer> vetoHandle(m_VetoWaveformContainer, ctx);
ATH_MSG_INFO("Found ReadHandle for VetoWaveforms");
ATH_MSG_INFO(*vetoHandle);
- SG::ReadHandle<ScintWaveformContainer> triggerHandle(m_TriggerWaveformContainer, ctx);
+ SG::ReadHandle<RawWaveformContainer> triggerHandle(m_TriggerWaveformContainer, ctx);
ATH_MSG_INFO("Found ReadHandle for TriggerWaveforms");
ATH_MSG_INFO(*triggerHandle);
- SG::ReadHandle<ScintWaveformContainer> preshowerHandle(m_PreshowerWaveformContainer, ctx);
+ SG::ReadHandle<RawWaveformContainer> preshowerHandle(m_PreshowerWaveformContainer, ctx);
ATH_MSG_INFO("Found ReadHandle for PreshowerWaveforms");
ATH_MSG_INFO(*preshowerHandle);
- SG::ReadHandle<ScintWaveformContainer> testHandle(m_TestWaveformContainer, ctx);
+ SG::ReadHandle<RawWaveformContainer> testHandle(m_TestWaveformContainer, ctx);
ATH_MSG_INFO("Found ReadHandle for TestWaveforms");
ATH_MSG_INFO(*testHandle);
- SG::ReadHandle<ScintWaveformContainer> clockHandle(m_ClockWaveformContainer, ctx);
+ SG::ReadHandle<RawWaveformContainer> clockHandle(m_ClockWaveformContainer, ctx);
ATH_MSG_INFO("Found ReadHandle for ClockWaveforms");
ATH_MSG_INFO(*clockHandle);
diff --git a/Control/CalypsoExample/WaveformDataAccessExample/src/ScintWaveformAccess.h b/Control/CalypsoExample/WaveformDataAccessExample/src/RawWaveformAccess.h
similarity index 58%
rename from Control/CalypsoExample/WaveformDataAccessExample/src/ScintWaveformAccess.h
rename to Control/CalypsoExample/WaveformDataAccessExample/src/RawWaveformAccess.h
index ac73b688d35cf9a793c6868027f5b0c62165abbd..d26b1eac4afab5baa890c6de5eadda5b13b5acb3 100644
--- a/Control/CalypsoExample/WaveformDataAccessExample/src/ScintWaveformAccess.h
+++ b/Control/CalypsoExample/WaveformDataAccessExample/src/RawWaveformAccess.h
@@ -3,26 +3,26 @@
*/
/*
- * ScintWaveformAccess.h
+ * RawWaveformAccess.h
*
* Simple algorithm to access digitizer data from storegate.
* Try to write a proper thread-safe algorithm.
*
*/
-#ifndef WAVEFORMDATAACCESSEXAMPLE_SCINTWAVEFORMACCESS_H
-#define WAVEFORMDATAACCESSEXAMPLE_SCINTWAVEFORMACCESS_H
+#ifndef WAVEFORMDATAACCESSEXAMPLE_RAWWAVEFORMACCESS_H
+#define WAVEFORMDATAACCESSEXAMPLE_RAWWAVEFORMACCESS_H
#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "StoreGate/ReadHandleKey.h"
-#include "ScintRawEvent/ScintWaveformContainer.h"
+#include "WaveRawEvent/RawWaveformContainer.h"
-class ScintWaveformAccess: public AthReentrantAlgorithm
+class RawWaveformAccess: public AthReentrantAlgorithm
{
public:
- ScintWaveformAccess(const std::string& name, ISvcLocator* pSvcLocator);
- virtual ~ScintWaveformAccess();
+ RawWaveformAccess(const std::string& name, ISvcLocator* pSvcLocator);
+ virtual ~RawWaveformAccess();
virtual StatusCode initialize() override;
virtual StatusCode execute(const EventContext& ctx) const override;
@@ -30,18 +30,18 @@ class ScintWaveformAccess: public AthReentrantAlgorithm
private:
/// StoreGate key
- SG::ReadHandleKey<ScintWaveformContainer> m_CaloWaveformContainer
+ SG::ReadHandleKey<RawWaveformContainer> m_CaloWaveformContainer
{ this, "CaloWaveformContainerKey", "CaloWaveforms", "ReadHandleKey for CaloWaveforms Container"};
- SG::ReadHandleKey<ScintWaveformContainer> m_VetoWaveformContainer
+ SG::ReadHandleKey<RawWaveformContainer> m_VetoWaveformContainer
{ this, "VetoWaveformContainerKey", "VetoWaveforms", "ReadHandleKey for CaloWaveforms Container"};
- SG::ReadHandleKey<ScintWaveformContainer> m_TriggerWaveformContainer
+ SG::ReadHandleKey<RawWaveformContainer> m_TriggerWaveformContainer
{ this, "TriggerWaveformContainerKey", "TriggerWaveforms", "ReadHandleKey for TriggerWaveforms Container"};
- SG::ReadHandleKey<ScintWaveformContainer> m_PreshowerWaveformContainer
+ SG::ReadHandleKey<RawWaveformContainer> m_PreshowerWaveformContainer
{ this, "PreshowerWaveformContainerKey", "PreshowerWaveforms", "ReadHandleKey for PreshowerWaveforms Container"};
- SG::ReadHandleKey<ScintWaveformContainer> m_TestWaveformContainer
+ SG::ReadHandleKey<RawWaveformContainer> m_TestWaveformContainer
{ this, "TestWaveformContainerKey", "TestWaveforms", "ReadHandleKey for TestWaveforms Container"};
- SG::ReadHandleKey<ScintWaveformContainer> m_ClockWaveformContainer
+ SG::ReadHandleKey<RawWaveformContainer> m_ClockWaveformContainer
{ this, "ClockWaveformContainerKey", "ClockWaveforms", "ReadHandleKey for ClockWaveforms Container"};
};
-#endif /* WAVEFORMDATAACCESSEXAMPLE_SCINTWAVEFORMACCESS_H */
+#endif /* WAVEFORMDATAACCESSEXAMPLE_RAWWAVEFORMACCESS_H */
diff --git a/Control/CalypsoExample/WaveformDataAccessExample/src/components/WaveformDataAccess_entries.cxx b/Control/CalypsoExample/WaveformDataAccessExample/src/components/WaveformDataAccess_entries.cxx
index 41c3b845a273f71238cb72602ec2489459d9d780..4cf977bfe8b96042565fa5b42c9cd0e8db77b994 100644
--- a/Control/CalypsoExample/WaveformDataAccessExample/src/components/WaveformDataAccess_entries.cxx
+++ b/Control/CalypsoExample/WaveformDataAccessExample/src/components/WaveformDataAccess_entries.cxx
@@ -1,3 +1,3 @@
-#include "../ScintWaveformAccess.h"
+#include "../RawWaveformAccess.h"
-DECLARE_COMPONENT( ScintWaveformAccess )
+DECLARE_COMPONENT( RawWaveformAccess )
diff --git a/Event/FaserByteStreamCnvSvc/share/jobOptions_faserBSToRDO.py b/Event/FaserByteStreamCnvSvc/share/jobOptions_faserBSToRDO.py
index 5ce99e4b6f98016bc67dd908ea7ff3a02d503c4f..3a424d4a2f0ae52afa3a19880c5b2996b12c2a3a 100644
--- a/Event/FaserByteStreamCnvSvc/share/jobOptions_faserBSToRDO.py
+++ b/Event/FaserByteStreamCnvSvc/share/jobOptions_faserBSToRDO.py
@@ -51,8 +51,8 @@ tda = FaserTriggerDataAccess("FaserTriggerDataAccess")
tda.OutputLevel = DEBUG
job += tda
-from ScintByteStream.ScintByteStreamConf import ScintWaveformAccess
-wfm = ScintWaveformAccess("ScintWaveformAccess")
+from WaveByteStream.WaveByteStreamConf import RawWaveformAccess
+wfm = RawWaveformAccess("RawWaveformAccess")
wfm.OutputLevel = DEBUG
job += wfm
diff --git a/Event/FaserByteStreamCnvSvcBase/python/FaserByteStreamCnvSvcBaseConfig.py b/Event/FaserByteStreamCnvSvcBase/python/FaserByteStreamCnvSvcBaseConfig.py
index af4766a10cae35fd51cebc003e1f842dacc98974..3a50a75d55c0c2a1e06d6edfa6d900722d5a83c1 100644
--- a/Event/FaserByteStreamCnvSvcBase/python/FaserByteStreamCnvSvcBaseConfig.py
+++ b/Event/FaserByteStreamCnvSvcBase/python/FaserByteStreamCnvSvcBaseConfig.py
@@ -13,12 +13,12 @@ def FaserByteStreamCnvSvcBaseCfg(flags, **kwargs):
"xAOD::FaserTriggerDataAux/FaserTriggerDataAux." ]
adxProvider.TypeNames += [
- "ScintWaveformContainer/CaloWaveforms",
- "ScintWaveformContainer/VetoWaveforms",
- "ScintWaveformContainer/TriggerWaveforms",
- "ScintWaveformContainer/PreshowerWaveforms",
- "ScintWaveformContainer/ClockWaveforms",
- "ScintWaveformContainer/TestWaveforms"
+ "RawWaveformContainer/CaloWaveforms",
+ "RawWaveformContainer/VetoWaveforms",
+ "RawWaveformContainer/TriggerWaveforms",
+ "RawWaveformContainer/PreshowerWaveforms",
+ "RawWaveformContainer/ClockWaveforms",
+ "RawWaveformContainer/TestWaveforms"
]
adxProvider.TypeNames += [ "FaserSCT_RDO_Container/SCT_RDOs",
diff --git a/Event/FaserByteStreamCnvSvcBase/share/BSAddProvSvc_jobOptions.py b/Event/FaserByteStreamCnvSvcBase/share/BSAddProvSvc_jobOptions.py
index 3adf8709d527b6d90c4a1ca24cc2940d6aaef8cc..84aef96722842b0e478b8de7307e58cf69e48e4e 100644
--- a/Event/FaserByteStreamCnvSvcBase/share/BSAddProvSvc_jobOptions.py
+++ b/Event/FaserByteStreamCnvSvcBase/share/BSAddProvSvc_jobOptions.py
@@ -15,11 +15,11 @@ svcMgr.FaserByteStreamAddressProviderSvc.TypeNames += [
# in the ScintByteStream/ScintByteStreamCnv service
# TestWaveforms is configurable for testing purposes
svcMgr.FaserByteStreamAddressProviderSvc.TypeNames += [
- "ScintWaveformContainer/CaloWaveforms",
- "ScintWaveformContainer/VetoWaveforms",
- "ScintWaveformContainer/TriggerWaveforms",
- "ScintWaveformContainer/PreshowerWaveforms",
- "ScintWaveformContainer/TestWaveforms"
+ "RawWaveformContainer/CaloWaveforms",
+ "RawWaveformContainer/VetoWaveforms",
+ "RawWaveformContainer/TriggerWaveforms",
+ "RawWaveformContainer/PreshowerWaveforms",
+ "RawWaveformContainer/TestWaveforms"
]
# Add tracker RDO containers
diff --git a/Scintillator/ScintEventCnv/ScintByteStream/python/__init__.py b/Scintillator/ScintEventCnv/ScintByteStream/python/__init__.py
deleted file mode 100644
index 547eccb66acdda3b759d6569fcbb3fec0491ad35..0000000000000000000000000000000000000000
--- a/Scintillator/ScintEventCnv/ScintByteStream/python/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-#ScintByteStream
\ No newline at end of file
diff --git a/Scintillator/ScintEventCnv/ScintByteStream/src/components/ScintByteStream_entries.cxx b/Scintillator/ScintEventCnv/ScintByteStream/src/components/ScintByteStream_entries.cxx
deleted file mode 100644
index f44dd7e55aa408a39abd10a422d18bd32aae30ab..0000000000000000000000000000000000000000
--- a/Scintillator/ScintEventCnv/ScintByteStream/src/components/ScintByteStream_entries.cxx
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "../ScintWaveformDecoderTool.h"
-#include "../ScintByteStreamCnv.h"
-
-DECLARE_COMPONENT( ScintWaveformDecoderTool )
-
-DECLARE_CONVERTER( ScintByteStreamCnv )
diff --git a/Scintillator/ScintEventCnv/ScintEventAthenaPool/ScintEventAthenaPool/ScintEventAthenaPoolCnvDict.h b/Scintillator/ScintEventCnv/ScintEventAthenaPool/ScintEventAthenaPool/ScintEventAthenaPoolCnvDict.h
deleted file mode 100644
index ddf45c6476d7fc12ed80b0ff8ea5b96e5575ecc4..0000000000000000000000000000000000000000
--- a/Scintillator/ScintEventCnv/ScintEventAthenaPool/ScintEventAthenaPool/ScintEventAthenaPoolCnvDict.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef SCINTEVENTATHENAPOOLCNVDICT_H
-#define SCINTEVENTATHENAPOOLCNVDICT_H
-
-#include "ScintEventAthenaPool/ScintWaveform_p0.h"
-#include "ScintEventAthenaPool/ScintWaveformContainer_p0.h"
-
-#endif
diff --git a/Scintillator/ScintEventCnv/ScintEventAthenaPool/ScintEventAthenaPool/selection.xml b/Scintillator/ScintEventCnv/ScintEventAthenaPool/ScintEventAthenaPool/selection.xml
deleted file mode 100644
index 5c52a4cc6e9f4dbc3c13448549729f939a12f1c3..0000000000000000000000000000000000000000
--- a/Scintillator/ScintEventCnv/ScintEventAthenaPool/ScintEventAthenaPool/selection.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<lcgdict>
- <class name="ScintWaveform_p0" />
- <class name="ScintWaveformContainer_p0" id="344d904d-6338-41f1-94ee-ea609ea4ae44" />
-</lcgdict>
diff --git a/Scintillator/ScintEventCnv/ScintEventAthenaPool/src/ScintWaveformCnv_p0.h b/Scintillator/ScintEventCnv/ScintEventAthenaPool/src/ScintWaveformCnv_p0.h
deleted file mode 100644
index 41bb1530d9623e528b1c50fa4a4e680580f86451..0000000000000000000000000000000000000000
--- a/Scintillator/ScintEventCnv/ScintEventAthenaPool/src/ScintWaveformCnv_p0.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- Copyright (C) 2020 CERN for the benefit of the FASER collaboration
-*/
-
-#ifndef SCINTWAVEFORMCNV_P0_H
-#define SCINTWAVEFORMCNV_P0_H
-
-#include "ScintRawEvent/ScintWaveform.h"
-#include "ScintEventAthenaPool/ScintWaveform_p0.h"
-
-#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
-
-class ScintWaveformCnv_p0 : public T_AthenaPoolTPCnvBase<ScintWaveform, ScintWaveform_p0> {
- public:
- ScintWaveformCnv_p0() {};
-
- virtual void persToTrans(const ScintWaveform_p0* persObj,
- ScintWaveform* transObj,
- MsgStream& log);
-
- virtual void transToPers(const ScintWaveform* transObj,
- ScintWaveform_p0* persObj,
- MsgStream& log);
- private:
-};
-
-#endif
diff --git a/Scintillator/ScintEventCnv/ScintEventAthenaPool/src/ScintWaveformContainerCnv.cxx b/Scintillator/ScintEventCnv/ScintEventAthenaPool/src/ScintWaveformContainerCnv.cxx
deleted file mode 100644
index afea1cac3c2143502dff9f2810e0f245260088ba..0000000000000000000000000000000000000000
--- a/Scintillator/ScintEventCnv/ScintEventAthenaPool/src/ScintWaveformContainerCnv.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- Copyright (C) 2020 CERN for the benefit of the FASER collaboration
-*/
-
-#include "ScintWaveformContainerCnv.h"
-
-ScintWaveformContainer_PERS*
-ScintWaveformContainerCnv::createPersistent (ScintWaveformContainer* transCont) {
- ATH_MSG_DEBUG("ScintWaveformContainerCnv::createPersistent()");
-
- ScintWaveformContainerCnv_PERS converter;
-
- ScintWaveformContainer_PERS* persObj(nullptr);
- persObj = converter.createPersistent( transCont, msg() );
- return persObj;
-}
-
-ScintWaveformContainer*
-ScintWaveformContainerCnv::createTransient() {
- ATH_MSG_DEBUG("ScintWaveformContainerCnv::createTransient()");
-
- static const pool::Guid p0_guid("344d904d-6338-41f1-94ee-ea609ea4ae44");
- ScintWaveformContainer* trans(0);
-
- // Check for GUID of each persistent type
- if ( compareClassGuid(p0_guid) ) {
- std::unique_ptr< ScintWaveformContainer_p0 > col_vect( poolReadObject< ScintWaveformContainer_p0 >() );
-
- ScintWaveformContainerCnv_p0 converter_p0;
- trans = converter_p0.createTransient( col_vect.get(), msg() );
-
- } else {
-
- // Didn't find a known type
- throw std::runtime_error("Unsupported persistent version of ScintWaveformContainer");
- }
-
- return trans;
-
-}
-
-
diff --git a/Scintillator/ScintEventCnv/ScintEventAthenaPool/src/ScintWaveformContainerCnv.h b/Scintillator/ScintEventCnv/ScintEventAthenaPool/src/ScintWaveformContainerCnv.h
deleted file mode 100644
index c0160c8ef2df1cb0c5cb555d01cf0e819757e860..0000000000000000000000000000000000000000
--- a/Scintillator/ScintEventCnv/ScintEventAthenaPool/src/ScintWaveformContainerCnv.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- Copyright 2020 CERN for the benefit of the FASER collaboration
-*/
-
-#ifndef SCINTWAVEFORMCONTAINERCNV_H
-#define SCINTWAVEFORMCONTAINERCNV_H
-
-#include "AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.h"
-
-#include "ScintWaveformContainerCnv_p0.h"
-
-#include "ScintRawEvent/ScintWaveformContainer.h"
-#include "ScintEventAthenaPool/ScintWaveformContainer_p0.h"
-
-// The latest persistent representation
-typedef ScintWaveformContainer_p0 ScintWaveformContainer_PERS;
-typedef ScintWaveformContainerCnv_p0 ScintWaveformContainerCnv_PERS;
-
-typedef T_AthenaPoolCustomCnv< ScintWaveformContainer, ScintWaveformContainer_PERS > ScintWaveformContainerCnvBase;
-
-class ScintWaveformContainerCnv : public ScintWaveformContainerCnvBase {
- friend class CnvFactory<ScintWaveformContainerCnv>;
-
- public:
- ScintWaveformContainerCnv (ISvcLocator* svcloc) : ScintWaveformContainerCnvBase(svcloc) {}
-
- protected:
- virtual ScintWaveformContainer_PERS* createPersistent (ScintWaveformContainer* transCont);
- virtual ScintWaveformContainer* createTransient ();
-
-};
-
-#endif
diff --git a/Scintillator/ScintEventCnv/ScintEventAthenaPool/src/ScintWaveformContainerCnv_p0.h b/Scintillator/ScintEventCnv/ScintEventAthenaPool/src/ScintWaveformContainerCnv_p0.h
deleted file mode 100644
index 6792e2a2ea96287baa8fdcc431cb3bfc2ac769dd..0000000000000000000000000000000000000000
--- a/Scintillator/ScintEventCnv/ScintEventAthenaPool/src/ScintWaveformContainerCnv_p0.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- Copyright 2020 CERN for the benefit of the FASER collaboration
-*/
-
-#ifndef SCINTWAVEFORMCONTAINERCNV_P0_H
-#define SCINTWAVEFORMCONTAINERCNV_P0_H
-
-#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
-
-#include "ScintRawEvent/ScintWaveformContainer.h"
-#include "ScintEventAthenaPool/ScintWaveformContainer_p0.h"
-
-class ScintWaveformContainerCnv_p0 : public T_AthenaPoolTPCnvBase<ScintWaveformContainer, ScintWaveformContainer_p0> {
-
- public:
- ScintWaveformContainerCnv_p0() {};
-
- virtual void persToTrans(const ScintWaveformContainer_p0* persCont,
- ScintWaveformContainer* transCont,
- MsgStream& log);
-
- virtual void transToPers(const ScintWaveformContainer* transCont,
- ScintWaveformContainer_p0* persCont,
- MsgStream& log);
-
-};
-
-#endif
diff --git a/Scintillator/ScintRawEvent/ScintRawEvent/ScintRawEventDict.h b/Scintillator/ScintRawEvent/ScintRawEvent/ScintRawEventDict.h
deleted file mode 100644
index 9a41f31400207f466dbe44769c19545f3d82c5b4..0000000000000000000000000000000000000000
--- a/Scintillator/ScintRawEvent/ScintRawEvent/ScintRawEventDict.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- Copyright (C) 2020 CERN for the benefit of the FASER collaboration
-*/
-
-#ifndef SCINTRAWEVENT_SCINTRAWEVENTDICT_H
-#define SCINTRAWEVENT_SCINTRAWEVENTDICT_H
-
-#include "ScintRawEvent/ScintWaveformContainer.h"
-
-#endif
diff --git a/Scintillator/ScintRawEvent/ScintRawEvent/ScintWaveformContainer.h b/Scintillator/ScintRawEvent/ScintRawEvent/ScintWaveformContainer.h
deleted file mode 100644
index 4438e55df5f057c3c76b17431eea68282b299bb7..0000000000000000000000000000000000000000
--- a/Scintillator/ScintRawEvent/ScintRawEvent/ScintWaveformContainer.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef SCINTRAWEVENT_SCINTWAVEFORMCONTAINER_H
-#define SCINTRAWEVENT_SCINTWAVEFORMCONTAINER_H
-
-#include "ScintRawEvent/ScintWaveform.h"
-#include "AthContainers/DataVector.h"
-#include "AthenaKernel/CLASS_DEF.h"
-
-// Make this a class in case we need to add some functions
-class ScintWaveformContainer : public DataVector<ScintWaveform> {
- public:
- void print() const;
-};
-
-std::ostream
-&operator<<(std::ostream &out, const ScintWaveformContainer &container);
-
-CLASS_DEF(ScintWaveformContainer, 1215612331, 1 )
-SG_BASE(ScintWaveformContainer, DataVector<ScintWaveform>);
-
-#endif // SCINTRAWEVENT_SCINTWAVEFORMCONTAINER_H
diff --git a/Scintillator/ScintRawEvent/ScintRawEvent/selection.xml b/Scintillator/ScintRawEvent/ScintRawEvent/selection.xml
deleted file mode 100644
index f60a803c76b1a6520b65869aa57a88b347507600..0000000000000000000000000000000000000000
--- a/Scintillator/ScintRawEvent/ScintRawEvent/selection.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<lcgdict>
- <class name="ScintWaveformContainer" id="f40fd51f-b70e-4cc8-971d-b6ab5c751a86" />
- <class name="DataVector<ScintWaveform>" id="e4b393bd-e9b8-458a-8691-b0ebbfd6999c" />
- <class name="std::vector<ScintWaveform*>" />
- <class name="std::vector<const ScintWaveform*>" />
- <class name="ScintWaveform" />
-</lcgdict>
diff --git a/Scintillator/ScintRecAlgs/src/components/ScintRecAlgs_entries.cxx b/Scintillator/ScintRecAlgs/src/components/ScintRecAlgs_entries.cxx
deleted file mode 100644
index 9634fc8f9a4adbd9d6950b1727fc5f19f72d7ec0..0000000000000000000000000000000000000000
--- a/Scintillator/ScintRecAlgs/src/components/ScintRecAlgs_entries.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "../ScintWaveformRecAlg.h"
-#include "../ScintClockRecAlg.h"
-
-DECLARE_COMPONENT( ScintWaveformRecAlg )
-DECLARE_COMPONENT( ScintClockRecAlg )
diff --git a/Tracker/TrackerRecAlgs/TrackCounts/test/TrackCountsDbg.py b/Tracker/TrackerRecAlgs/TrackCounts/test/TrackCountsDbg.py
index bb49fa23f6acc2e6e1340b22009720da2f61a8e8..558aac087cdfcdec292ed113b92a803aacba2369 100644
--- a/Tracker/TrackerRecAlgs/TrackCounts/test/TrackCountsDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackCounts/test/TrackCountsDbg.py
@@ -12,7 +12,7 @@ from CalypsoConfiguration.AllConfigFlags import ConfigFlags
from CalypsoConfiguration.MainServicesConfig import MainServicesCfg
from AthenaPoolCnvSvc.PoolWriteConfig import PoolWriteCfg
from FaserByteStreamCnvSvc.FaserByteStreamCnvSvcConfig import FaserByteStreamCnvSvcCfg
-from ScintRecAlgs.ScintRecAlgsConfig import WaveformReconstructionCfg
+from WaveRecAlgs.WaveRecAlgsConfig import WaveformReconstructionCfg
from TrackerPrepRawDataFormation.TrackerPrepRawDataFormationConfig import FaserSCT_ClusterizationCfg
from TrackerClusterFit.TrackerClusterFitConfig import ClusterFitAlgCfg
from TrackCounts.TrackCountsConfig import TrackCountsAlgCfg
@@ -53,7 +53,7 @@ itemList = [ "xAOD::EventInfo#*",
"FaserSCT_RDO_Container#*",
"xAOD::FaserTriggerData#*",
"xAOD::FaserTriggerDataAux#*",
- "ScintWaveformContainer#*",
+ "RawWaveformContainer#*",
"TrackCollection#*",
"xAOD::WaveformHitContainer#*",
"xAOD::WaveformHitAuxContainer#*",
diff --git a/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TestBeamClusterFitDbg.py b/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TestBeamClusterFitDbg.py
index d2d23810bcf69c1899cf26e9cd096e3cc009fc1b..294e066edfd45ccea5dc75a8291e5ad0fd88d969 100755
--- a/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TestBeamClusterFitDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TestBeamClusterFitDbg.py
@@ -14,7 +14,7 @@ from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
from AthenaPoolCnvSvc.PoolWriteConfig import PoolWriteCfg
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
#from Digitization.DigitizationParametersConfig import writeDigitizationMetadata
-from ScintRecAlgs.ScintRecAlgsConfig import WaveformReconstructionCfg
+from WaveRecAlgs.WaveRecAlgsConfig import WaveformReconstructionCfg
from TrackerPrepRawDataFormation.TrackerPrepRawDataFormationConfig import FaserSCT_ClusterizationCfg
from TrackerClusterFit.TrackerClusterFitConfig import ClusterFitAlgCfg
from TrackerSpacePointFormation.TrackerSpacePointFormationConfig import TrackerSpacePointFinderCfg
@@ -124,7 +124,7 @@ acc.merge(TrackerSpacePointFinderCfg(ConfigFlags))
#acc.getEventAlgo("Tracker::ClusterFitAlg").OutputLevel = DEBUG
from AthenaConfiguration.ComponentFactory import CompFactory
-decoderTool = CompFactory.ScintWaveformDecoderTool(name = "ScintWaveformDecoderTool",
+decoderTool = CompFactory.RawWaveformDecoderTool(name = "RawWaveformDecoderTool",
CaloChannels = [0, 1, 2, 3, 4, 5],
PreshowerChannels = [6, 7],
TriggerChannels = [8, 9],
@@ -138,7 +138,7 @@ itemList = [ "xAOD::EventInfo#*",
"FaserSCT_RDO_Container#*",
"xAOD::FaserTriggerData#*",
"xAOD::FaserTriggerDataAux#*",
- "ScintWaveformContainer#*",
+ "RawWaveformContainer#*",
"TrackCollection#*",
"xAOD::WaveformHitContainer#*",
"xAOD::WaveformHitAuxContainer#*",
diff --git a/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TrackerClusterFitDbg.py b/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TrackerClusterFitDbg.py
index 308b5ff3015435a4671d7410f5b97fae54be7dd5..8df7e38a3c75cc163b4fe3f5b68ee6c23d49bb11 100644
--- a/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TrackerClusterFitDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TrackerClusterFitDbg.py
@@ -14,7 +14,7 @@ from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
from AthenaPoolCnvSvc.PoolWriteConfig import PoolWriteCfg
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
#from Digitization.DigitizationParametersConfig import writeDigitizationMetadata
-from ScintRecAlgs.ScintRecAlgsConfig import WaveformReconstructionCfg
+from WaveRecAlgs.WaveRecAlgsConfig import WaveformReconstructionCfg
from TrackerPrepRawDataFormation.TrackerPrepRawDataFormationConfig import FaserSCT_ClusterizationCfg
from TrackerClusterFit.TrackerClusterFitConfig import ClusterFitAlgCfg
from TrackerSpacePointFormation.TrackerSpacePointFormationConfig import TrackerSpacePointFinderCfg
@@ -128,7 +128,7 @@ itemList = [ "xAOD::EventInfo#*",
"FaserSCT_RDO_Container#*",
"xAOD::FaserTriggerData#*",
"xAOD::FaserTriggerDataAux#*",
- "ScintWaveformContainer#*",
+ "RawWaveformContainer#*",
"TrackCollection#*",
"xAOD::WaveformHitContainer#*",
"xAOD::WaveformHitAuxContainer#*",
@@ -155,4 +155,4 @@ acc.getEventAlgo("OutputStreamESD").AcceptAlgs = ["Tracker::ClusterFitAlg"]
sc = acc.run(maxEvents=-1)
# Success should be 0
-sys.exit(not sc.isSuccess())
\ No newline at end of file
+sys.exit(not sc.isSuccess())
diff --git a/Scintillator/ScintEventCnv/ScintByteStream/CMakeLists.txt b/Waveform/WaveEventCnv/WaveByteStream/CMakeLists.txt
similarity index 62%
rename from Scintillator/ScintEventCnv/ScintByteStream/CMakeLists.txt
rename to Waveform/WaveEventCnv/WaveByteStream/CMakeLists.txt
index 12e96ba4668e019d30250f621de356f6f6421b29..6fc3d0b95846b2e395cccbbe6938336def278e4e 100644
--- a/Scintillator/ScintEventCnv/ScintByteStream/CMakeLists.txt
+++ b/Waveform/WaveEventCnv/WaveByteStream/CMakeLists.txt
@@ -1,19 +1,19 @@
# Copyright (C) 2020 CERN for the benefit of the FASER collaboration
# Declare the package name:
-atlas_subdir( ScintByteStream )
+atlas_subdir( WaveByteStream )
# Component(s) in the package:
-#atlas_add_library( ScintByteStreamLib
-# ScintByteStream/*.h
-# PUBLIC_HEADERS ScintByteStream
+#atlas_add_library( WaveByteStreamLib
+# WaveByteStream/*.h
+# PUBLIC_HEADERS WaveByteStream
# LINK_LIBRARIES StoreGateLib
# )
-atlas_add_component( ScintByteStream
+atlas_add_component( WaveByteStream
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaKernel GaudiKernel FaserByteStreamCnvSvcBaseLib FaserEventStorageLib ScintRawEvent
+ LINK_LIBRARIES AthenaKernel GaudiKernel FaserByteStreamCnvSvcBaseLib FaserEventStorageLib WaveRawEvent
PRIVATE_LINK_LIBRARIES AthenaBaseComps )
atlas_install_python_modules( python/*.py )
diff --git a/Scintillator/ScintEventCnv/ScintByteStream/python/ScintByteStreamConfig.py b/Waveform/WaveEventCnv/WaveByteStream/python/WaveByteStreamConfig.py
similarity index 100%
rename from Scintillator/ScintEventCnv/ScintByteStream/python/ScintByteStreamConfig.py
rename to Waveform/WaveEventCnv/WaveByteStream/python/WaveByteStreamConfig.py
diff --git a/Waveform/WaveEventCnv/WaveByteStream/python/__init__.py b/Waveform/WaveEventCnv/WaveByteStream/python/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..6b7e2cabe367eac4e426b6ec278063c6db58f25b
--- /dev/null
+++ b/Waveform/WaveEventCnv/WaveByteStream/python/__init__.py
@@ -0,0 +1 @@
+#WaveByteStream
diff --git a/Scintillator/ScintEventCnv/ScintByteStream/src/ScintWaveformDecoderTool.cxx b/Waveform/WaveEventCnv/WaveByteStream/src/RawWaveformDecoderTool.cxx
similarity index 78%
rename from Scintillator/ScintEventCnv/ScintByteStream/src/ScintWaveformDecoderTool.cxx
rename to Waveform/WaveEventCnv/WaveByteStream/src/RawWaveformDecoderTool.cxx
index c68c89cb90516b534f91e376bdc4dafb23325f4d..2081244c434b40e789bf268284a7b56b13a89929 100644
--- a/Scintillator/ScintEventCnv/ScintByteStream/src/ScintWaveformDecoderTool.cxx
+++ b/Waveform/WaveEventCnv/WaveByteStream/src/RawWaveformDecoderTool.cxx
@@ -2,23 +2,23 @@
Copyright (C) 2020 CERN for the benefit of the FASER collaboration
*/
-#include "ScintWaveformDecoderTool.h"
+#include "RawWaveformDecoderTool.h"
#include "AthenaBaseComps/AthAlgTool.h"
-#include "ScintRawEvent/ScintWaveform.h"
+#include "WaveRawEvent/RawWaveform.h"
#include "EventFormats/DigitizerDataFragment.hpp"
-static const InterfaceID IID_IScintWaveformDecoderTool("ScintWaveformDecoderTool", 1, 0);
+static const InterfaceID IID_IRawWaveformDecoderTool("RawWaveformDecoderTool", 1, 0);
-const InterfaceID& ScintWaveformDecoderTool::interfaceID() {
- return IID_IScintWaveformDecoderTool;
+const InterfaceID& RawWaveformDecoderTool::interfaceID() {
+ return IID_IRawWaveformDecoderTool;
}
-ScintWaveformDecoderTool::ScintWaveformDecoderTool(const std::string& type,
+RawWaveformDecoderTool::RawWaveformDecoderTool(const std::string& type,
const std::string& name,const IInterface* parent)
: AthAlgTool(type, name, parent)
{
- declareInterface<ScintWaveformDecoderTool>(this);
+ declareInterface<RawWaveformDecoderTool>(this);
declareProperty("CaloChannels", m_caloChannels);
m_caloChannels.push_back(0);
@@ -50,30 +50,30 @@ ScintWaveformDecoderTool::ScintWaveformDecoderTool(const std::string& type,
}
-ScintWaveformDecoderTool::~ScintWaveformDecoderTool()
+RawWaveformDecoderTool::~RawWaveformDecoderTool()
{
}
StatusCode
-ScintWaveformDecoderTool::initialize()
+RawWaveformDecoderTool::initialize()
{
- ATH_MSG_DEBUG("ScintWaveformDecoderTool::initialize()");
+ ATH_MSG_DEBUG("RawWaveformDecoderTool::initialize()");
return StatusCode::SUCCESS;
}
StatusCode
-ScintWaveformDecoderTool::finalize()
+RawWaveformDecoderTool::finalize()
{
- ATH_MSG_DEBUG("ScintWaveformDecoderTool::finalize()");
+ ATH_MSG_DEBUG("RawWaveformDecoderTool::finalize()");
return StatusCode::SUCCESS;
}
StatusCode
-ScintWaveformDecoderTool::convert(const DAQFormats::EventFull* re,
- ScintWaveformContainer* container,
+RawWaveformDecoderTool::convert(const DAQFormats::EventFull* re,
+ RawWaveformContainer* container,
const std::string key)
{
- ATH_MSG_DEBUG("ScintWaveformDecoderTool::convert("+key+")");
+ ATH_MSG_DEBUG("RawWaveformDecoderTool::convert("+key+")");
if (!re) {
ATH_MSG_ERROR("EventFull passed to convert() is null!");
@@ -81,7 +81,7 @@ ScintWaveformDecoderTool::convert(const DAQFormats::EventFull* re,
}
if (!container) {
- ATH_MSG_ERROR("ScintWaveformContainer passed to convert() is null!");
+ ATH_MSG_ERROR("RawWaveformContainer passed to convert() is null!");
return StatusCode::FAILURE;
}
@@ -139,12 +139,12 @@ ScintWaveformDecoderTool::convert(const DAQFormats::EventFull* re,
continue;
}
- ScintWaveform* wfm = new ScintWaveform();
+ RawWaveform* wfm = new RawWaveform();
try {
wfm->setWaveform( channel, digitizer->channel_adc_counts( channel ) );
} catch ( DigitizerData::DigitizerDataException& e ) {
- ATH_MSG_WARNING("ScintWaveformDecoderTool:\n"
+ ATH_MSG_WARNING("RawWaveformDecoderTool:\n"
<<e.what()
<< "\nChannel "
<< channel
@@ -155,7 +155,7 @@ ScintWaveformDecoderTool::convert(const DAQFormats::EventFull* re,
wfm->setHeader( digitizer );
} catch ( DigitizerData::DigitizerDataException& e ) {
- ATH_MSG_WARNING("ScintWaveformDecoderTool:\n"
+ ATH_MSG_WARNING("RawWaveformDecoderTool:\n"
<< e.what()
<< "\nCorrupted Digitizer data!\n"
<< *frag);
@@ -174,7 +174,7 @@ ScintWaveformDecoderTool::convert(const DAQFormats::EventFull* re,
// Don't spring a leak
delete digitizer;
- ATH_MSG_DEBUG( "ScintWaveformDecoderTool created container " << key
+ ATH_MSG_DEBUG( "RawWaveformDecoderTool created container " << key
<< " with size=" << container->size());
return StatusCode::SUCCESS;
}
diff --git a/Scintillator/ScintEventCnv/ScintByteStream/src/ScintWaveformDecoderTool.h b/Waveform/WaveEventCnv/WaveByteStream/src/RawWaveformDecoderTool.h
similarity index 62%
rename from Scintillator/ScintEventCnv/ScintByteStream/src/ScintWaveformDecoderTool.h
rename to Waveform/WaveEventCnv/WaveByteStream/src/RawWaveformDecoderTool.h
index a5e7bd98261d1e25809953f3ecfdfb33ae139ba3..252698c5fb975370945883d112a72c21ef7798a2 100644
--- a/Scintillator/ScintEventCnv/ScintByteStream/src/ScintWaveformDecoderTool.h
+++ b/Waveform/WaveEventCnv/WaveByteStream/src/RawWaveformDecoderTool.h
@@ -4,31 +4,31 @@
Copyright (C) 2020 CERN for the benefit of the FASER collaboration
*/
-#ifndef SCINTBYTESTREAM_FASERTRIGGERDECODERTOOL_H
-#define SCINTBYTESTREAM_FASERTRIGGERDECODERTOOL_H
+#ifndef WAVEBYTESTREAM_RAWWAVEFORMDECODERTOOL_H
+#define WAVEBYTESTREAM_RAWWAVEFORMDECODERTOOL_H
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ToolHandle.h"
#include "EventFormats/DAQFormats.hpp"
-#include "ScintRawEvent/ScintWaveformContainer.h"
+#include "WaveRawEvent/RawWaveformContainer.h"
// This class provides conversion between bytestream and Waveform objects
-class ScintWaveformDecoderTool : public AthAlgTool {
+class RawWaveformDecoderTool : public AthAlgTool {
public:
- ScintWaveformDecoderTool(const std::string& type, const std::string& name,
+ RawWaveformDecoderTool(const std::string& type, const std::string& name,
const IInterface* parent);
- virtual ~ScintWaveformDecoderTool();
+ virtual ~RawWaveformDecoderTool();
static const InterfaceID& interfaceID();
virtual StatusCode initialize();
virtual StatusCode finalize();
- StatusCode convert(const DAQFormats::EventFull* re, ScintWaveformContainer* wfm, std::string key);
+ StatusCode convert(const DAQFormats::EventFull* re, RawWaveformContainer* wfm, std::string key);
private:
// List of channels to include in each container
@@ -42,5 +42,5 @@ private:
};
-#endif /* SCINTBYTESTREAM_FASERTRIGGERDECODERTOOL_H */
+#endif /* WAVEBYTESTREAM_FASERTRIGGERDECODERTOOL_H */
diff --git a/Scintillator/ScintEventCnv/ScintByteStream/src/ScintByteStreamCnv.cxx b/Waveform/WaveEventCnv/WaveByteStream/src/WaveByteStreamCnv.cxx
similarity index 61%
rename from Scintillator/ScintEventCnv/ScintByteStream/src/ScintByteStreamCnv.cxx
rename to Waveform/WaveEventCnv/WaveByteStream/src/WaveByteStreamCnv.cxx
index ff588cdd9e2d67c29779f5043d2a8e3db701d456..189d94c5fcc2bc966135fdda74f2e23e5a5b2a50 100644
--- a/Scintillator/ScintEventCnv/ScintByteStream/src/ScintByteStreamCnv.cxx
+++ b/Waveform/WaveEventCnv/WaveByteStream/src/WaveByteStreamCnv.cxx
@@ -2,12 +2,12 @@
Copyright (C) 2020 CERN for the benefit of the FASER collaboration
*/
-#include "ScintByteStreamCnv.h"
-#include "ScintWaveformDecoderTool.h"
+#include "WaveByteStreamCnv.h"
+#include "RawWaveformDecoderTool.h"
#include "FaserByteStreamCnvSvcBase/IFaserROBDataProviderSvc.h"
-#include "ScintRawEvent/ScintWaveform.h"
-#include "ScintRawEvent/ScintWaveformContainer.h"
+#include "WaveRawEvent/RawWaveform.h"
+#include "WaveRawEvent/RawWaveformContainer.h"
#include "EventFormats/DAQFormats.hpp"
#include "AthenaKernel/errorcheck.h"
@@ -21,26 +21,26 @@
using DAQFormats::EventFull;
-ScintByteStreamCnv::ScintByteStreamCnv(ISvcLocator* svcloc)
+WaveByteStreamCnv::WaveByteStreamCnv(ISvcLocator* svcloc)
: Converter(storageType(), classID(), svcloc)
- , AthMessaging(svcloc != nullptr ? msgSvc() : nullptr, "ScintByteStreamCnv")
- , m_name("ScintByteStreamCnv")
- , m_tool("ScintWaveformDecoderTool")
+ , AthMessaging(svcloc != nullptr ? msgSvc() : nullptr, "WaveByteStreamCnv")
+ , m_name("WaveByteStreamCnv")
+ , m_tool("RawWaveformDecoderTool")
, m_rdpSvc("FaserROBDataProviderSvc", m_name)
{
ATH_MSG_DEBUG(m_name+"::initialize() called");
}
-ScintByteStreamCnv::~ScintByteStreamCnv() {
+WaveByteStreamCnv::~WaveByteStreamCnv() {
}
-const CLID& ScintByteStreamCnv::classID()
+const CLID& WaveByteStreamCnv::classID()
{
// Change to our data object
- return ClassID_traits<ScintWaveformContainer>::ID();
+ return ClassID_traits<RawWaveformContainer>::ID();
}
-StatusCode ScintByteStreamCnv::initialize()
+StatusCode WaveByteStreamCnv::initialize()
{
ATH_MSG_DEBUG(m_name+"::initialize() called");
@@ -51,22 +51,22 @@ StatusCode ScintByteStreamCnv::initialize()
return StatusCode::SUCCESS;
}
-StatusCode ScintByteStreamCnv::finalize()
+StatusCode WaveByteStreamCnv::finalize()
{
- ATH_MSG_DEBUG("ScintByteStreamCnv::Finalize");
+ ATH_MSG_DEBUG("WaveByteStreamCnv::Finalize");
CHECK(Converter::finalize());
return StatusCode::SUCCESS;
}
-StatusCode ScintByteStreamCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
+StatusCode WaveByteStreamCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
{
- ATH_MSG_DEBUG("ScintByteStreamCnv::createObj() called");
+ ATH_MSG_DEBUG("WaveByteStreamCnv::createObj() called");
// Check that we can access raw data
if (!m_rdpSvc) {
- ATH_MSG_ERROR("ScintByteStreamCnv::createObj() - ROBDataProviderSvc not loaded!");
+ ATH_MSG_ERROR("WaveByteStreamCnv::createObj() - ROBDataProviderSvc not loaded!");
return StatusCode::FAILURE;
}
@@ -86,9 +86,9 @@ StatusCode ScintByteStreamCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
// Get key used in the StoreGateSvc::retrieve function
const std::string key = *(pRE_Addr->par());
- ATH_MSG_DEBUG("ScintByteStreamCnv - creating objects "+key);
+ ATH_MSG_DEBUG("WaveByteStreamCnv - creating objects "+key);
- ScintWaveformContainer* wfmCont = new ScintWaveformContainer;
+ RawWaveformContainer* wfmCont = new RawWaveformContainer;
// Convert selected channels
@@ -96,7 +96,7 @@ StatusCode ScintByteStreamCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
pObj = SG::asStorable(wfmCont);
- ATH_MSG_DEBUG(" New xAOD::ScintWaveformData created");
+ ATH_MSG_DEBUG(" New xAOD::RawWaveformData created");
return StatusCode::SUCCESS;
}
diff --git a/Scintillator/ScintEventCnv/ScintByteStream/src/ScintByteStreamCnv.h b/Waveform/WaveEventCnv/WaveByteStream/src/WaveByteStreamCnv.h
similarity index 72%
rename from Scintillator/ScintEventCnv/ScintByteStream/src/ScintByteStreamCnv.h
rename to Waveform/WaveEventCnv/WaveByteStream/src/WaveByteStreamCnv.h
index 4b296547ff9064568ff9b8a1843781c4e0a0a52a..043ebef563e383143955f0312e684b716ac61839 100644
--- a/Scintillator/ScintEventCnv/ScintByteStream/src/ScintByteStreamCnv.h
+++ b/Waveform/WaveEventCnv/WaveByteStream/src/WaveByteStreamCnv.h
@@ -4,8 +4,8 @@
Copyright (C) 2020 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef SCINTBYTESTREAM_SCINTBYTESTREAMCNV_H
-#define SCINTBYTESTREAM_SCINTBYTESTREAMCNV_H
+#ifndef WAVEBYTESTREAM_WAVEBYTESTREAMCNV_H
+#define WAVEBYTESTREAM_WAVEBYTESTREAMCNV_H
#include "GaudiKernel/ClassID.h"
#include "GaudiKernel/Converter.h"
@@ -15,17 +15,17 @@
#include "AthenaBaseComps/AthMessaging.h"
#include "FaserByteStreamCnvSvcBase/FaserByteStreamAddress.h"
-class ScintWaveformDecoderTool;
+class RawWaveformDecoderTool;
class IFaserROBDataProviderSvc;
// Abstract factory to create the converter
template <class TYPE> class CnvFactory;
-class ScintByteStreamCnv: public Converter, public AthMessaging {
+class WaveByteStreamCnv: public Converter, public AthMessaging {
public:
- ScintByteStreamCnv(ISvcLocator* svcloc);
- virtual ~ScintByteStreamCnv();
+ WaveByteStreamCnv(ISvcLocator* svcloc);
+ virtual ~WaveByteStreamCnv();
virtual StatusCode initialize() override;
virtual StatusCode finalize() override;
@@ -38,11 +38,11 @@ public:
private:
std::string m_name;
- ToolHandle<ScintWaveformDecoderTool> m_tool;
+ ToolHandle<RawWaveformDecoderTool> m_tool;
ServiceHandle<IFaserROBDataProviderSvc> m_rdpSvc;
};
-#endif /* SCINTBYTESTREAM_SCINTBYTESTREAMCNV_H */
+#endif /* WAVEBYTESTREAM_WAVEBYTESTREAMCNV_H */
diff --git a/Waveform/WaveEventCnv/WaveByteStream/src/components/WaveByteStream_entries.cxx b/Waveform/WaveEventCnv/WaveByteStream/src/components/WaveByteStream_entries.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..388644f68bc610861112d45689d1b158cbf31257
--- /dev/null
+++ b/Waveform/WaveEventCnv/WaveByteStream/src/components/WaveByteStream_entries.cxx
@@ -0,0 +1,6 @@
+#include "../RawWaveformDecoderTool.h"
+#include "../WaveByteStreamCnv.h"
+
+DECLARE_COMPONENT( RawWaveformDecoderTool )
+
+DECLARE_CONVERTER( WaveByteStreamCnv )
diff --git a/Scintillator/ScintEventCnv/ScintEventAthenaPool/CMakeLists.txt b/Waveform/WaveEventCnv/WaveEventAthenaPool/CMakeLists.txt
similarity index 51%
rename from Scintillator/ScintEventCnv/ScintEventAthenaPool/CMakeLists.txt
rename to Waveform/WaveEventCnv/WaveEventAthenaPool/CMakeLists.txt
index b68ac1d6083e5a7a3599ad45ffcf30731e14ac97..864bc5da67d738edd0ec9e9d6a89ee83156c9fad 100644
--- a/Scintillator/ScintEventCnv/ScintEventAthenaPool/CMakeLists.txt
+++ b/Waveform/WaveEventCnv/WaveEventAthenaPool/CMakeLists.txt
@@ -1,28 +1,28 @@
# $Id: CMakeLists.txt 749562 2016-05-25 04:45:43Z krasznaa $
################################################################################
-# Package: ScintEventAthenaPool
+# Package: WaveEventAthenaPool
################################################################################
# Declare the package name:
-atlas_subdir( ScintEventAthenaPool )
+atlas_subdir( WaveEventAthenaPool )
# Component(s) in the package:
-atlas_add_poolcnv_library( ScintEventAthenaPoolPoolCnv
- ScintEventAthenaPool/*.h src/*.h src/*.cxx
- FILES ScintRawEvent/ScintWaveform.h
- ScintRawEvent/ScintWaveformContainer.h
+atlas_add_poolcnv_library( WaveEventAthenaPoolPoolCnv
+ WaveEventAthenaPool/*.h src/*.h src/*.cxx
+ FILES WaveRawEvent/RawWaveform.h
+ WaveRawEvent/RawWaveformContainer.h
LINK_LIBRARIES Identifier GeneratorObjectsTPCnv AthAllocators AthContainers
AthenaBaseComps AthenaKernel SGTools StoreGateLib AthenaPoolCnvSvcLib
- AthenaPoolUtilities AtlasSealCLHEP GaudiKernel ScintRawEvent
+ AthenaPoolUtilities AtlasSealCLHEP GaudiKernel WaveRawEvent
)
-atlas_add_dictionary( ScintEventAthenaPoolCnvDict
- ScintEventAthenaPool/ScintEventAthenaPoolCnvDict.h
- ScintEventAthenaPool/selection.xml
+atlas_add_dictionary( WaveEventAthenaPoolCnvDict
+ WaveEventAthenaPool/WaveEventAthenaPoolCnvDict.h
+ WaveEventAthenaPool/selection.xml
LINK_LIBRARIES Identifier GeneratorObjectsTPCnv )
# Install files from the package:
-atlas_install_headers( ScintEventAthenaPool )
+atlas_install_headers( WaveEventAthenaPool )
diff --git a/Scintillator/ScintEventCnv/ScintEventAthenaPool/ScintEventAthenaPool/ScintWaveformContainer_p0.h b/Waveform/WaveEventCnv/WaveEventAthenaPool/WaveEventAthenaPool/RawWaveformContainer_p0.h
similarity index 56%
rename from Scintillator/ScintEventCnv/ScintEventAthenaPool/ScintEventAthenaPool/ScintWaveformContainer_p0.h
rename to Waveform/WaveEventCnv/WaveEventAthenaPool/WaveEventAthenaPool/RawWaveformContainer_p0.h
index 1c7b327d1dd4b642e89a8a3b640766e969c956b8..c36eb219ea450ea216ea9de49a61862da4949416 100644
--- a/Scintillator/ScintEventCnv/ScintEventAthenaPool/ScintEventAthenaPool/ScintWaveformContainer_p0.h
+++ b/Waveform/WaveEventCnv/WaveEventAthenaPool/WaveEventAthenaPool/RawWaveformContainer_p0.h
@@ -2,18 +2,18 @@
Copyright (C) 2020 CERN for the benefit of the FASER collaboration
*/
-#ifndef SCINTWAVEFORMCONTAINER_P0_H
-#define SCINTWAVEFORMCONTAINER_P0_H
+#ifndef RAWWAVEFORMCONTAINER_P0_H
+#define RAWWAVEFORMCONTAINER_P0_H
-// Persistent represenation of a ScintWaveformContainer.
+// Persistent represenation of a RawWaveformContainer.
#include <vector>
-#include "ScintEventAthenaPool/ScintWaveform_p0.h"
+#include "WaveEventAthenaPool/RawWaveform_p0.h"
-class ScintWaveformContainer_p0 {
+class RawWaveformContainer_p0 {
public:
- ScintWaveformContainer_p0();
- friend class ScintWaveformContainerCnv_p0;
+ RawWaveformContainer_p0();
+ friend class RawWaveformContainerCnv_p0;
private:
bool m_board_fail_flag;
unsigned int m_board_id;
@@ -22,11 +22,11 @@ class ScintWaveformContainer_p0 {
unsigned int m_event_counter;
unsigned int m_trigger_time_tag;
unsigned int m_samples;
- std::vector<ScintWaveform_p0> m_waveforms;
+ std::vector<RawWaveform_p0> m_waveforms;
};
inline
-ScintWaveformContainer_p0::ScintWaveformContainer_p0() : m_board_fail_flag(0),
+RawWaveformContainer_p0::RawWaveformContainer_p0() : m_board_fail_flag(0),
m_board_id(0),
m_pattern_trig_options(0),
m_channel_mask(0),
diff --git a/Scintillator/ScintEventCnv/ScintEventAthenaPool/ScintEventAthenaPool/ScintWaveform_p0.h b/Waveform/WaveEventCnv/WaveEventAthenaPool/WaveEventAthenaPool/RawWaveform_p0.h
similarity index 76%
rename from Scintillator/ScintEventCnv/ScintEventAthenaPool/ScintEventAthenaPool/ScintWaveform_p0.h
rename to Waveform/WaveEventCnv/WaveEventAthenaPool/WaveEventAthenaPool/RawWaveform_p0.h
index e91c8811f07753ca4330aa9d7a30a617f7dc5f86..e4721fefeec5ef7be0f945bca38a790c81151ae6 100644
--- a/Scintillator/ScintEventCnv/ScintEventAthenaPool/ScintEventAthenaPool/ScintWaveform_p0.h
+++ b/Waveform/WaveEventCnv/WaveEventAthenaPool/WaveEventAthenaPool/RawWaveform_p0.h
@@ -2,19 +2,19 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef SCINTWAVEFORM_P0_H
-#define SCINTWAVEFORM_P0_H
+#ifndef RAWWAVEFORM_P0_H
+#define RAWWAVEFORM_P0_H
#include <vector>
#include <iostream>
#include <iomanip>
-class ScintWaveform_p0 {
+class RawWaveform_p0 {
public:
- ScintWaveform_p0();
+ RawWaveform_p0();
// List of Cnv classes that convert this into Rdo objects
- friend class ScintWaveformCnv_p0;
+ friend class RawWaveformCnv_p0;
private:
unsigned int m_ID;
@@ -30,13 +30,13 @@ class ScintWaveform_p0 {
};
inline
-ScintWaveform_p0::ScintWaveform_p0() : m_channel(0) {
+RawWaveform_p0::RawWaveform_p0() : m_channel(0) {
m_adc_counts.clear();
}
// Stream operator for debugging
//std::ostream
-//&operator<<(std::ostream &out, const ScintWaveform_p0 &wfm) {
+//&operator<<(std::ostream &out, const RawWaveform_p0 &wfm) {
// return wfm.print(out);
//}
diff --git a/Waveform/WaveEventCnv/WaveEventAthenaPool/WaveEventAthenaPool/WaveEventAthenaPoolCnvDict.h b/Waveform/WaveEventCnv/WaveEventAthenaPool/WaveEventAthenaPool/WaveEventAthenaPoolCnvDict.h
new file mode 100644
index 0000000000000000000000000000000000000000..a7b792abeb146de4de60cccd799b184287a3adb1
--- /dev/null
+++ b/Waveform/WaveEventCnv/WaveEventAthenaPool/WaveEventAthenaPool/WaveEventAthenaPoolCnvDict.h
@@ -0,0 +1,11 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef WAVEEVENTATHENAPOOLCNVDICT_H
+#define WAVEEVENTATHENAPOOLCNVDICT_H
+
+#include "WaveEventAthenaPool/RawWaveform_p0.h"
+#include "WaveEventAthenaPool/RawWaveformContainer_p0.h"
+
+#endif
diff --git a/Waveform/WaveEventCnv/WaveEventAthenaPool/WaveEventAthenaPool/selection.xml b/Waveform/WaveEventCnv/WaveEventAthenaPool/WaveEventAthenaPool/selection.xml
new file mode 100644
index 0000000000000000000000000000000000000000..617ca7864363ae6dd9789869f165a03a1ce407de
--- /dev/null
+++ b/Waveform/WaveEventCnv/WaveEventAthenaPool/WaveEventAthenaPool/selection.xml
@@ -0,0 +1,4 @@
+<lcgdict>
+ <class name="RawWaveform_p0" />
+ <class name="RawWaveformContainer_p0" id="344d904d-6338-41f1-94ee-ea609ea4ae44" />
+</lcgdict>
diff --git a/Scintillator/ScintEventCnv/ScintEventAthenaPool/src/ScintWaveformCnv_p0.cxx b/Waveform/WaveEventCnv/WaveEventAthenaPool/src/RawWaveformCnv_p0.cxx
similarity index 61%
rename from Scintillator/ScintEventCnv/ScintEventAthenaPool/src/ScintWaveformCnv_p0.cxx
rename to Waveform/WaveEventCnv/WaveEventAthenaPool/src/RawWaveformCnv_p0.cxx
index 477849763c6bd19b5ce9cbf82b36c14b9f7303d7..d298c0ff390393b6b8822bcc43167eee7c89ee9d 100644
--- a/Scintillator/ScintEventCnv/ScintEventAthenaPool/src/ScintWaveformCnv_p0.cxx
+++ b/Waveform/WaveEventCnv/WaveEventAthenaPool/src/RawWaveformCnv_p0.cxx
@@ -2,13 +2,13 @@
Copyright (C) 2020 CERN for the benefit of the FASER collaboration
*/
-#include "ScintWaveformCnv_p0.h"
+#include "RawWaveformCnv_p0.h"
void
-ScintWaveformCnv_p0::persToTrans(const ScintWaveform_p0* persObj, ScintWaveform* transObj, MsgStream& /*log*/) {
+RawWaveformCnv_p0::persToTrans(const RawWaveform_p0* persObj, RawWaveform* transObj, MsgStream& /*log*/) {
// Just fill available data here
- // Rest of it patched up in ScintWaveformContainerCnv_p0
+ // Rest of it patched up in RawWaveformContainerCnv_p0
transObj->setIdentifier(persObj->m_ID);
transObj->setChannel(persObj->m_channel);
transObj->setCounts(persObj->m_adc_counts);
@@ -16,9 +16,9 @@ ScintWaveformCnv_p0::persToTrans(const ScintWaveform_p0* persObj, ScintWaveform*
}
void
-ScintWaveformCnv_p0::transToPers(const ScintWaveform* transObj, ScintWaveform_p0* persObj, MsgStream& /*log*/) {
+RawWaveformCnv_p0::transToPers(const RawWaveform* transObj, RawWaveform_p0* persObj, MsgStream& /*log*/) {
- // log << MSG::DEBUG << "ScintWaveformCnv_p0::transToPers called" << endmsg;
+ // log << MSG::DEBUG << "RawWaveformCnv_p0::transToPers called" << endmsg;
// log << MSG::DEBUG << "Transient waveform:" << endmsg;
// log << MSG::DEBUG << (*transObj) << endmsg;
// log << MSG::DEBUG << "Persistent waveform (before):" << endmsg;
@@ -31,6 +31,6 @@ ScintWaveformCnv_p0::transToPers(const ScintWaveform* transObj, ScintWaveform_p0
// log << MSG::DEBUG << "Persistent waveform (after):" << endmsg;
// persObj->print();
- // log << MSG::DEBUG << "ScintWaveformCnv_p0::transToPers done" << endmsg;
+ // log << MSG::DEBUG << "RawWaveformCnv_p0::transToPers done" << endmsg;
}
diff --git a/Waveform/WaveEventCnv/WaveEventAthenaPool/src/RawWaveformCnv_p0.h b/Waveform/WaveEventCnv/WaveEventAthenaPool/src/RawWaveformCnv_p0.h
new file mode 100644
index 0000000000000000000000000000000000000000..1bd08daa51511e65f8314004311c09d5652187f0
--- /dev/null
+++ b/Waveform/WaveEventCnv/WaveEventAthenaPool/src/RawWaveformCnv_p0.h
@@ -0,0 +1,27 @@
+/*
+ Copyright (C) 2020 CERN for the benefit of the FASER collaboration
+*/
+
+#ifndef WAVEWAVEFORMCNV_P0_H
+#define WAVEWAVEFORMCNV_P0_H
+
+#include "WaveRawEvent/RawWaveform.h"
+#include "WaveEventAthenaPool/RawWaveform_p0.h"
+
+#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
+
+class RawWaveformCnv_p0 : public T_AthenaPoolTPCnvBase<RawWaveform, RawWaveform_p0> {
+ public:
+ RawWaveformCnv_p0() {};
+
+ virtual void persToTrans(const RawWaveform_p0* persObj,
+ RawWaveform* transObj,
+ MsgStream& log);
+
+ virtual void transToPers(const RawWaveform* transObj,
+ RawWaveform_p0* persObj,
+ MsgStream& log);
+ private:
+};
+
+#endif
diff --git a/Waveform/WaveEventCnv/WaveEventAthenaPool/src/RawWaveformContainerCnv.cxx b/Waveform/WaveEventCnv/WaveEventAthenaPool/src/RawWaveformContainerCnv.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..dfdf19da8959f8df755d8a7d61d07d5029a3cca9
--- /dev/null
+++ b/Waveform/WaveEventCnv/WaveEventAthenaPool/src/RawWaveformContainerCnv.cxx
@@ -0,0 +1,42 @@
+/*
+ Copyright (C) 2020 CERN for the benefit of the FASER collaboration
+*/
+
+#include "RawWaveformContainerCnv.h"
+
+RawWaveformContainer_PERS*
+RawWaveformContainerCnv::createPersistent (RawWaveformContainer* transCont) {
+ ATH_MSG_DEBUG("RawWaveformContainerCnv::createPersistent()");
+
+ RawWaveformContainerCnv_PERS converter;
+
+ RawWaveformContainer_PERS* persObj(nullptr);
+ persObj = converter.createPersistent( transCont, msg() );
+ return persObj;
+}
+
+RawWaveformContainer*
+RawWaveformContainerCnv::createTransient() {
+ ATH_MSG_DEBUG("RawWaveformContainerCnv::createTransient()");
+
+ static const pool::Guid p0_guid("344d904d-6338-41f1-94ee-ea609ea4ae44");
+ RawWaveformContainer* trans(0);
+
+ // Check for GUID of each persistent type
+ if ( compareClassGuid(p0_guid) ) {
+ std::unique_ptr< RawWaveformContainer_p0 > col_vect( poolReadObject< RawWaveformContainer_p0 >() );
+
+ RawWaveformContainerCnv_p0 converter_p0;
+ trans = converter_p0.createTransient( col_vect.get(), msg() );
+
+ } else {
+
+ // Didn't find a known type
+ throw std::runtime_error("Unsupported persistent version of RawWaveformContainer");
+ }
+
+ return trans;
+
+}
+
+
diff --git a/Waveform/WaveEventCnv/WaveEventAthenaPool/src/RawWaveformContainerCnv.h b/Waveform/WaveEventCnv/WaveEventAthenaPool/src/RawWaveformContainerCnv.h
new file mode 100644
index 0000000000000000000000000000000000000000..1430d855790eca09ea7600f9446e3b77a59f7a0e
--- /dev/null
+++ b/Waveform/WaveEventCnv/WaveEventAthenaPool/src/RawWaveformContainerCnv.h
@@ -0,0 +1,33 @@
+/*
+ Copyright 2020 CERN for the benefit of the FASER collaboration
+*/
+
+#ifndef WAVEWAVEFORMCONTAINERCNV_H
+#define WAVEWAVEFORMCONTAINERCNV_H
+
+#include "AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.h"
+
+#include "RawWaveformContainerCnv_p0.h"
+
+#include "WaveRawEvent/RawWaveformContainer.h"
+#include "WaveEventAthenaPool/RawWaveformContainer_p0.h"
+
+// The latest persistent representation
+typedef RawWaveformContainer_p0 RawWaveformContainer_PERS;
+typedef RawWaveformContainerCnv_p0 RawWaveformContainerCnv_PERS;
+
+typedef T_AthenaPoolCustomCnv< RawWaveformContainer, RawWaveformContainer_PERS > RawWaveformContainerCnvBase;
+
+class RawWaveformContainerCnv : public RawWaveformContainerCnvBase {
+ friend class CnvFactory<RawWaveformContainerCnv>;
+
+ public:
+ RawWaveformContainerCnv (ISvcLocator* svcloc) : RawWaveformContainerCnvBase(svcloc) {}
+
+ protected:
+ virtual RawWaveformContainer_PERS* createPersistent (RawWaveformContainer* transCont);
+ virtual RawWaveformContainer* createTransient ();
+
+};
+
+#endif
diff --git a/Scintillator/ScintEventCnv/ScintEventAthenaPool/src/ScintWaveformContainerCnv_p0.cxx b/Waveform/WaveEventCnv/WaveEventAthenaPool/src/RawWaveformContainerCnv_p0.cxx
similarity index 61%
rename from Scintillator/ScintEventCnv/ScintEventAthenaPool/src/ScintWaveformContainerCnv_p0.cxx
rename to Waveform/WaveEventCnv/WaveEventAthenaPool/src/RawWaveformContainerCnv_p0.cxx
index 9db3a1255fa8e91865bb09757ca04d91810a02a5..cadd7f52108f92a8ff482a8ab0e174ac023c25c8 100644
--- a/Scintillator/ScintEventCnv/ScintEventAthenaPool/src/ScintWaveformContainerCnv_p0.cxx
+++ b/Waveform/WaveEventCnv/WaveEventAthenaPool/src/RawWaveformContainerCnv_p0.cxx
@@ -2,23 +2,23 @@
Copyright (C) 2020 CERN for the benefit of the FASER collaboration
*/
-#include "ScintWaveformContainerCnv_p0.h"
-#include "ScintWaveformCnv_p0.h"
+#include "RawWaveformContainerCnv_p0.h"
+#include "RawWaveformCnv_p0.h"
void
-ScintWaveformContainerCnv_p0::persToTrans(const ScintWaveformContainer_p0* persCont, ScintWaveformContainer* transCont, MsgStream& log) {
+RawWaveformContainerCnv_p0::persToTrans(const RawWaveformContainer_p0* persCont, RawWaveformContainer* transCont, MsgStream& log) {
- log << MSG::DEBUG << "ScintWaveformContainerCnv_p0::persToTrans called" << endmsg;
+ log << MSG::DEBUG << "RawWaveformContainerCnv_p0::persToTrans called" << endmsg;
- ScintWaveformCnv_p0 waveformCnv;
+ RawWaveformCnv_p0 waveformCnv;
// Clear this, transient container is DataVector, which stores pointers
// Create them below and push back to fill
transCont->clear();
for (unsigned int index = 0; index < persCont->m_waveforms.size(); ++index) {
- std::unique_ptr<ScintWaveform> data = std::make_unique<ScintWaveform>();
- const ScintWaveform_p0* pdata = &persCont->m_waveforms.at(index);
+ std::unique_ptr<RawWaveform> data = std::make_unique<RawWaveform>();
+ const RawWaveform_p0* pdata = &persCont->m_waveforms.at(index);
waveformCnv.persToTrans(pdata, data.get(), log);
// Fill other values held by container in persistent class
@@ -35,24 +35,24 @@ ScintWaveformContainerCnv_p0::persToTrans(const ScintWaveformContainer_p0* persC
}
void
-ScintWaveformContainerCnv_p0::transToPers(const ScintWaveformContainer* transCont,ScintWaveformContainer_p0* persCont, MsgStream& log) {
+RawWaveformContainerCnv_p0::transToPers(const RawWaveformContainer* transCont,RawWaveformContainer_p0* persCont, MsgStream& log) {
log << MSG::ALWAYS << "transCont = " << transCont << " / persCont = " << persCont << endmsg;
- log << MSG::ALWAYS << "ScintWaveformContainerCnv_p0::transToPers preparing " << transCont->size() << " waveforms" << endmsg;
+ log << MSG::ALWAYS << "RawWaveformContainerCnv_p0::transToPers preparing " << transCont->size() << " waveforms" << endmsg;
// If trans container is empty, nothing else to do
if (!transCont->size()) {
- log << MSG::DEBUG << "ScintWaveformContainerCnv_p0::transToPers found empty container, exiting!" << endmsg;
+ log << MSG::DEBUG << "RawWaveformContainerCnv_p0::transToPers found empty container, exiting!" << endmsg;
return;
}
- ScintWaveformCnv_p0 waveformCnv;
+ RawWaveformCnv_p0 waveformCnv;
- typedef ScintWaveformContainer TRANS;
+ typedef RawWaveformContainer TRANS;
TRANS::const_iterator it_Cont = transCont->begin();
TRANS::const_iterator it_ContEnd = transCont->end();
// Fill common information
- const ScintWaveform* transObj = (*it_Cont);
+ const RawWaveform* transObj = (*it_Cont);
persCont->m_board_fail_flag = transObj->board_fail_flag();
persCont->m_board_id = transObj->board_id();
persCont->m_pattern_trig_options = transObj->pattern_trig_options();
@@ -67,11 +67,11 @@ ScintWaveformContainerCnv_p0::transToPers(const ScintWaveformContainer* transCon
for (int index=0; it_Cont != it_ContEnd; it_Cont++, index++) {
// Add new collection
log << MSG::DEBUG << "Converting waveform " << index << endmsg;
- const ScintWaveform* data = (*it_Cont);
- ScintWaveform_p0* pdata = &(persCont->m_waveforms.at(index));
+ const RawWaveform* data = (*it_Cont);
+ RawWaveform_p0* pdata = &(persCont->m_waveforms.at(index));
waveformCnv.transToPers(data, pdata, log);
}
- log << MSG::DEBUG << "ScintWaveformContainerCnv_p0::transToPers finished" << endmsg;
+ log << MSG::DEBUG << "RawWaveformContainerCnv_p0::transToPers finished" << endmsg;
}
diff --git a/Waveform/WaveEventCnv/WaveEventAthenaPool/src/RawWaveformContainerCnv_p0.h b/Waveform/WaveEventCnv/WaveEventAthenaPool/src/RawWaveformContainerCnv_p0.h
new file mode 100644
index 0000000000000000000000000000000000000000..efd8607b1bdfb9fc4b50000a8fa5adc7b65ebbab
--- /dev/null
+++ b/Waveform/WaveEventCnv/WaveEventAthenaPool/src/RawWaveformContainerCnv_p0.h
@@ -0,0 +1,28 @@
+/*
+ Copyright 2020 CERN for the benefit of the FASER collaboration
+*/
+
+#ifndef WAVEWAVEFORMCONTAINERCNV_P0_H
+#define WAVEWAVEFORMCONTAINERCNV_P0_H
+
+#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
+
+#include "WaveRawEvent/RawWaveformContainer.h"
+#include "WaveEventAthenaPool/RawWaveformContainer_p0.h"
+
+class RawWaveformContainerCnv_p0 : public T_AthenaPoolTPCnvBase<RawWaveformContainer, RawWaveformContainer_p0> {
+
+ public:
+ RawWaveformContainerCnv_p0() {};
+
+ virtual void persToTrans(const RawWaveformContainer_p0* persCont,
+ RawWaveformContainer* transCont,
+ MsgStream& log);
+
+ virtual void transToPers(const RawWaveformContainer* transCont,
+ RawWaveformContainer_p0* persCont,
+ MsgStream& log);
+
+};
+
+#endif
diff --git a/Scintillator/ScintEventCnv/ScintEventAthenaPool/src/ScintWaveformContainer_p0.cxx b/Waveform/WaveEventCnv/WaveEventAthenaPool/src/RawWaveformContainer_p0.cxx
similarity index 100%
rename from Scintillator/ScintEventCnv/ScintEventAthenaPool/src/ScintWaveformContainer_p0.cxx
rename to Waveform/WaveEventCnv/WaveEventAthenaPool/src/RawWaveformContainer_p0.cxx
diff --git a/Scintillator/ScintRawEvent/CMakeLists.txt b/Waveform/WaveRawEvent/CMakeLists.txt
similarity index 71%
rename from Scintillator/ScintRawEvent/CMakeLists.txt
rename to Waveform/WaveRawEvent/CMakeLists.txt
index 4f97a2a9a31d33c4f2f29820ebad893d84d1020b..48473bf8813e27d85bd73a1c915ad16f34eabbc0 100644
--- a/Scintillator/ScintRawEvent/CMakeLists.txt
+++ b/Waveform/WaveRawEvent/CMakeLists.txt
@@ -1,27 +1,27 @@
################################################################################
-# Package: ScintRawEvent
+# Package: WaveRawEvent
################################################################################
# Declare the package name:
-atlas_subdir( ScintRawEvent )
+atlas_subdir( WaveRawEvent )
# External dependencies:
find_package( CLHEP )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
-atlas_add_library( ScintRawEvent
+atlas_add_library( WaveRawEvent
src/*.cxx
- PUBLIC_HEADERS ScintRawEvent
+ PUBLIC_HEADERS WaveRawEvent
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
LINK_LIBRARIES ${CLHEP_LIBRARIES} AthAllocators AthenaKernel CxxUtils StoreGateLib SGtests
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ScintIdentifier EventFormats )
-atlas_add_dictionary( ScintRawEventDict
- ScintRawEvent/ScintRawEventDict.h
- ScintRawEvent/selection.xml
+atlas_add_dictionary( WaveRawEventDict
+ WaveRawEvent/WaveRawEventDict.h
+ WaveRawEvent/selection.xml
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthAllocators CxxUtils StoreGateLib ScintIdentifier ScintRawEvent )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthAllocators CxxUtils StoreGateLib ScintIdentifier WaveRawEvent )
diff --git a/Scintillator/ScintRawEvent/ScintRawEvent/ScintWaveform.h b/Waveform/WaveRawEvent/WaveRawEvent/RawWaveform.h
similarity index 73%
rename from Scintillator/ScintRawEvent/ScintRawEvent/ScintWaveform.h
rename to Waveform/WaveRawEvent/WaveRawEvent/RawWaveform.h
index c7598d4464abe81f202a30b1534962370f591262..6ea6d9037afe587ebe21d52eb9280b23e7a397c8 100644
--- a/Scintillator/ScintRawEvent/ScintRawEvent/ScintWaveform.h
+++ b/Waveform/WaveRawEvent/WaveRawEvent/RawWaveform.h
@@ -3,15 +3,15 @@
*/
///////////////////////////////////////////////////////////////////
-// ScintWaveform.h
-// Header file for class ScintWaveform
+// RawWaveform.h
+// Header file for class RawWaveform
///////////////////////////////////////////////////////////////////
// Class for the raw waveform data for all scintillator detectors
// This is a direct conversion of the DigitizerDataFragment data
///////////////////////////////////////////////////////////////////
-#ifndef SCINTRAWEVENT_SCINTWAVEFORM_H
-#define SCINTRAWEVENT_SCINTWAVEFORM_H
+#ifndef WAVERAWEVENT_RAWWAVEFORM_H
+#define WAVERAWEVENT_RAWWAVEFORM_H
#include <bitset>
#include <vector>
@@ -23,7 +23,7 @@
class DigitizerDataFragment;
-class ScintWaveform {
+class RawWaveform {
///////////////////////////////////////////////////////////////////
// Public methods:
@@ -31,17 +31,17 @@ class ScintWaveform {
public:
// Default constructor
- ScintWaveform();
+ RawWaveform();
// Destructor:
- virtual ~ScintWaveform();
+ virtual ~RawWaveform();
//move assignment defaulted
- ScintWaveform & operator = (ScintWaveform &&) = default;
+ RawWaveform & operator = (RawWaveform &&) = default;
//assignment defaulted
- ScintWaveform & operator = (const ScintWaveform &) = default;
+ RawWaveform & operator = (const RawWaveform &) = default;
//copy c'tor defaulted
- ScintWaveform(const ScintWaveform &) = default;
+ RawWaveform(const RawWaveform &) = default;
///////////////////////////////////////////////////////////////////
// Const methods:
@@ -65,7 +65,7 @@ public:
// some print-out:
void print() const;
- bool operator < (const ScintWaveform& rhs) const
+ bool operator < (const RawWaveform& rhs) const
{return m_ID < rhs.m_ID;}
// Set functions
@@ -108,38 +108,38 @@ private:
///////////////////////////////////////////////////////////////////
inline unsigned int
-ScintWaveform::channel() const { return m_channel; }
+RawWaveform::channel() const { return m_channel; }
inline unsigned int
-ScintWaveform::board_id() const { return m_board_id; }
+RawWaveform::board_id() const { return m_board_id; }
inline bool
-ScintWaveform::board_fail_flag() const { return m_board_fail_flag; }
+RawWaveform::board_fail_flag() const { return m_board_fail_flag; }
inline unsigned int
-ScintWaveform::pattern_trig_options() const { return m_pattern_trig_options; }
+RawWaveform::pattern_trig_options() const { return m_pattern_trig_options; }
inline unsigned int
-ScintWaveform::channel_mask() const { return m_channel_mask; }
+RawWaveform::channel_mask() const { return m_channel_mask; }
inline unsigned int
-ScintWaveform::event_counter() const { return m_event_counter; }
+RawWaveform::event_counter() const { return m_event_counter; }
inline unsigned int
-ScintWaveform::trigger_time_tag() const { return m_trigger_time_tag; }
+RawWaveform::trigger_time_tag() const { return m_trigger_time_tag; }
inline unsigned int
-ScintWaveform::n_samples() const { return m_samples; }
+RawWaveform::n_samples() const { return m_samples; }
inline const std::vector<unsigned int>&
-ScintWaveform::adc_counts() const { return m_adc_counts; }
+RawWaveform::adc_counts() const { return m_adc_counts; }
inline unsigned int
-ScintWaveform::identify() const { return m_ID; }
+RawWaveform::identify() const { return m_ID; }
std::ostream
-&operator<<(std::ostream &out, const ScintWaveform &wfm);
+&operator<<(std::ostream &out, const RawWaveform &wfm);
-CLASS_DEF( ScintWaveform, 193792541, 1 )
+CLASS_DEF( RawWaveform, 17563068, 1 )
-#endif // SCINTRAWEVENT_SCINTWAVEFORM_H
+#endif // WAVERAWEVENT_RAWWAVEFORM_H
diff --git a/Waveform/WaveRawEvent/WaveRawEvent/RawWaveformContainer.h b/Waveform/WaveRawEvent/WaveRawEvent/RawWaveformContainer.h
new file mode 100644
index 0000000000000000000000000000000000000000..ad502ea1477fbbdb7f0a35da42ee719939b71160
--- /dev/null
+++ b/Waveform/WaveRawEvent/WaveRawEvent/RawWaveformContainer.h
@@ -0,0 +1,24 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef WAVERAWEVENT_RAWWAVEFORMCONTAINER_H
+#define WAVERAWEVENT_RAWWAVEFORMCONTAINER_H
+
+#include "WaveRawEvent/RawWaveform.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
+
+// Make this a class in case we need to add some functions
+class RawWaveformContainer : public DataVector<RawWaveform> {
+ public:
+ void print() const;
+};
+
+std::ostream
+&operator<<(std::ostream &out, const RawWaveformContainer &container);
+
+CLASS_DEF(RawWaveformContainer, 1275584332, 1 )
+SG_BASE(RawWaveformContainer, DataVector<RawWaveform>);
+
+#endif // WAVERAWEVENT_RAWWAVEFORMCONTAINER_H
diff --git a/Waveform/WaveRawEvent/WaveRawEvent/WaveRawEventDict.h b/Waveform/WaveRawEvent/WaveRawEvent/WaveRawEventDict.h
new file mode 100644
index 0000000000000000000000000000000000000000..e8f14a9c06bde840297449568bd76638f2e04a98
--- /dev/null
+++ b/Waveform/WaveRawEvent/WaveRawEvent/WaveRawEventDict.h
@@ -0,0 +1,10 @@
+/*
+ Copyright (C) 2020 CERN for the benefit of the FASER collaboration
+*/
+
+#ifndef WAVERAWEVENT_WAVERAWEVENTDICT_H
+#define WAVERAWEVENT_WAVERAWEVENTDICT_H
+
+#include "WaveRawEvent/RawWaveformContainer.h"
+
+#endif
diff --git a/Waveform/WaveRawEvent/WaveRawEvent/selection.xml b/Waveform/WaveRawEvent/WaveRawEvent/selection.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9429780d48a1f43cb3914a50e5dba08e3e127c10
--- /dev/null
+++ b/Waveform/WaveRawEvent/WaveRawEvent/selection.xml
@@ -0,0 +1,7 @@
+<lcgdict>
+ <class name="RawWaveformContainer" id="f40fd51f-b70e-4cc8-971d-b6ab5c751a86" />
+ <class name="DataVector<RawWaveform>" id="e4b393bd-e9b8-458a-8691-b0ebbfd6999c" />
+ <class name="std::vector<RawWaveform*>" />
+ <class name="std::vector<const RawWaveform*>" />
+ <class name="RawWaveform" />
+</lcgdict>
diff --git a/Scintillator/ScintRawEvent/src/ScintWaveform.cxx b/Waveform/WaveRawEvent/src/RawWaveform.cxx
similarity index 85%
rename from Scintillator/ScintRawEvent/src/ScintWaveform.cxx
rename to Waveform/WaveRawEvent/src/RawWaveform.cxx
index bc9f5eb912e4bd7cd75fefda9b4a829699f92578..13700a735c3653867a7e7ab5df8037e3566664ae 100644
--- a/Scintillator/ScintRawEvent/src/ScintWaveform.cxx
+++ b/Waveform/WaveRawEvent/src/RawWaveform.cxx
@@ -2,12 +2,12 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "ScintRawEvent/ScintWaveform.h"
+#include "WaveRawEvent/RawWaveform.h"
#include "EventFormats/DigitizerDataFragment.hpp"
// Default consdtructor
//
-ScintWaveform::ScintWaveform( ) :
+RawWaveform::RawWaveform( ) :
m_board_id(0),
m_board_fail_flag(1),
m_pattern_trig_options(0),
@@ -22,15 +22,15 @@ ScintWaveform::ScintWaveform( ) :
}
-ScintWaveform::~ScintWaveform() {}
+RawWaveform::~RawWaveform() {}
void
-ScintWaveform::setIdentifier(unsigned int id) {
+RawWaveform::setIdentifier(unsigned int id) {
m_ID = id;
}
void
-ScintWaveform::setHeader(const DigitizerDataFragment* frag) {
+RawWaveform::setHeader(const DigitizerDataFragment* frag) {
m_board_id = frag->board_id();
m_pattern_trig_options = frag->pattern_trig_options();
m_channel_mask = frag->channel_mask();
@@ -40,7 +40,7 @@ ScintWaveform::setHeader(const DigitizerDataFragment* frag) {
}
void
-ScintWaveform::setWaveform(unsigned int channel, const std::vector<uint16_t> waveform) {
+RawWaveform::setWaveform(unsigned int channel, const std::vector<uint16_t> waveform) {
m_channel = channel;
// Make sure the vector is empty first
@@ -51,7 +51,7 @@ ScintWaveform::setWaveform(unsigned int channel, const std::vector<uint16_t> wav
}
std::ostream
-&operator<<(std::ostream &out, const ScintWaveform &wfm) {
+&operator<<(std::ostream &out, const RawWaveform &wfm) {
out << "Waveform data channel:" << std::dec << wfm.channel() << std::endl;
out << std::setw(30) << " board_id: "<<std::setfill(' ')<<std::setw(32)<<std::dec<<wfm.board_id()<<std::setfill(' ')<<std::endl;
out << std::setw(30) << " board_fail_flag: "<<std::setfill(' ')<<std::setw(32)<<std::dec<<wfm.board_fail_flag()<<std::setfill(' ')<<std::endl;
diff --git a/Scintillator/ScintRawEvent/src/ScintWaveformContainer.cxx b/Waveform/WaveRawEvent/src/RawWaveformContainer.cxx
similarity index 62%
rename from Scintillator/ScintRawEvent/src/ScintWaveformContainer.cxx
rename to Waveform/WaveRawEvent/src/RawWaveformContainer.cxx
index 2a71ab8101ffafdb20cef5d7f5a28031d3d77543..b1a0da82d2608fe4d618a0d6ae46fc88a8a6a8f7 100644
--- a/Scintillator/ScintRawEvent/src/ScintWaveformContainer.cxx
+++ b/Waveform/WaveRawEvent/src/RawWaveformContainer.cxx
@@ -1,13 +1,13 @@
-#include "ScintRawEvent/ScintWaveformContainer.h"
+#include "WaveRawEvent/RawWaveformContainer.h"
void
-ScintWaveformContainer::print() const {
+RawWaveformContainer::print() const {
std::cout << "Waveform container with size=" << this->size() << std::endl;
for(auto wfm: *this) std::cout << *wfm;
}
std::ostream
-&operator<<(std::ostream &out, const ScintWaveformContainer& cont) {
+&operator<<(std::ostream &out, const RawWaveformContainer& cont) {
out << "Waveform container with size=" << cont.size() << std::endl;
for(auto wfm: cont) out << *wfm;
return out;
diff --git a/Scintillator/ScintRecAlgs/CMakeLists.txt b/Waveform/WaveRecAlgs/CMakeLists.txt
similarity index 74%
rename from Scintillator/ScintRecAlgs/CMakeLists.txt
rename to Waveform/WaveRecAlgs/CMakeLists.txt
index 7ad1776170385a4f2203030dbac8fc5f7f5f43ab..c72671bf705ace3ad1935034564982a3b60a94a2 100644
--- a/Scintillator/ScintRecAlgs/CMakeLists.txt
+++ b/Waveform/WaveRecAlgs/CMakeLists.txt
@@ -1,15 +1,15 @@
################################################################################
-# Package: ScintRecAlgs
+# Package: WaveRecAlgs
################################################################################
# Declare the package name:
-atlas_subdir( ScintRecAlgs )
+atlas_subdir( WaveRecAlgs )
# Component(s) in the package:
-atlas_add_component( ScintRecAlgs
+atlas_add_component( WaveRecAlgs
src/*.cxx src/*.h
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps StoreGateLib ScintRawEvent xAODFaserWaveform ScintRecToolsLib )
+ LINK_LIBRARIES AthenaBaseComps StoreGateLib WaveRawEvent xAODFaserWaveform WaveRecToolsLib )
atlas_install_python_modules( python/*.py )
diff --git a/Scintillator/ScintRecAlgs/python/ScintRecAlgsConfig.py b/Waveform/WaveRecAlgs/python/WaveRecAlgsConfig.py
similarity index 95%
rename from Scintillator/ScintRecAlgs/python/ScintRecAlgsConfig.py
rename to Waveform/WaveRecAlgs/python/WaveRecAlgsConfig.py
index f96dbcaf2f7ba283437116bfad0cd244af8220c6..0c2d5ffc6c5d7cfff88cc74cf8d4b35f5f635ef8 100644
--- a/Scintillator/ScintRecAlgs/python/ScintRecAlgsConfig.py
+++ b/Waveform/WaveRecAlgs/python/WaveRecAlgsConfig.py
@@ -32,7 +32,7 @@ def WaveformClockRecCfg(flags, name="ClockRecAlg", **kwargs):
# tool.CheckResult = True
kwargs.setdefault("ClockReconstructionTool", tool)
- recoAlg = CompFactory.ScintClockRecAlg(name, **kwargs)
+ recoAlg = CompFactory.WaveClockRecAlg(name, **kwargs)
recoAlg.ClockReconstructionTool = tool
acc.addEventAlgo(recoAlg)
@@ -49,7 +49,7 @@ def WaveformHitRecCfg(flags, name="WaveformRecAlg", source="", **kwargs):
kwargs.setdefault("WaveformHitContainerKey", source+"WaveformHits")
kwargs.setdefault("WaveformReconstructionTool", tool)
- recoAlg = CompFactory.ScintWaveformRecAlg(name, **kwargs)
+ recoAlg = CompFactory.RawWaveformRecAlg(name, **kwargs)
recoAlg.WaveformReconstructionTool = tool
acc.addEventAlgo(recoAlg)
diff --git a/Scintillator/ScintRecAlgs/src/ScintWaveformRecAlg.cxx b/Waveform/WaveRecAlgs/src/RawWaveformRecAlg.cxx
similarity index 84%
rename from Scintillator/ScintRecAlgs/src/ScintWaveformRecAlg.cxx
rename to Waveform/WaveRecAlgs/src/RawWaveformRecAlg.cxx
index c4e04b2e62e84df576de0a1d6769a28a149ed5a1..3c6da1c0eb5a365f469dba9acd0b2027c433c2f4 100644
--- a/Scintillator/ScintRecAlgs/src/ScintWaveformRecAlg.cxx
+++ b/Waveform/WaveRecAlgs/src/RawWaveformRecAlg.cxx
@@ -1,13 +1,13 @@
-#include "ScintWaveformRecAlg.h"
+#include "RawWaveformRecAlg.h"
-ScintWaveformRecAlg::ScintWaveformRecAlg(const std::string& name,
+RawWaveformRecAlg::RawWaveformRecAlg(const std::string& name,
ISvcLocator* pSvcLocator)
: AthReentrantAlgorithm(name, pSvcLocator) {
}
StatusCode
-ScintWaveformRecAlg::initialize() {
+RawWaveformRecAlg::initialize() {
ATH_MSG_INFO(name() << "::initalize()" );
// Initalize tools
@@ -26,24 +26,24 @@ ScintWaveformRecAlg::initialize() {
}
StatusCode
-ScintWaveformRecAlg::finalize() {
+RawWaveformRecAlg::finalize() {
ATH_MSG_INFO(name() << "::finalize()");
return StatusCode::SUCCESS;
}
StatusCode
-ScintWaveformRecAlg::execute(const EventContext& ctx) const {
+RawWaveformRecAlg::execute(const EventContext& ctx) const {
ATH_MSG_DEBUG("Executing");
ATH_MSG_DEBUG("Run: " << ctx.eventID().run_number()
<< " Event: " << ctx.eventID().event_number());
// Find the input waveform container
- SG::ReadHandle<ScintWaveformContainer> waveformHandle(m_waveformContainerKey, ctx);
+ SG::ReadHandle<RawWaveformContainer> waveformHandle(m_waveformContainerKey, ctx);
ATH_CHECK( waveformHandle.isValid() );
- ATH_MSG_DEBUG("Found ReadHandle for ScintWaveformContainer " << m_waveformContainerKey);
+ ATH_MSG_DEBUG("Found ReadHandle for RawWaveformContainer " << m_waveformContainerKey);
if (waveformHandle->size() == 0) {
ATH_MSG_DEBUG("Waveform container found with zero length!");
diff --git a/Scintillator/ScintRecAlgs/src/ScintWaveformRecAlg.h b/Waveform/WaveRecAlgs/src/RawWaveformRecAlg.h
similarity index 70%
rename from Scintillator/ScintRecAlgs/src/ScintWaveformRecAlg.h
rename to Waveform/WaveRecAlgs/src/RawWaveformRecAlg.h
index 7d43e97523bdba7ddc8749dddc40108dafa29f35..a7120b83598b7b32476f86f1b890014452bf70f4 100644
--- a/Scintillator/ScintRecAlgs/src/ScintWaveformRecAlg.h
+++ b/Waveform/WaveRecAlgs/src/RawWaveformRecAlg.h
@@ -1,11 +1,11 @@
-#ifndef SCINTRECALGS_SCINTWAVEFORMRECALG_H
-#define SCINTRECALGS_SCINTWAVEFORMRECALG_H
+#ifndef WAVERECALGS_RAWWAVEFORMRECALG_H
+#define WAVERECALGS_RAWWAVEFORMRECALG_H
// Base class
#include "AthenaBaseComps/AthReentrantAlgorithm.h"
// Data classes
-#include "ScintRawEvent/ScintWaveformContainer.h"
+#include "WaveRawEvent/RawWaveformContainer.h"
#include "xAODFaserWaveform/WaveformClock.h"
#include "xAODFaserWaveform/WaveformClockAuxInfo.h"
@@ -15,7 +15,7 @@
#include "xAODFaserWaveform/WaveformHitAuxContainer.h"
// Tool classes
-#include "ScintRecTools/IWaveformReconstructionTool.h"
+#include "WaveRecTools/IWaveformReconstructionTool.h"
// Handles
#include "StoreGate/ReadHandleKey.h"
@@ -28,12 +28,12 @@
// STL
#include <string>
-class ScintWaveformRecAlg : public AthReentrantAlgorithm {
+class RawWaveformRecAlg : public AthReentrantAlgorithm {
public:
// Constructor
- ScintWaveformRecAlg(const std::string& name, ISvcLocator* pSvcLocator);
- virtual ~ScintWaveformRecAlg() = default;
+ RawWaveformRecAlg(const std::string& name, ISvcLocator* pSvcLocator);
+ virtual ~RawWaveformRecAlg() = default;
/** @name Usual algorithm methods */
//@{
@@ -46,9 +46,9 @@ class ScintWaveformRecAlg : public AthReentrantAlgorithm {
/** @name Disallow default instantiation, copy, assignment */
//@{
- ScintWaveformRecAlg() = delete;
- ScintWaveformRecAlg(const ScintWaveformRecAlg&) = delete;
- ScintWaveformRecAlg &operator=(const ScintWaveformRecAlg&) = delete;
+ RawWaveformRecAlg() = delete;
+ RawWaveformRecAlg(const RawWaveformRecAlg&) = delete;
+ RawWaveformRecAlg &operator=(const RawWaveformRecAlg&) = delete;
//@}
/**
@@ -61,7 +61,7 @@ class ScintWaveformRecAlg : public AthReentrantAlgorithm {
* @name Input raw waveform data using SG::ReadHandleKey
*/
//@{
- SG::ReadHandleKey<ScintWaveformContainer> m_waveformContainerKey
+ SG::ReadHandleKey<RawWaveformContainer> m_waveformContainerKey
{this, "WaveformContainerKey", ""};
//@}
@@ -83,4 +83,4 @@ class ScintWaveformRecAlg : public AthReentrantAlgorithm {
};
-#endif // SCINTRECALGS_SCINTWAVEFORMRECALG_H
+#endif // WAVERECALGS_RAWWAVEFORMRECALG_H
diff --git a/Scintillator/ScintRecAlgs/src/ScintClockRecAlg.cxx b/Waveform/WaveRecAlgs/src/WaveClockRecAlg.cxx
similarity index 89%
rename from Scintillator/ScintRecAlgs/src/ScintClockRecAlg.cxx
rename to Waveform/WaveRecAlgs/src/WaveClockRecAlg.cxx
index 11ccfa9640a912e74bb7b8ecbb639adbd3ca2a98..36891e70dd09cf8180753711209c526da90e04e4 100644
--- a/Scintillator/ScintRecAlgs/src/ScintClockRecAlg.cxx
+++ b/Waveform/WaveRecAlgs/src/WaveClockRecAlg.cxx
@@ -1,12 +1,12 @@
-#include "ScintClockRecAlg.h"
+#include "WaveClockRecAlg.h"
-ScintClockRecAlg::ScintClockRecAlg(const std::string& name,
+WaveClockRecAlg::WaveClockRecAlg(const std::string& name,
ISvcLocator* pSvcLocator)
: AthReentrantAlgorithm(name, pSvcLocator) {
}
StatusCode
-ScintClockRecAlg::initialize() {
+WaveClockRecAlg::initialize() {
ATH_MSG_INFO(name() << "::initalize()" );
// Initalize tools
@@ -22,21 +22,21 @@ ScintClockRecAlg::initialize() {
}
StatusCode
-ScintClockRecAlg::finalize() {
+WaveClockRecAlg::finalize() {
ATH_MSG_INFO(name() << "::finalize()");
return StatusCode::SUCCESS;
}
StatusCode
-ScintClockRecAlg::execute(const EventContext& ctx) const {
+WaveClockRecAlg::execute(const EventContext& ctx) const {
ATH_MSG_DEBUG("Executing");
ATH_MSG_DEBUG("Run: " << ctx.eventID().run_number()
<< " Event: " << ctx.eventID().event_number());
// Find the input waveform container
- SG::ReadHandle<ScintWaveformContainer> waveformHandle(m_waveformContainerKey, ctx);
+ SG::ReadHandle<RawWaveformContainer> waveformHandle(m_waveformContainerKey, ctx);
ATH_CHECK( waveformHandle.isValid() );
ATH_MSG_DEBUG("Found ReadHandle for Waveforms");
diff --git a/Scintillator/ScintRecAlgs/src/ScintClockRecAlg.h b/Waveform/WaveRecAlgs/src/WaveClockRecAlg.h
similarity index 63%
rename from Scintillator/ScintRecAlgs/src/ScintClockRecAlg.h
rename to Waveform/WaveRecAlgs/src/WaveClockRecAlg.h
index 3fde8295da9b5ca4cdecf68bceae205df2a7ef8a..e6e61cfd29e219200c64bfcdb1752be0055e983a 100644
--- a/Scintillator/ScintRecAlgs/src/ScintClockRecAlg.h
+++ b/Waveform/WaveRecAlgs/src/WaveClockRecAlg.h
@@ -1,17 +1,17 @@
-#ifndef SCINTRECALGS_SCINTCLOCKRECALG_H
-#define SCINTRECALGS_SCINTCLOCKRECALG_H
+#ifndef WAVERECALGS_WAVECLOCKRECALG_H
+#define WAVERECALGS_WAVECLOCKRECALG_H
// Base class
#include "AthenaBaseComps/AthReentrantAlgorithm.h"
// Input data
-#include "ScintRawEvent/ScintWaveformContainer.h"
+#include "WaveRawEvent/RawWaveformContainer.h"
// Output data
-// #include "ScintRecEvent/WaveformClock.h"
+// #include "WaveRecEvent/WaveformClock.h"
#include "xAODFaserWaveform/WaveformClock.h"
#include "xAODFaserWaveform/WaveformClockAuxInfo.h"
-#include "ScintRecTools/IClockReconstructionTool.h"
+#include "WaveRecTools/IClockReconstructionTool.h"
#include "StoreGate/ReadHandleKey.h"
@@ -22,12 +22,12 @@
// STL
#include <string>
-class ScintClockRecAlg : public AthReentrantAlgorithm {
+class WaveClockRecAlg : public AthReentrantAlgorithm {
public:
// Constructor
- ScintClockRecAlg(const std::string& name, ISvcLocator* pSvcLocator);
- virtual ~ScintClockRecAlg() = default;
+ WaveClockRecAlg(const std::string& name, ISvcLocator* pSvcLocator);
+ virtual ~WaveClockRecAlg() = default;
/** @name Usual algorithm methods */
//@{
@@ -40,9 +40,9 @@ class ScintClockRecAlg : public AthReentrantAlgorithm {
/** @name Disallow default instantiation, copy, assignment */
//@{
- ScintClockRecAlg() = delete;
- ScintClockRecAlg(const ScintClockRecAlg&) = delete;
- ScintClockRecAlg &operator=(const ScintClockRecAlg&) = delete;
+ WaveClockRecAlg() = delete;
+ WaveClockRecAlg(const WaveClockRecAlg&) = delete;
+ WaveClockRecAlg &operator=(const WaveClockRecAlg&) = delete;
//@}
/**
@@ -55,7 +55,7 @@ class ScintClockRecAlg : public AthReentrantAlgorithm {
* @name Input data using SG::ReadHandleKey
*/
//@{
- SG::ReadHandleKey<ScintWaveformContainer> m_waveformContainerKey
+ SG::ReadHandleKey<RawWaveformContainer> m_waveformContainerKey
{this, "WaveformContainerKey", "ClockWaveforms"};
//@}
@@ -69,4 +69,4 @@ class ScintClockRecAlg : public AthReentrantAlgorithm {
};
-#endif // SCINTRECALGS_SCINTCLOCKRECALG_H
+#endif // WAVERECALGS_WAVECLOCKRECALG_H
diff --git a/Waveform/WaveRecAlgs/src/components/WaveRecAlgs_entries.cxx b/Waveform/WaveRecAlgs/src/components/WaveRecAlgs_entries.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..21f97520a8e2da1093b5b4f929143cff32fd83a9
--- /dev/null
+++ b/Waveform/WaveRecAlgs/src/components/WaveRecAlgs_entries.cxx
@@ -0,0 +1,5 @@
+#include "../RawWaveformRecAlg.h"
+#include "../WaveClockRecAlg.h"
+
+DECLARE_COMPONENT( RawWaveformRecAlg )
+DECLARE_COMPONENT( WaveClockRecAlg )
diff --git a/Scintillator/ScintRecTools/CMakeLists.txt b/Waveform/WaveRecTools/CMakeLists.txt
similarity index 65%
rename from Scintillator/ScintRecTools/CMakeLists.txt
rename to Waveform/WaveRecTools/CMakeLists.txt
index a128a73845fdfdfea13d2c43e6085d2f5e99b2d1..d8f3e6f053232477a1b1501a26e3a88efe9272c1 100644
--- a/Scintillator/ScintRecTools/CMakeLists.txt
+++ b/Waveform/WaveRecTools/CMakeLists.txt
@@ -1,25 +1,25 @@
################################################################################
-# Package: ScintRecTools
+# Package: WaveRecTools
################################################################################
# Declare the package name:
-atlas_subdir( ScintRecTools )
+atlas_subdir( WaveRecTools )
# External dependencies:
find_package( ROOT )
# Component(s) in the package:
-atlas_add_library( ScintRecToolsLib
- ScintRecTools/*.h src/*.cxx src/*.h
- PUBLIC_HEADERS ScintRecTools
+atlas_add_library( WaveRecToolsLib
+ WaveRecTools/*.h src/*.cxx src/*.h
+ PUBLIC_HEADERS WaveRecTools
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES AthenaBaseComps AthenaKernel GeoPrimitives ScintRawEvent xAODFaserWaveform
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel GeoPrimitives WaveRawEvent xAODFaserWaveform
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES}
)
-atlas_add_component( ScintRecTools
+atlas_add_component( WaveRecTools
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps GaudiKernel ScintRecToolsLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps GaudiKernel WaveRecToolsLib )
diff --git a/Scintillator/ScintRecTools/ScintRecTools/IClockReconstructionTool.h b/Waveform/WaveRecTools/WaveRecTools/IClockReconstructionTool.h
similarity index 80%
rename from Scintillator/ScintRecTools/ScintRecTools/IClockReconstructionTool.h
rename to Waveform/WaveRecTools/WaveRecTools/IClockReconstructionTool.h
index 46712a75ca41eceabf1331fd2ae1412d9f7f429b..d9b158c8e67b026234acee51c4b3ede6d6843fd2 100644
--- a/Scintillator/ScintRecTools/ScintRecTools/IClockReconstructionTool.h
+++ b/Waveform/WaveRecTools/WaveRecTools/IClockReconstructionTool.h
@@ -9,8 +9,8 @@
*/
-#ifndef SCINTRECTOOLS_ICLOCKRECONSTRUCTIONTOOL_H
-#define SCINTRECTOOLS_ICLOCKRECONSTRUCTIONTOOL_H
+#ifndef WAVERECTOOLS_ICLOCKRECONSTRUCTIONTOOL_H
+#define WAVERECTOOLS_ICLOCKRECONSTRUCTIONTOOL_H
// Base class
#include "GaudiKernel/IAlgTool.h"
@@ -18,7 +18,7 @@
#include "xAODFaserWaveform/WaveformClock.h"
-class ScintWaveform;
+class RawWaveform;
///Interface for Clock reco algorithms
class IClockReconstructionTool : virtual public IAlgTool
@@ -31,7 +31,7 @@ class IClockReconstructionTool : virtual public IAlgTool
virtual ~IClockReconstructionTool() = default;
// Reconstruct all peaks in a raw waveform
- virtual StatusCode reconstruct(const ScintWaveform& wave,
+ virtual StatusCode reconstruct(const RawWaveform& wave,
xAOD::WaveformClock* clockdata) const = 0;
};
diff --git a/Scintillator/ScintRecTools/ScintRecTools/IWaveformReconstructionTool.h b/Waveform/WaveRecTools/WaveRecTools/IWaveformReconstructionTool.h
similarity index 81%
rename from Scintillator/ScintRecTools/ScintRecTools/IWaveformReconstructionTool.h
rename to Waveform/WaveRecTools/WaveRecTools/IWaveformReconstructionTool.h
index 00218de1cf251e239be6cd5e066e02721154be61..e985cb1d66b81e0bddbee05e682798fdb0f61be8 100644
--- a/Scintillator/ScintRecTools/ScintRecTools/IWaveformReconstructionTool.h
+++ b/Waveform/WaveRecTools/WaveRecTools/IWaveformReconstructionTool.h
@@ -9,8 +9,8 @@
*/
-#ifndef SCINTRECTOOLS_IWAVEFORMRECONSTRUCTIONTOOL_H
-#define SCINTRECTOOLS_IWAVEFORMRECONSTRUCTIONTOOL_H
+#ifndef WAVERECTOOLS_IWAVEFORMRECONSTRUCTIONTOOL_H
+#define WAVERECTOOLS_IWAVEFORMRECONSTRUCTIONTOOL_H
// Base class
#include "GaudiKernel/IAlgTool.h"
@@ -19,7 +19,7 @@
#include "xAODFaserWaveform/WaveformHitContainer.h"
#include "xAODFaserWaveform/WaveformClock.h"
-class ScintWaveform;
+class RawWaveform;
///Interface for Waveform reco algorithms
class IWaveformReconstructionTool : virtual public IAlgTool
@@ -32,7 +32,7 @@ class IWaveformReconstructionTool : virtual public IAlgTool
virtual ~IWaveformReconstructionTool() = default;
// Reconstruct all peaks in a raw waveform
- virtual StatusCode reconstruct(const ScintWaveform& wave,
+ virtual StatusCode reconstruct(const RawWaveform& wave,
const xAOD::WaveformClock* clock,
xAOD::WaveformHitContainer* container) const = 0;
diff --git a/Scintillator/ScintRecTools/src/ClockReconstructionTool.cxx b/Waveform/WaveRecTools/src/ClockReconstructionTool.cxx
similarity index 97%
rename from Scintillator/ScintRecTools/src/ClockReconstructionTool.cxx
rename to Waveform/WaveRecTools/src/ClockReconstructionTool.cxx
index c4d1bf68f99a32d9e940c38de62bae9986e7464e..aaae0861b6fab59b7144afedb72797ad9da91f86 100644
--- a/Scintillator/ScintRecTools/src/ClockReconstructionTool.cxx
+++ b/Waveform/WaveRecTools/src/ClockReconstructionTool.cxx
@@ -30,7 +30,7 @@ ClockReconstructionTool::initialize() {
// Reconstruction step
StatusCode
-ClockReconstructionTool::reconstruct(const ScintWaveform& raw_wave,
+ClockReconstructionTool::reconstruct(const RawWaveform& raw_wave,
xAOD::WaveformClock* clockdata) const {
ATH_MSG_DEBUG("Clock reconstruct called ");
@@ -150,7 +150,7 @@ ClockReconstructionTool::reconstruct(const ScintWaveform& raw_wave,
}
void
-ClockReconstructionTool::checkResult(const ScintWaveform& raw_wave,
+ClockReconstructionTool::checkResult(const RawWaveform& raw_wave,
xAOD::WaveformClock* clockdata) const {
// Go through each element in raw_wave and make sure time in clockdata matches
diff --git a/Scintillator/ScintRecTools/src/ClockReconstructionTool.h b/Waveform/WaveRecTools/src/ClockReconstructionTool.h
similarity index 79%
rename from Scintillator/ScintRecTools/src/ClockReconstructionTool.h
rename to Waveform/WaveRecTools/src/ClockReconstructionTool.h
index 056d1a4e9e52b1a7ee6963a45b45c5872a46db99..ea7ec2ec7e2a28e49d587f9a7f072678ee4bdbc5 100644
--- a/Scintillator/ScintRecTools/src/ClockReconstructionTool.h
+++ b/Waveform/WaveRecTools/src/ClockReconstructionTool.h
@@ -6,14 +6,14 @@
* Header file for ClockReconstructionTool.h
*
*/
-#ifndef SCINTRECTOOLS_CLOCKRECONSTRUCTIONTOOL_H
-#define SCINTRECTOOLS_CLOCKRECONSTRUCTIONTOOL_H
+#ifndef WAVERECTOOLS_CLOCKRECONSTRUCTIONTOOL_H
+#define WAVERECTOOLS_CLOCKRECONSTRUCTIONTOOL_H
//Athena
#include "AthenaBaseComps/AthAlgTool.h"
-#include "ScintRecTools/IClockReconstructionTool.h"
+#include "WaveRecTools/IClockReconstructionTool.h"
-#include "ScintRawEvent/ScintWaveform.h"
+#include "WaveRawEvent/RawWaveform.h"
#include "xAODFaserWaveform/WaveformClock.h"
//Gaudi
@@ -34,7 +34,7 @@ class ClockReconstructionTool: public extends<AthAlgTool, IClockReconstructionTo
StatusCode initialize();
/// Reconstruct hits from clock
- virtual StatusCode reconstruct(const ScintWaveform& wave,
+ virtual StatusCode reconstruct(const RawWaveform& wave,
xAOD::WaveformClock* clockdata) const;
private:
@@ -48,7 +48,7 @@ class ClockReconstructionTool: public extends<AthAlgTool, IClockReconstructionTo
/// Check reconstructed clock against waveform
BooleanProperty m_checkResult{this, "CheckResult", false};
- void checkResult(const ScintWaveform& raw_wave,
+ void checkResult(const RawWaveform& raw_wave,
xAOD::WaveformClock* clockdata) const;
// Limits to print warnings
@@ -58,4 +58,4 @@ class ClockReconstructionTool: public extends<AthAlgTool, IClockReconstructionTo
};
-#endif // SCINTRECTOOLS_CLOCKRECONSTRUCTIONTOOL_H
+#endif // WAVERECTOOLS_CLOCKRECONSTRUCTIONTOOL_H
diff --git a/Scintillator/ScintRecTools/src/WaveformBaselineData.cxx b/Waveform/WaveRecTools/src/WaveformBaselineData.cxx
similarity index 100%
rename from Scintillator/ScintRecTools/src/WaveformBaselineData.cxx
rename to Waveform/WaveRecTools/src/WaveformBaselineData.cxx
diff --git a/Scintillator/ScintRecTools/src/WaveformBaselineData.h b/Waveform/WaveRecTools/src/WaveformBaselineData.h
similarity index 93%
rename from Scintillator/ScintRecTools/src/WaveformBaselineData.h
rename to Waveform/WaveRecTools/src/WaveformBaselineData.h
index 13144a4f92da45982a32a7b25053d075a2a8bb2b..218fe37af9b3401c91f7d3cf24a8feb6815db8f9 100644
--- a/Scintillator/ScintRecTools/src/WaveformBaselineData.h
+++ b/Waveform/WaveRecTools/src/WaveformBaselineData.h
@@ -10,8 +10,8 @@
///////////////////////////////////////////////////////////////////
// Version 1.0 2/21/2021 Eric Torrence
///////////////////////////////////////////////////////////////////
-#ifndef SCINTRECTOOLS_WAVEFORMBASELINEDATA_H
-#define SCINTRECTOOLS_WAVEFORMBASELINEDATA_H
+#ifndef WAVERECTOOLS_WAVEFORMBASELINEDATA_H
+#define WAVERECTOOLS_WAVEFORMBASELINEDATA_H
#include <iostream>
@@ -72,4 +72,4 @@ WaveformBaselineData::clone() const {
return new WaveformBaselineData(*this);
}
-#endif // SCINTRECTOOLS_WAVEFORMBASELINEDATA_H
+#endif // WAVERECTOOLS_WAVEFORMBASELINEDATA_H
diff --git a/Scintillator/ScintRecTools/src/WaveformFitResult.cxx b/Waveform/WaveRecTools/src/WaveformFitResult.cxx
similarity index 100%
rename from Scintillator/ScintRecTools/src/WaveformFitResult.cxx
rename to Waveform/WaveRecTools/src/WaveformFitResult.cxx
diff --git a/Scintillator/ScintRecTools/src/WaveformFitResult.h b/Waveform/WaveRecTools/src/WaveformFitResult.h
similarity index 93%
rename from Scintillator/ScintRecTools/src/WaveformFitResult.h
rename to Waveform/WaveRecTools/src/WaveformFitResult.h
index 92ecf0fc6e69d1b481ffdbc84b0959be2049fd6a..8b33e6378cbae072ad7774d7130cf862b423337e 100644
--- a/Scintillator/ScintRecTools/src/WaveformFitResult.h
+++ b/Waveform/WaveRecTools/src/WaveformFitResult.h
@@ -10,8 +10,8 @@
///////////////////////////////////////////////////////////////////
// Version 1.0 2/21/2021 Eric Torrence
///////////////////////////////////////////////////////////////////
-#ifndef SCINTRECTOOLS_WAVEFORMFITRESULT_H
-#define SCINTRECTOOLS_WAVEFORMFITRESULT_H
+#ifndef WAVERECTOOLS_WAVEFORMFITRESULT_H
+#define WAVERECTOOLS_WAVEFORMFITRESULT_H
#include <iostream>
@@ -70,4 +70,4 @@ std::ostream
// Inline methods:
///////////////////////////////////////////////////////////////////
-#endif // SCINTRECTOOLS_WAVEFORMFITRESULT_H
+#endif // WAVERECTOOLS_WAVEFORMFITRESULT_H
diff --git a/Scintillator/ScintRecTools/src/WaveformReconstructionTool.cxx b/Waveform/WaveRecTools/src/WaveformReconstructionTool.cxx
similarity index 98%
rename from Scintillator/ScintRecTools/src/WaveformReconstructionTool.cxx
rename to Waveform/WaveRecTools/src/WaveformReconstructionTool.cxx
index e774f918de2e836faee2fa583258fcfbda1f0da2..934f20803d18a1786ace8dedf18062203db8ba56 100644
--- a/Scintillator/ScintRecTools/src/WaveformReconstructionTool.cxx
+++ b/Waveform/WaveRecTools/src/WaveformReconstructionTool.cxx
@@ -43,7 +43,7 @@ WaveformReconstructionTool::initialize() {
// Reconstruction step
StatusCode
-WaveformReconstructionTool::reconstruct(const ScintWaveform& raw_wave,
+WaveformReconstructionTool::reconstruct(const RawWaveform& raw_wave,
const xAOD::WaveformClock* clock,
xAOD::WaveformHitContainer* container) const {
@@ -291,7 +291,7 @@ WaveformReconstructionTool::findOverflow(const WaveformBaselineData& base,
}
WaveformBaselineData&
-WaveformReconstructionTool::findSimpleBaseline(const ScintWaveform& raw_wave) const {
+WaveformReconstructionTool::findSimpleBaseline(const RawWaveform& raw_wave) const {
ATH_MSG_DEBUG( "findSimpleBaseline called" );
//ATH_MSG_DEBUG( raw_wave );
@@ -332,7 +332,7 @@ WaveformReconstructionTool::findSimpleBaseline(const ScintWaveform& raw_wave) co
}
WaveformBaselineData&
-WaveformReconstructionTool::findAdvancedBaseline(const ScintWaveform& raw_wave) const {
+WaveformReconstructionTool::findAdvancedBaseline(const RawWaveform& raw_wave) const {
ATH_MSG_DEBUG( "findAdvancedBaseline called" );
diff --git a/Scintillator/ScintRecTools/src/WaveformReconstructionTool.h b/Waveform/WaveRecTools/src/WaveformReconstructionTool.h
similarity index 88%
rename from Scintillator/ScintRecTools/src/WaveformReconstructionTool.h
rename to Waveform/WaveRecTools/src/WaveformReconstructionTool.h
index e8b2abf937c0b2934b6521b0786d0832240ffad3..1bb0f20d4d2901468fa9982fd7bbed26c9c2d73b 100644
--- a/Scintillator/ScintRecTools/src/WaveformReconstructionTool.h
+++ b/Waveform/WaveRecTools/src/WaveformReconstructionTool.h
@@ -6,14 +6,14 @@
* Header file for WaveformReconstructionTool.h
*
*/
-#ifndef SCINTRECTOOLS_WAVEFORMRECONSTRUCTIONTOOL_H
-#define SCINTRECTOOLS_WAVEFORMRECONSTRUCTIONTOOL_H
+#ifndef WAVERECTOOLS_WAVEFORMRECONSTRUCTIONTOOL_H
+#define WAVERECTOOLS_WAVEFORMRECONSTRUCTIONTOOL_H
//Athena
#include "AthenaBaseComps/AthAlgTool.h"
-#include "ScintRecTools/IWaveformReconstructionTool.h"
+#include "WaveRecTools/IWaveformReconstructionTool.h"
-#include "ScintRawEvent/ScintWaveform.h"
+#include "WaveRawEvent/RawWaveform.h"
#include "WaveformBaselineData.h"
#include "WaveformFitResult.h"
@@ -37,7 +37,7 @@ class WaveformReconstructionTool: public extends<AthAlgTool, IWaveformReconstruc
/// Reconstruct hits from waveform
- virtual StatusCode reconstruct(const ScintWaveform& wave,
+ virtual StatusCode reconstruct(const RawWaveform& wave,
const xAOD::WaveformClock* clock,
xAOD::WaveformHitContainer* container) const;
@@ -83,8 +83,8 @@ class WaveformReconstructionTool: public extends<AthAlgTool, IWaveformReconstruc
FloatProperty m_timingPeakFraction{this, "TimingPeakFraction", 0.45};
// Baseline algorithms
- WaveformBaselineData& findSimpleBaseline(const ScintWaveform& wave) const;
- WaveformBaselineData& findAdvancedBaseline(const ScintWaveform& wave) const;
+ WaveformBaselineData& findSimpleBaseline(const RawWaveform& wave) const;
+ WaveformBaselineData& findAdvancedBaseline(const RawWaveform& wave) const;
// Find peak in wave, return windowed region in windowed_time and windowed_wave
// Windowed region is removed from original vectors
@@ -114,4 +114,4 @@ class WaveformReconstructionTool: public extends<AthAlgTool, IWaveformReconstruc
};
-#endif // SCINTRECTOOLS_WAVEFORMRECONSTRUCTIONTOOL_H
+#endif // WAVERECTOOLS_WAVEFORMRECONSTRUCTIONTOOL_H
diff --git a/Scintillator/ScintRecTools/src/components/ScintRecTools_entries.cxx b/Waveform/WaveRecTools/src/components/WaveRecTools_entries.cxx
similarity index 100%
rename from Scintillator/ScintRecTools/src/components/ScintRecTools_entries.cxx
rename to Waveform/WaveRecTools/src/components/WaveRecTools_entries.cxx
diff --git a/graphics/VTI12/VTI12Systems/VTI12WaveformSystems/CMakeLists.txt b/graphics/VTI12/VTI12Systems/VTI12WaveformSystems/CMakeLists.txt
index dacc9d7703d3b1fdf61aa50a4f020bf40a3ffe2e..aadf22c61fbe3a4e823241d06a5f537dee4f857f 100644
--- a/graphics/VTI12/VTI12Systems/VTI12WaveformSystems/CMakeLists.txt
+++ b/graphics/VTI12/VTI12Systems/VTI12WaveformSystems/CMakeLists.txt
@@ -18,7 +18,7 @@ set( CMAKE_AUTOMOC TRUE )
atlas_add_library( VTI12WaveformSystems VTI12WaveformSystems/*.h src/*.cxx
PUBLIC_HEADERS VTI12WaveformSystems
INCLUDE_DIRS ${COIN3D_INCLUDE_DIRS} ${QT5_INCLUDE_DIRS}
- LINK_LIBRARIES ${COIN3D_LIBRARIES} GeoPrimitives VP1Base VTI12Utils ScintRawEvent xAODFaserWaveform
+ LINK_LIBRARIES ${COIN3D_LIBRARIES} GeoPrimitives VP1Base VTI12Utils WaveRawEvent xAODFaserWaveform
Qt5::Core Qt5::Gui Qt5::Charts
PRIVATE_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}
PRIVATE_LINK_LIBRARIES GaudiKernel VP1HEPVis )
diff --git a/graphics/VTI12/VTI12Systems/VTI12WaveformSystems/src/VP1WaveformSystem.cxx b/graphics/VTI12/VTI12Systems/VTI12WaveformSystems/src/VP1WaveformSystem.cxx
index 5551a33cf4b50233704cc0b7d46e65a45047f399..ffe6bd00acecfd6f3fe611c01b24a1f2ea6afd1a 100644
--- a/graphics/VTI12/VTI12Systems/VTI12WaveformSystems/src/VP1WaveformSystem.cxx
+++ b/graphics/VTI12/VTI12Systems/VTI12WaveformSystems/src/VP1WaveformSystem.cxx
@@ -23,7 +23,7 @@
#include "StoreGate/StoreGateSvc.h"
-#include "ScintRawEvent/ScintWaveformContainer.h"
+#include "WaveRawEvent/RawWaveformContainer.h"
#include <Inventor/nodes/SoSeparator.h>
#include <Inventor/nodes/SoPickStyle.h>
@@ -120,12 +120,12 @@ void VP1WaveformSystem::Imp::createCharts(StoreGateSvc* sg,
std::vector<QChart*>& list,
const std::string& collectionName)
{
- typedef DataVector<ScintWaveform>::const_iterator ScintWaveformConstIterator;
+ typedef DataVector<RawWaveform>::const_iterator RawWaveformConstIterator;
- const ScintWaveformContainer* p_container {nullptr};
+ const RawWaveformContainer* p_container {nullptr};
if(sg->retrieve(p_container, collectionName)==StatusCode::SUCCESS)
{
- for(ScintWaveformConstIterator i_wf=p_container->begin(); i_wf!=p_container->end(); ++i_wf)
+ for(RawWaveformConstIterator i_wf=p_container->begin(); i_wf!=p_container->end(); ++i_wf)
{
if ((*i_wf)->n_samples() > 0)
{