Merge branch 'master-22.0.29-rawfix' into 'master'

Disable useless helper tool causing error

See merge request faser/calypso!121

Event/FaserByteStreamCnvSvc/python/FaserByteStreamCnvSvcConfig.py

@@ -7,8 +7,8 @@ def FaserEventSelectorByteStreamCfg(configFlags, **kwargs):
     result = ComponentAccumulator()
 
     # from xAODEventInfoCnv.xAODEventInfoCnvConf import xAODMaker__EventInfoSelectorTool 
-    infoTool = CompFactory.xAODMaker.EventInfoSelectorTool
-    xconv = infoTool()
+    # infoTool = CompFactory.xAODMaker.EventInfoSelectorTool
+    # xconv = infoTool()
 
 # Load ByteStreamCnvSvc
     byteSvc = CompFactory.FaserByteStreamCnvSvc
@@ -20,7 +20,7 @@ def FaserEventSelectorByteStreamCfg(configFlags, **kwargs):
     bsSelector = CompFactory.FaserEventSelectorByteStream
     selector = bsSelector("FaserEventSelector")
     selector.ByteStreamInputSvc = "FaserByteStreamInputSvc"
-    selector.HelperTools += [xconv]
+    # selector.HelperTools += [xconv]
     selector.Input = configFlags.Input.Files
     result.addService(selector)
     result.setAppProperty("EvtSel",selector.getFullJobOptName())

Tracker/TrackerRecAlgs/TrackerClusterFit/test/TrackerClusterFitDbg.py

@@ -125,7 +125,7 @@ itemList = [ "xAOD::EventInfo#*",
              "xAOD::EventAuxInfo#*",
              "FaserSCT_RDO_Container#*",
              "xAOD::FaserTriggerData#*",
-             "xAOD::FaserTriggerDataAuxInfo#*",
+             "xAOD::FaserTriggerDataAux#*",
              "ScintWaveformContainer#*",
              "TrackCollection#*",
              "xAOD::WaveformHitContainer#*",