Get reco working without ACTS

Calorimeter/CaloRecAlgs/python/CaloRecAlgsConfig.py

@@ -40,7 +40,7 @@ def CalorimeterReconstructionOutputCfg(flags, **kwargs):
         "xAOD::CalorimeterHitContainer#*"
         , "xAOD::CalorimeterHitAuxContainer#*"
     ]
-    acc.merge(OutputStreamCfg(flags, "xAOD", ItemList))
+    acc.merge(OutputStreamCfg(flags, "xAOD", ItemList, disableEventTag=True))
     # ostream = acc.getEventAlgo("OutputStreamRDO")
     # ostream.TakeItemsFromInput = True # Don't know what this does
     return acc

Control/CalypsoExample/Reconstruction/scripts/faser_reco.py

@@ -44,6 +44,8 @@ parser.add_argument("--testBeam", action='store_true',
                     help="Set geometry for 2021 test beam")
 parser.add_argument("--isOverlay", action='store_true', 
                     help="Set overlaid data input")
+parser.add_argument("--noTracking", action='store_true',
+                    help="Turn off tracking (for R24 debugging)")
 
 args = parser.parse_args()
 
@@ -130,8 +132,8 @@ useCKF = True
 useCal = False
 useLHC = False
 
-# Enable ACTS material corrections, this crashes testbeam geometries
-configFlags.TrackingGeometry.MaterialSource = "/cvmfs/faser.cern.ch/repo/sw/database/DBRelease/current/acts/material-maps.json"
+if args.noTracking:
+    useCKF = False
 
 # TI12 Cosmics geometry
 if runtype == "TI12Data":
@@ -184,6 +186,10 @@ if len(args.cond):
     configFlags.IOVDb.GlobalTag = args.cond
     print(f"Override global tag configFlags.IOVDb.GlobalTag = {args.config}") 
 
+if useCKF:
+    # Enable ACTS material corrections, this crashes testbeam geometries
+    configFlags.TrackingGeometry.MaterialSource = "/cvmfs/faser.cern.ch/repo/sw/database/DBRelease/current/acts/material-maps.json"
+
 # Must use original input string here, as pathlib mangles double // in path names
 configFlags.Input.Files = [ args.file_path ]
 
@@ -334,8 +340,9 @@ if not args.isOverlay:
     acc.merge(CalorimeterReconstructionOutputCfg(configFlags))
 
 # Check what we have
+from OutputStreamAthenaPool.OutputStreamConfig import outputStreamName
 print( "Writing out xAOD objects:" )
-print( acc.getEventAlgo("OutputStreamxAOD").ItemList )
+print( acc.getEventAlgo(outputStreamName("xAOD")).ItemList )
 
 # Hack to avoid problem with our use of MC databases when isMC = False
 if not args.isMC:

Event/FaserEventPlugins/CMakeLists.txt

@@ -3,7 +3,7 @@
 ################################################################################
 
 # Declare the package name:
-atlas_subdir( FaserEventsPlugins )
+atlas_subdir( FaserEventPlugins )
 
 # External dependencies:
 find_package( tdaq-common COMPONENTS ers EventStorage )

Event/FaserEventStorage/CMakeLists.txt

@@ -6,23 +6,15 @@
 atlas_subdir( FaserEventStorage )
 
 # External dependencies:
+# Apparently not needed...
+# find_package( FaserEventPlugins COMPONENTS fReadXRootD fReadPlain fReadDavix )
 find_package( tdaq-common COMPONENTS ers EventStorage )
 find_package( Boost COMPONENTS system )
 
 atlas_add_library( FaserEventStorageLib
-    FaserEventStorage/*.h src/*.h src/*.cxx
-    PUBLIC_HEADERS FaserEventStorage
-    INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
-    LINK_LIBRARIES ${CMAKE_DL_LIBS} ${Boost_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} EventFormats )
+  FaserEventStorage/*.h
+  src/*.h src/*.cxx
+  PUBLIC_HEADERS FaserEventStorage
+  INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
+  LINK_LIBRARIES ${CMAKE_DL_LIBS} ${Boost_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} EventFormats )
 
-
-
-# atlas_add_library(fReadPlain 
-#      src/fReadPlain.h src/fReadPlain.cxx 
-#      NO_PUBLIC_HEADERS
-#      PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
-#      PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} -rdynamic)
-
-# Install files from the package:
-#atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-#atlas_install_joboptions( share/*.py )

Tracker/TrackerConditions/FaserSCT_ConditionsTools/src/FaserSCT_ConfigurationConditionsTool.cxx

@@ -23,7 +23,7 @@ StatusCode FaserSCT_ConfigurationConditionsTool::initialize() {
 
   // Read Cond Handle Key
   ATH_CHECK(m_condKey.initialize());
-  // ATH_CHECK(m_SCTDetEleCollKey.initialize());
+  ATH_CHECK(m_SCTDetEleCollKey.initialize());
 
   return StatusCode::SUCCESS;
 }

Tracker/TrackerConditions/FaserSCT_ConditionsTools/src/FaserSCT_SiliconConditionsTool.cxx

@@ -32,14 +32,16 @@ StatusCode FaserSCT_SiliconConditionsTool::initialize() {
     } else {
       ATH_MSG_INFO("GeoModel requests to use Conditions DB.");
     }
-  } 
+  }
+
+  ATH_CHECK(m_condKeyHV.initialize((not m_useGeoModel) and m_useDB));
+  ATH_CHECK(m_condKeyTemp.initialize((not m_useGeoModel) and m_useDB));
+
   if (not m_useGeoModel) {
     ATH_MSG_INFO("Will use temperature and voltages from this service (not from GeoModel).");
    
     // Get from Conditions database. Register callback, etc.
     if (m_useDB) {
-      ATH_CHECK(m_condKeyHV.initialize());
-      ATH_CHECK(m_condKeyTemp.initialize());
       ATH_CHECK(detStore()->retrieve(m_sct_id, "FaserSCT_ID"));
 
       ATH_MSG_INFO("SCTDCSSvc retrieved");

Waveform/WaveRecAlgs/python/WaveRecAlgsConfig.py

@@ -95,7 +95,8 @@ def WaveformReconstructionOutputCfg(flags, **kwargs):
         , "xAOD::WaveformClock#*"
         , "xAOD::WaveformClockAuxInfo#*"
     ]
-    acc.merge(OutputStreamCfg(flags, "xAOD", ItemList))
+    print(flags)
+    acc.merge(OutputStreamCfg(flags, "xAOD", ItemList, disableEventTag=True))
     # ostream = acc.getEventAlgo("OutputStreamRDO")
     # ostream.TakeItemsFromInput = True # Don't know what this does
     return acc

package_filters.txt

@@ -16,6 +16,7 @@
 +Control/CalypsoExample/GenEventExample
 +Control/CalypsoExample/GeoModelTest
 +Control/CalypsoExample/RDOReadExample
++Control/CalypsoExample/Reconstruction
 +Control/CalypsoExample/SimHitExample
 +Control/CalypsoExample/TrackerDataAccessExample
 +Control/CalypsoExample/TriggerDataAccessExample
@@ -37,10 +38,7 @@
 +DetectorDescription/GeoModel/GeoModelSvc
 +DetectorDescription/IdDictDetDescrCnv
 #-DetectorDescription/.*
-+Event/FaserByteStreamCnvSvcBase
-+Event/FaserByteStreamCnvSvc
-+Event/FaserEventStorage
--Event/.*
++Event/.*
 +FaserGeometryCommon/.*
 +Generators/.*
 +LHCData/LHCDataAlgs