From 1ec6a11a4f6f098c577015a93c7ea90f558b7453 Mon Sep 17 00:00:00 2001
From: Eric Torrence <eric.torrence@cern.ch>
Date: Sun, 15 Aug 2021 10:24:27 -0700
Subject: [PATCH] Update downstream packages for Waveform move
---
.../WaveformDataAccessExample/CMakeLists.txt | 2 +-
.../python/WaveformDataAccessExampleConfig.py | 4 +--
...veformAccess.cxx => RawWaveformAccess.cxx} | 33 +++++++++----------
...ntWaveformAccess.h => RawWaveformAccess.h} | 28 ++++++++--------
.../components/WaveformDataAccess_entries.cxx | 4 +--
.../VTI12WaveformSystems/CMakeLists.txt | 2 +-
.../src/VP1WaveformSystem.cxx | 8 ++---
7 files changed, 40 insertions(+), 41 deletions(-)
rename Control/CalypsoExample/WaveformDataAccessExample/src/{ScintWaveformAccess.cxx => RawWaveformAccess.cxx} (54%)
rename Control/CalypsoExample/WaveformDataAccessExample/src/{ScintWaveformAccess.h => RawWaveformAccess.h} (58%)
diff --git a/Control/CalypsoExample/WaveformDataAccessExample/CMakeLists.txt b/Control/CalypsoExample/WaveformDataAccessExample/CMakeLists.txt
index 69bfbf2e..703ced09 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 5d0cfcde..1151c74d 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 d3de51d5..0d06d587 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 ac73b688..d26b1eac 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 41c3b845..4cf977bf 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/graphics/VTI12/VTI12Systems/VTI12WaveformSystems/CMakeLists.txt b/graphics/VTI12/VTI12Systems/VTI12WaveformSystems/CMakeLists.txt
index dacc9d77..aadf22c6 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 5551a33c..ffe6bd00 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)
{
--
GitLab