.gitlab-ci.yml

-variables:
-  # all submodules will be cloned recursively upon start of CI job
-  GIT_SUBMODULE_STRATEGY: recursive
-  GIT_SSL_NO_VERIFY: "true"
-  ATLAS_LOCAL_ROOT_BASE: /cvmfs/atlas.cern.ch/repo/ATLASLocalRootBase
-
-stages:
-  - build
-  - test
-
-##########################
-# BUILD stage            #                                
-##########################
-
-build_image:
-  # description: triggers a build of the project as a Docker image,
-  #              each branch will have an individual Docker image that will be used
-  #              in the following stages of the pipeline for testing the code
-  stage: build
-  tags:
-    - cvmfs
-    - docker
-  script:
-    - yum -y install redhat-lsb redhat-lsb-core man uuid-devel libuuid libuuid-devel mesa-libGL-devel libXpm-devel
-    - mkdir build
-    - cd build
-    - set +e && source ${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh; set -e
-    - set +e && asetup --input=../../calypso/asetup.faser Athena,22.0.49; set -e
-    - cmake ../../calypso
-    - make -j 3
-  artifacts:
-    paths:
-    - build/
-
-test_unittest:
-  stage: test
-  tags:
-    - cvmfs
-    - docker
-  script: 
-    - yum -y install man
-    - cd build
-    - set +e && source ${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh; set -e
-    - set +e && asetup --input=../../calypso/asetup.faser Athena,22.0.49; set -e 
-    - set +e && source `find . -name 'setup.sh'`; set -e
-    - ctest -j3
-  dependencies:
-    - build_image
+variables:
+  # all submodules will be cloned recursively upon start of CI job
+  GIT_SUBMODULE_STRATEGY: recursive
+  GIT_SSL_NO_VERIFY: "true"
+  ATLAS_LOCAL_ROOT_BASE: /cvmfs/atlas.cern.ch/repo/ATLASLocalRootBase
+
+stages:
+  - build
+  - test
+
+##########################
+# BUILD stage            #                                
+##########################
+
+build_image:
+  # description: triggers a build of the project as a Docker image,
+  #              each branch will have an individual Docker image that will be used
+  #              in the following stages of the pipeline for testing the code
+  image:
+    name: gitlab-registry.cern.ch/linuxsupport/alma9-base:latest
+  stage: build
+  tags:
+    - k8s-cvmfs
+  script:
+    - mkdir build
+    # See if we can run this as the payload to a container
+    - set +e && export ALRB_CONT_RUNPAYLOAD="asetup --input=asetup.faser Athena,24.0.41; cd build; cmake ..; make -j 3" && set -e
+    - echo $ALRB_CONT_RUNPAYLOAD
+    - set +e && source ${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh -c alma9 && set -e
+  artifacts:
+    paths:
+    - build/
+
+test_unittest:
+  image:
+    name: gitlab-registry.cern.ch/linuxsupport/alma9-base:latest
+  stage: test
+  tags:
+    - k8s-cvmfs
+  script:
+    - set +e && export ALRB_CONT_RUNPAYLOAD="asetup --input=asetup.faser Athena,24.0.41; source `find . -name 'setup.sh'`; cd build; ctest -j3 --output-on-failure" && set -e
+    - echo $ALRB_CONT_RUNPAYLOAD
+    - set +e && source ${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh -c alma9 && set -e
+  dependencies:
+    - build_image
+  artifacts:
+    paths:
+      - LastTest.log

CMakeLists.txt

@@ -12,6 +12,7 @@ set( ATLAS_PROJECT Athena
 find_package( Athena )
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(ATLAS_GEANT4_USE_LTO OFF)
 
 atlas_ctest_setup()
 

Calorimeter/CaloDetDescr/CaloGeoModelUtils/CaloGeoModelUtils/CaloDDAthenaComps.h

@@ -6,7 +6,7 @@
 #define CaloGeoModelUtils_CaloDDAthenaComps_H
 
 // Message Stream Member
-#include "AthenaKernel/MsgStreamMember.h"
+#include "AthenaBaseComps/AthMessaging.h"
 class  StoreGateSvc;
 class  IGeoDbTagSvc;
 class  IRDBAccessSvc;
@@ -16,18 +16,12 @@ class  IGeometryDBSvc;
 namespace CaloDD {
 
 /// Class to hold various Athena components.
-class AthenaComps {
+class AthenaComps : public AthMessaging {
 
 public:
 
   AthenaComps(const std::string & msgStreamName);
 
-  //Declaring the Message method for further use
-  MsgStream& msg (MSG::Level lvl) const { return m_msg << lvl; }
-
-  //Declaring the Method providing Verbosity Level
-  bool msgLvl (MSG::Level lvl) const { return m_msg.get().level() <= lvl; }
-
   void setDetStore(StoreGateSvc *);
   void setGeoDbTagSvc(IGeoDbTagSvc *);
   void setRDBAccessSvc(IRDBAccessSvc *);
@@ -39,9 +33,6 @@ public:
   IGeometryDBSvc * geomDB() const;
   
 private:
-  //Declaring private message stream member.
-  mutable Athena::MsgStreamMember m_msg;
-  
   StoreGateSvc * m_detStore;
   IGeoDbTagSvc * m_geoDbTagSvc;
   IRDBAccessSvc * m_rdbAccessSvc;

Calorimeter/CaloDetDescr/CaloGeoModelUtils/CaloGeoModelUtils/CaloMaterialManager.h

@@ -6,7 +6,7 @@
 #define CALOMATERIALMANAGER_H
 
 // Message Stream Member
-#include "AthenaKernel/MsgStreamMember.h"
+#include "AthenaBaseComps/AthMessaging.h"
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 
 class GeoMaterial;
@@ -30,7 +30,7 @@ namespace CaloDD
 /// materials with a density such that the the total weight is correct.
 
 
-class CaloMaterialManager 
+class CaloMaterialManager : public AthMessaging
 {
 
 public:
@@ -60,7 +60,7 @@ public:
   const GeoMaterial* getMaterial(const std::string & materialName);
 
   /// Get element from GeoModel material manager
-  const GeoElement* getElement(const std::string & elementName) const;
+  const GeoElement* getElement(const std::string & elementName);
 
   /// Create and get material with a specified density based on an existing material.
   /// If a newName is supplied it creates the new material even if the orginal material
@@ -129,13 +129,6 @@ public:
   /// Add material
   void addMaterial(GeoMaterial *material);
 
-  //Declaring the Message method for further use
-  MsgStream& msg (MSG::Level lvl) const { return m_msg << lvl; }
-
-  //Declaring the Method providing Verbosity Level
-  bool msgLvl (MSG::Level lvl){ return m_msg.get().level() <= lvl; }
-
-
 private:
 
   class MaterialByWeight  {
@@ -190,7 +183,7 @@ private:
   void addWeightTableOld(IRDBRecordset_ptr weightTable, const std::string & space);
 
   // Internal versions. The public versions allow materials to be have extra scaling.
-  const GeoMaterial* getMaterialInternal(const std::string & materialName) const;
+  const GeoMaterial* getMaterialInternal(const std::string & materialName);
   const GeoMaterial* getMaterialInternal(const std::string & origMaterialName, 
 					 double density, 
 					 const std::string & newName = "");
@@ -230,9 +223,6 @@ private:
   typedef std::map<std::string, double > ExtraScaleFactorMap;
   ExtraScaleFactorMap m_scalingMap;
 
-  //Declaring private message stream member.
-  mutable Athena::MsgStreamMember m_msg;
-
   // Has linear weight flag. 
   bool m_extraFunctionality;
 

Calorimeter/CaloDetDescr/CaloGeoModelUtils/CaloGeoModelUtils/DetectorFactoryBase.h

@@ -5,7 +5,6 @@
 #ifndef CaloGeoModelUtils_DetectorFactoryBase_H
 #define CaloGeoModelUtils_DetectorFactoryBase_H
 
-#include "AthenaKernel/MsgStreamMember.h"
 #include "GeoModelKernel/GeoVDetectorFactory.h" 
 #include "CaloGeoModelUtils/CaloDDAthenaComps.h"
 
@@ -15,7 +14,7 @@ class IRDBAccessSvc;
 
 namespace CaloDD {
 
-class DetectorFactoryBase : public GeoVDetectorFactory  
+class DetectorFactoryBase : public GeoVDetectorFactory
 { 
 
 public:
@@ -35,7 +34,7 @@ public:
   MsgStream& msg (MSG::Level lvl) const { return m_athenaComps->msg(lvl); }
 
   //Declaring the Method providing Verbosity Level
-  bool msgLvl (MSG::Level lvl) const { return m_athenaComps->msgLvl(lvl); }
+  bool msgLvl (MSG::Level lvl) { return m_athenaComps->msgLvl(lvl); }
 
   const CaloDD::AthenaComps *  getAthenaComps() {return m_athenaComps;}
 

Calorimeter/CaloDetDescr/CaloGeoModelUtils/src/CaloDDAthenaComps.cxx

@@ -6,7 +6,7 @@
 
 namespace CaloDD {
   AthenaComps::AthenaComps(const std::string& msgStreamName)
-    : m_msg(msgStreamName),
+    : AthMessaging(msgStreamName),
     m_detStore(0),
     m_geoDbTagSvc(0),
     m_rdbAccessSvc(0),

Calorimeter/CaloDetDescr/CaloGeoModelUtils/src/DistortedMaterialManager.cxx

@@ -6,17 +6,17 @@
 #include "CaloGeoModelUtils/DistortedMaterialManager.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
 #include "GeoModelFaserUtilities/DecodeFaserVersionKey.h"
-#include "AthenaKernel/MsgStreamMember.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 #include "GaudiKernel/ISvcLocator.h"
+#include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
 
 namespace CaloDD {
   DistortedMaterialManager::DistortedMaterialManager() {
     ISvcLocator* svcLocator = Gaudi::svcLocator(); // from Bootstrap
 
-    Athena::MsgStreamMember log("ExtraMaterialManager");
+    MsgStream log(Athena::getMessageSvc(), "ExtraMaterialManager");
     log << MSG::DEBUG << "Initialized Calo Distorted Material Manager" << endmsg;
 
     StoreGateSvc* detStore;

Calorimeter/CaloDetDescr/CaloIdDictFiles/data/IdDictCalorimeter.xml

@@ -21,6 +21,6 @@
     <range field="part"       value="Ecal" />
     <range field="row"        values="Bottom Top" wraparound="FALSE" />
     <range field="module"     values="Starboard Port" wraparound="FALSE" />
-    <range field="pmt"        minvalue="0" maxvalue="0" />
+    <range field="pmt"        minvalue="0" maxvalue="1" />
   </region>
-</IdDictionary>
+</IdDictionary>
\ No newline at end of file

Calorimeter/CaloDetDescr/CaloReadoutGeometry/CaloReadoutGeometry/CaloCommonItems.h

@@ -14,7 +14,7 @@
 class FaserDetectorID;
 
 // Message Stream Member
-#include "AthenaKernel/MsgStreamMember.h"
+#include "AthenaBaseComps/AthMessaging.h"
 #include "CxxUtils/checker_macros.h"
 // #include "InDetCondTools/ISiLorentzAngleTool.h"
 #include "GeoPrimitives/GeoPrimitives.h"
@@ -26,9 +26,6 @@ class FaserDetectorID;
 
 #include <mutex>
 
-// mutable Athena::MsgStreamMember issues warnings.
-ATLAS_NO_CHECK_FILE_THREAD_SAFETY;
-
 namespace CaloDD {
 
     /** @class CaloCommonItems
@@ -42,7 +39,7 @@ namespace CaloDD {
         modified: Dave Casper
         */
 
-    class CaloCommonItems: public RCBase 
+    class CaloCommonItems: public RCBase, public AthMessaging
     {
     
         public:
@@ -52,18 +49,9 @@ namespace CaloDD {
           const FaserDetectorID* getIdHelper() const;
         //   const HepGeom::Transform3D & solenoidFrame() const;
         //   void setSolenoidFrame(const HepGeom::Transform3D & transform) const; 
-
-          //Declaring the Message method for further use
-          MsgStream& msg (MSG::Level lvl) const { return m_msg.get() << lvl; }
-        
-          //Declaring the Method providing Verbosity Level
-          bool msgLvl (MSG::Level lvl) const { return m_msg.get().level() <= lvl; }
-        
+   
         private:
-        
-          //Declaring private message stream member.
-          mutable Athena::MsgStreamMember m_msg;
-          
+                 
           const FaserDetectorID* m_idHelper; 
         //   mutable HepGeom::Transform3D m_solenoidFrame ATLAS_THREAD_SAFE; // Guarded by m_mutex
 

Calorimeter/CaloDetDescr/CaloReadoutGeometry/CaloReadoutGeometry/CaloDetectorManagerBase.h

@@ -19,7 +19,7 @@
 #include "CaloReadoutGeometry/Version.h"
 #include "CLHEP/Geometry/Transform3D.h"
 // Message Stream Member
-#include "AthenaKernel/MsgStreamMember.h"
+#include "AthenaBaseComps/AthMessaging.h"
 
 // IOV SVC for alignment:
 #include "AthenaKernel/IIOVSvc.h"
@@ -41,9 +41,6 @@ class FaserDetectorID;
 class GeoVAlignmentStore;
 class CondAttrListCollection;
 
-// mutable Athena::MsgStreamMember issues warnings.
-ATLAS_NO_CHECK_FILE_THREAD_SAFETY;
-
 namespace CaloDD {
 
   typedef std::map<std::string, const void*> RawAlignmentObjects;
@@ -63,7 +60,7 @@ namespace CaloDD {
         @author: Grant Gorfine
         - modified & maintained: Nick Styles & Andreas Salzburger 
     */
-    class CaloDetectorManagerBase : public GeoVDetectorManager  {
+    class CaloDetectorManagerBase : public GeoVDetectorManager, public AthMessaging  {
     
     public:
     
@@ -99,12 +96,6 @@ namespace CaloDD {
       /** Check identifier is for this detector */
       virtual bool identifierBelongs(const Identifier & id) const = 0;
     
-      /** Declaring the Message method for further use */
-      MsgStream& msg (MSG::Level lvl) const { return m_msg.get() << lvl; }
-
-      /** Declaring the Method providing Verbosity Level */
-      bool msgLvl (MSG::Level lvl) const { return m_msg.get().level() <= lvl; }
-
       AlignFolderType                           m_alignfoldertype;
     
     protected:
@@ -188,8 +179,6 @@ namespace CaloDD {
       virtual const FaserDetectorID* getIdHelper() const = 0;
     
       //Declaring private message stream member.
-      mutable Athena::MsgStreamMember           m_msg;
-      
       Version                                   m_version;
       std::map<std::string, LevelInfo>          m_keys;
       std::set<std::string>                     m_folders;

Calorimeter/CaloDetDescr/CaloReadoutGeometry/src/CaloCommonItems.cxx

@@ -7,7 +7,7 @@
 namespace CaloDD {
 
 CaloCommonItems::CaloCommonItems(const FaserDetectorID* const idHelper)
-  :  m_msg("CaloDetectorElement"),
+  :  AthMessaging("CaloDetectorElement"),
      m_idHelper(idHelper), 
      m_mutex{}
 {}

Calorimeter/CaloDetDescr/CaloReadoutGeometry/src/CaloDetectorManagerBase.cxx

@@ -18,8 +18,9 @@ namespace CaloDD
 {
 
     CaloDetectorManagerBase::CaloDetectorManagerBase(StoreGateSvc * detStore, const std::string & name)
-        : m_alignfoldertype{none},m_detStore(detStore), 
-        m_msg(name+"DetectorManager")
+        : AthMessaging(name+"DetectorManager")
+        , m_alignfoldertype{none}
+        , m_detStore(detStore)        
     {
         setName(name);
     }

Calorimeter/CaloDetDescr/EcalGeoModel/CMakeLists.txt

@@ -26,24 +26,36 @@ atlas_add_component( EcalGeoModel
 atlas_add_test( EcalGMConfig_test
                 SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/EcalGMConfig_test.py
                 PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-                PROPERTIES TIMEOUT 300 )
+                PROPERTIES TIMEOUT 300
+		POST_EXEC_SCRIPT noerror.sh)
 
-# Decide which ecal gdml file to use based on option
+# Decide which ecal gdml file to use based on option; tyvek density reduced in EcalTyvek04.gdml (June 2023)
 if (ECAL_GEO_TYVEK)
    add_custom_command (OUTPUT ${CMAKE_XML_OUTPUT_DIRECTORY}/EcalGeoModel/Ecal.gdml 
                        COMMAND mkdir -p ${CMAKE_XML_OUTPUT_DIRECTORY}/EcalGeoModel/
-		       COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/data/EcalTyvek.gdml ${CMAKE_XML_OUTPUT_DIRECTORY}/EcalGeoModel/Ecal.gdml )
+		                 COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/data/EcalTyvek04.gdml ${CMAKE_XML_OUTPUT_DIRECTORY}/EcalGeoModel/Ecal.gdml )
+   add_custom_command (OUTPUT ${CMAKE_XML_OUTPUT_DIRECTORY}/EcalGeoModel/Ecal04.gdml 
+                       COMMAND mkdir -p ${CMAKE_XML_OUTPUT_DIRECTORY}/EcalGeoModel/
+                       COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/data/EcalTyvek04.gdml ${CMAKE_XML_OUTPUT_DIRECTORY}/EcalGeoModel/Ecal04.gdml )
    add_custom_target (make_ecal_gdml ALL DEPENDS  ${CMAKE_XML_OUTPUT_DIRECTORY}/EcalGeoModel/Ecal.gdml)
+   add_custom_target (make_ecal_gdml04 ALL DEPENDS  ${CMAKE_XML_OUTPUT_DIRECTORY}/EcalGeoModel/Ecal04.gdml)
    get_filename_component( _realpath ${CMAKE_CURRENT_SOURCE_DIR}/data/EcalTyvek.gdml REALPATH )
+   get_filename_component( _realpath04 ${CMAKE_CURRENT_SOURCE_DIR}/data/EcalTyvek04.gdml REALPATH )
 else() 
    add_custom_command (OUTPUT ${CMAKE_XML_OUTPUT_DIRECTORY}/EcalGeoModel/Ecal.gdml 
                        COMMAND mkdir -p ${CMAKE_XML_OUTPUT_DIRECTORY}/EcalGeoModel/   
-		       COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/data/EcalNoTyvek.gdml ${CMAKE_XML_OUTPUT_DIRECTORY}/EcalGeoModel/Ecal.gdml )
+		                 COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/data/EcalNoTyvek.gdml ${CMAKE_XML_OUTPUT_DIRECTORY}/EcalGeoModel/Ecal.gdml )
+   add_custom_command (OUTPUT ${CMAKE_XML_OUTPUT_DIRECTORY}/EcalGeoModel/Ecal04.gdml 
+                       COMMAND mkdir -p ${CMAKE_XML_OUTPUT_DIRECTORY}/EcalGeoModel/   
+		                 COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/data/EcalNoTyvek.gdml ${CMAKE_XML_OUTPUT_DIRECTORY}/EcalGeoModel/Ecal04.gdml )
    add_custom_target (make_ecal_gdml ALL DEPENDS  ${CMAKE_XML_OUTPUT_DIRECTORY}/EcalGeoModel/Ecal.gdml)
+   add_custom_target (make_ecal_gdml04 ALL DEPENDS  ${CMAKE_XML_OUTPUT_DIRECTORY}/EcalGeoModel/Ecal04.gdml)
    get_filename_component( _realpath ${CMAKE_CURRENT_SOURCE_DIR}/data/EcalNoTyvek.gdml REALPATH )
+   get_filename_component( _realpath04 ${CMAKE_CURRENT_SOURCE_DIR}/data/EcalNoTyvek.gdml REALPATH )
 endif()
 
 install(FILES ${_realpath} DESTINATION ${CMAKE_INSTALL_PREFIX}/XML/EcalGeoModel RENAME Ecal.gdml)
+install(FILES ${_realpath04} DESTINATION ${CMAKE_INSTALL_PREFIX}/XML/EcalGeoModel RENAME Ecal04.gdml)
 unset( _realpath )
 
 # Install files from the package:

Calorimeter/CaloDetDescr/EcalGeoModel/src/EcalModule.cxx

@@ -39,7 +39,7 @@ EcalModule::EcalModule(const std::string & name,
 {
 
   std::string resolvedFile = PathResolver::find_file(geometryManager->options().gdmlFile(), "XMLPATH", PathResolver::RecursiveSearch);
-  XercesParser xercesParser;
+  GeoModelTools::XercesParser xercesParser;
   xercesParser.ParseFileAndNavigate(resolvedFile);
   std::cout << "done parsing " << resolvedFile << std::endl;
 

Calorimeter/CaloDetDescr/EcalGeoModel/test/EcalGMConfig_test.py

@@ -6,18 +6,19 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 if __name__ == "__main__":
     from AthenaCommon.Configurable import Configurable
     Configurable.configurableRun3Behavior=1
-    from CalypsoConfiguration.AllConfigFlags import ConfigFlags
+    from CalypsoConfiguration.AllConfigFlags import initConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 
-    ConfigFlags.Input.Files = defaultTestFiles.HITS
-    ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"             # Always needed; must match FaserVersion
-    ConfigFlags.Detector.EnableEcal = True
-    ConfigFlags.GeoModel.Align.Dynamic    = False
-    ConfigFlags.lock()
+    configFlags = initConfigFlags()
+    configFlags.Input.Files = [] # Dummy input
+    configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"     # Always needed; must match FaserVersion
+    configFlags.Detector.EnableEcal = True
+    #flags.GeoModel.Align.Dynamic    = False
+    configFlags.lock()
 
     from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
     from EcalGeoModel.EcalGeoModelConfig import EcalGeometryCfg
-    acc = EcalGeometryCfg(ConfigFlags)
+    acc = EcalGeometryCfg(configFlags)
     f=open('EcalGeometryCfg.pkl','wb')
     acc.store(f)
     f.close()

Calorimeter/CaloDetDescrCnv/CaloIdCnv/src/EcalIDDetDescrCnv.cxx

@@ -119,7 +119,7 @@ EcalIDDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
     } else {}
  
     // Get the dictionary manager from the detector store
-    const DataHandle<IdDictManager> idDictMgr;
+    const IdDictManager* idDictMgr;
     status = detStore->retrieve(idDictMgr, "IdDict");
     if (status.isFailure()) {
 	log << MSG::FATAL << "Could not get IdDictManager !" << endmsg;
@@ -208,7 +208,7 @@ EcalIDDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
     }
 
     // Pass a pointer to the container to the Persistency service by reference.
-    pObj = StoreGateSvc::asStorable(m_ecalId);
+    pObj = SG::asStorable(m_ecalId);
 
     return StatusCode::SUCCESS; 
 

Calorimeter/CaloDigiAlgs/CMakeLists.txt

@@ -11,7 +11,7 @@ atlas_add_component( CaloDigiAlgs
                      src/components/*.cxx
                      LINK_LIBRARIES AthenaBaseComps Identifier FaserCaloIdentifier  
 		     WaveformConditionsToolsLib StoreGateLib WaveRawEvent 
-		     FaserCaloSimEvent WaveDigiToolsLib)
+		     CaloReadoutGeometry FaserCaloSimEvent WaveDigiToolsLib)
 
 atlas_install_python_modules( python/*.py )
 

Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py

@@ -64,10 +64,5 @@ def CaloWaveformDigitizationOutputCfg(flags, **kwargs):
     ItemList = [
         "RawWaveformContainer#*"
     ]
-    acc.merge(OutputStreamCfg(flags, "RDO"))
-    ostream = acc.getEventAlgo("OutputStreamRDO")
-    # ostream.TakeItemsFromInput = True # Copies all data from input file to output
-    # ostream.TakeItemsFromInput = False
-    # Try turning this off
-    ostream.ItemList += ItemList
+    acc.merge(OutputStreamCfg(flags, "RDO", ItemList))
     return acc