Minor cleanup

Database/ConnectionManagement/FaserAuthentication/data/dblookup.xml

@@ -21,7 +21,7 @@
  <service name="sqlite_file:///cvmfs/faser.cern.ch/repo/sw/database/DBRelease/current/sqlite200/ALLP200.db" accessMode="read" />
 </logicalservice>
 
-<logicalservice name="COOLONL_SCT">
+<logicalservice name="COOLOFL_TDAQ">
    <service name="sqlite_file:data/sqlite200/CABP200.db" accessMode="read" />
    <service name="sqlite_file:///cvmfs/faser.cern.ch/repo/sw/database/DBRelease/current/sqlite200/CABP200.db" accessMode="read" />
 </logicalservice>

Tracker/TrackerConditions/FaserSCT_ConditionsTools/python/FaserSCT_CableMappingConfig.py

@@ -19,7 +19,7 @@ def FaserSCT_CableMappingCfg(flags, **kwargs):
     acc = ComponentAccumulator()
     # tool = kwargs.get("CableMappingTool", FaserSCT_CableMappingToolCfg(flags))
     # folder arguments
-    dbInstance = kwargs.get("dbInstance", "SCT_ONL")
+    dbInstance = kwargs.get("dbInstance", "TDAQ_OFL")
     dbFolder = kwargs.get("dbFolder", "/SCT/DAQ/CableMapping")
     acc.merge(addFolders(flags, dbFolder, dbInstance, className="CondAttrListCollection"))
     # acc.addPublicTool(tool)

Tracker/TrackerConditions/FaserSCT_ConditionsTools/src/FaserSCT_CableMappingTool.cxx

@@ -53,8 +53,8 @@ FaserSCT_CableMappingTool::getCableMapping(const EventContext& ctx) const {
     ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandle.key());
     return mappingData;
   }
-  ATH_MSG_INFO("Size of CondAttrListCollection " << readHandle.fullKey() << " readCdo->size()= " << readCdo->size());
-  ATH_MSG_INFO("Range of input is " << rangeW);
+  ATH_MSG_DEBUG("Size of CondAttrListCollection " << readHandle.fullKey() << " readCdo->size()= " << readCdo->size());
+  ATH_MSG_DEBUG("Range of input is " << rangeW);
   
   // Read mapping info
   std::string stationParam{"station"};

Tracker/TrackerEventCnv/TrackerByteStream/src/TrackerByteStreamCnv.cxx

@@ -97,7 +97,7 @@ StatusCode TrackerByteStreamCnv::createObj(IOpaqueAddress* pAddr, DataObject*& p
   ATH_MSG_DEBUG("New FaserSCT_RDO_Container created of size="<<cont->size());
 
   auto mapping = m_mappingTool->getCableMapping();
-  ATH_MSG_ALWAYS("Cable mapping contains " << mapping.size() << " entries");
+  ATH_MSG_DEBUG("Cable mapping contains " << mapping.size() << " entries");
   
   // Convert raw data into this container
 

Tracker/TrackerRecAlgs/TrackerSegmentFit/test/TrackerSegmentFitDbg.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 TrackerSegmentFit.TrackerSegmentFitConfig import SegmentFitAlgCfg
 from TrackerSpacePointFormation.TrackerSpacePointFormationConfig import TrackerSpacePointFinderCfg
@@ -26,14 +26,14 @@ Configurable.configurableRun3Behavior = True
 
 # Configure
 ConfigFlags.Input.Files = [
-    '/eos/project-f/faser-commissioning/TI12Data/Run-001332/Faser-Physics-001332-00000.raw',
+    '/eos/project-f/faser-commissioning/TI12Data/Run-005684/Faser-Physics-005684-00000.raw',
 ]
-ConfigFlags.Output.ESDFileName = "run001332.ESD.pool.root"
-ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"             # Always needed; must match FaserVersion
+ConfigFlags.Output.ESDFileName = "run005684-00000.ESD.pool.root"
+ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-02"             # Always needed; must match FaserVersion
 ConfigFlags.IOVDb.DatabaseInstance = "OFLP200"               # Use MC conditions for now
 ConfigFlags.Input.ProjectName = "data21"                     # Needed to bypass autoconfig
 ConfigFlags.Input.isMC = False                               # Needed to bypass autoconfig
-ConfigFlags.GeoModel.FaserVersion     = "FASER-01"           # FASER geometry
+ConfigFlags.GeoModel.FaserVersion     = "FASER-02"           # FASER geometry
 ConfigFlags.Common.isOnline = False
 ConfigFlags.GeoModel.Align.Dynamic = False
 ConfigFlags.Beam.NumberOfCollisions = 0.
@@ -59,20 +59,27 @@ acc.merge(TrackerSpacePointFinderCfg(ConfigFlags))
 
 # explicitly save RDO information
 from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
-itemList = [ "xAOD::EventInfo#*",
-             "xAOD::EventAuxInfo#*",
-             "FaserSCT_RDO_Container#*",
-             "xAOD::FaserTriggerData#*",
-             "xAOD::FaserTriggerDataAux#*",
-             "ScintWaveformContainer#*",
-             "TrackCollection#*",
-             "xAOD::WaveformHitContainer#*",
-             "xAOD::WaveformHitAuxContainer#*",
-             "xAOD::WaveformClock#*",
-             "xAOD::WaveformClockAuxInfo#*",
-           ]
+itemList = [ "xAOD::EventInfo#*"
+             , "xAOD::EventAuxInfo#*"
+             , "xAOD::FaserTriggerData#*"
+             , "xAOD::FaserTriggerDataAux#*"
+             , "FaserSCT_RDO_Container#*"
+             , "Tracker::FaserSCT_ClusterContainer#*"
+             , "TrackCollection#*"
+]
 acc.merge(OutputStreamCfg(ConfigFlags, "ESD", itemList))
-acc.getEventAlgo("OutputStreamESD").AcceptAlgs = ["Tracker::SegmentFitAlg"] 
+
+# Waveform reconstruction
+from WaveRecAlgs.WaveRecAlgsConfig import WaveformReconstructionOutputCfg    
+acc.merge(WaveformReconstructionOutputCfg(ConfigFlags))
+
+# Hack to avoid problem with our use of MC databases when isMC = False
+replicaSvc = acc.getService("DBReplicaSvc")
+replicaSvc.COOLSQLiteVetoPattern = ""
+replicaSvc.UseCOOLSQLite = True
+replicaSvc.UseCOOLFrontier = False
+replicaSvc.UseGeomSQLite = True
+
 # Timing
 #acc.merge(MergeRecoTimingObjCfg(ConfigFlags))