diff --git a/Control/CalypsoExample/GeoModelTest/python/TestBeamTestConfig.py b/Control/CalypsoExample/GeoModelTest/python/TestBeamTestConfig.py index f843b34d92ea2955d398f45fb67a40a6defd2f27..641c9a7558a39389d33e2c6f220b951af096f7dc 100644 --- a/Control/CalypsoExample/GeoModelTest/python/TestBeamTestConfig.py +++ b/Control/CalypsoExample/GeoModelTest/python/TestBeamTestConfig.py @@ -14,6 +14,10 @@ def GeoModelTestCfg(flags, name="GeoModelTestAlg", **kwargs): # Initialize field service from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg a.merge(MagneticFieldSvcCfg(flags)) + # Disable the field + cacheAlg = a.getCondAlgo("FaserFieldCacheCondAlg") + cacheAlg.UseDipoScale = 0.0 + cacheAlg.UseDCS = False # Configure the algorithm itself GeoModelTestAlg = CompFactory.GeoModelTestAlg diff --git a/Control/CalypsoExample/WaveformAnalysisExample/CMakeLists.txt b/Control/CalypsoExample/WaveformAnalysisExample/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..3c40f4c6ca6b4b34a6d25464a6aa05156bd9411c --- /dev/null +++ b/Control/CalypsoExample/WaveformAnalysisExample/CMakeLists.txt @@ -0,0 +1,8 @@ +atlas_subdir( WaveformAnalysisExample ) + +atlas_add_component( WaveformAnalysisExample + src/*.cxx + src/components/WaveformAnalysisExample_entries.cxx + LINK_LIBRARIES AthenaBaseComps xAODFaserWaveform + ) + diff --git a/Control/CalypsoExample/WaveformAnalysisExample/src/WaveformHitAlg.cxx b/Control/CalypsoExample/WaveformAnalysisExample/src/WaveformHitAlg.cxx new file mode 100644 index 0000000000000000000000000000000000000000..1e6a1a68fc3935e4c7374007eca47902d4f44d1f --- /dev/null +++ b/Control/CalypsoExample/WaveformAnalysisExample/src/WaveformHitAlg.cxx @@ -0,0 +1,26 @@ +#include "WaveformHitAlg.h" + +WaveformHitAlg::WaveformHitAlg(const std::string& name, ISvcLocator* pSvcLocator) + : AthHistogramAlgorithm(name, pSvcLocator) { } + +WaveformHitAlg::~WaveformHitAlg() { } + +StatusCode WaveformHitAlg::initialize() +{ + //ATH_CHECK( m_faserWaveformHitKey.initialize() ); + //ATH_MSG_INFO( "Using Faser WaveformHit collection with key " << m_faserWaveformHitKey.key()); + + return StatusCode::SUCCESS; +} + + +StatusCode WaveformHitAlg::execute() +{ + return StatusCode::SUCCESS; +} + + +StatusCode WaveformHitAlg::finalize() +{ + return StatusCode::SUCCESS; +} diff --git a/Control/CalypsoExample/WaveformAnalysisExample/src/WaveformHitAlg.h b/Control/CalypsoExample/WaveformAnalysisExample/src/WaveformHitAlg.h new file mode 100644 index 0000000000000000000000000000000000000000..6aa6798c1c32e14e8da9870ebe6a410725f9246f --- /dev/null +++ b/Control/CalypsoExample/WaveformAnalysisExample/src/WaveformHitAlg.h @@ -0,0 +1,28 @@ +#ifndef WAVEFORMANALYSISEXAMPLE_WAVEFORMHITALG_H +#define WAVEFORMANALYSISEXAMPLE_WAVEFORMHITALG_H + +#include "AthenaBaseComps/AthHistogramAlgorithm.h" +#include "xAODFaserWaveform/WaveformHitContainer.h" + +#include <TH1.h> + +/* WaveformHit reading example - Carl Gwilliam + Lottie Cavanagh, Liverpool */ + +class WaveformHitAlg : public AthHistogramAlgorithm +{ +public: + WaveformHitAlg(const std::string& name, ISvcLocator* pSvcLocator); + + virtual ~WaveformHitAlg(); + + StatusCode initialize(); + StatusCode execute(); + StatusCode finalize(); + +private: + + SG::ReadHandle<xAOD::WaveformHitContainer> m_waveformHits; + //SG::ReadHandleKey<xAOD::WaveformHitContainer> m_faserWaveformHitKey { this, "WaveformHitContainerKey", "CaloWaveformHits" }; +}; + +#endif diff --git a/Control/CalypsoExample/WaveformAnalysisExample/src/components/WaveformAnalysisExample_entries.cxx b/Control/CalypsoExample/WaveformAnalysisExample/src/components/WaveformAnalysisExample_entries.cxx new file mode 100644 index 0000000000000000000000000000000000000000..370b5668e5824c05cb3cd7fb227e6350f543be51 --- /dev/null +++ b/Control/CalypsoExample/WaveformAnalysisExample/src/components/WaveformAnalysisExample_entries.cxx @@ -0,0 +1,3 @@ +#include "../WaveformHitAlg.h" + +DECLARE_COMPONENT( WaveformHitAlg ) diff --git a/Simulation/G4Faser/G4FaserAlg/test/runG4TestBeam.py b/Simulation/G4Faser/G4FaserAlg/test/runG4TestBeam.py index acaec37814e68fe6bcdd1dbbcbb38eb4dc75a330..667e76055b99f8db17f3d3c05ad90000c7955790 100755 --- a/Simulation/G4Faser/G4FaserAlg/test/runG4TestBeam.py +++ b/Simulation/G4Faser/G4FaserAlg/test/runG4TestBeam.py @@ -112,6 +112,10 @@ if __name__ == "__main__": # acc.merge(FaserGeometryCfg(ConfigFlags)) acc.merge(G4FaserAlgCfg(ConfigFlags)) + # Disable magnetic field + cacheAlg = acc.getCondAlgo("FaserFieldCacheCondAlg") + cacheAlg.UseDipoScale = 0.0 + cacheAlg.UseDCS = False acc.addService(G4GeometryNotifierSvcCfg(ConfigFlags, ActivateLVNotifier=True)) # # Verbosity