Athena 22.0.46 compatibility

Simulation/G4Faser/G4FaserTools/python/G4FaserToolsConfigNew.py

@@ -20,97 +20,6 @@ def FastSimulationMasterToolCfg(ConfigFlags, **kwargs):
     result.setPrivateTools(FastSimulationMasterTool(name="FastSimulationMasterTool", **kwargs))
     return result
 
-# from EmulsionG4_SD.EmulsionG4_SDToolConfig import EmulsionSensorSDCfg
-# from VetoG4_SD.VetoG4_SDToolConfig import VetoSensorSDCfg
-# from TriggerG4_SD.TriggerG4_SDToolConfig import TriggerSensorSDCfg
-# from PreshowerG4_SD.PreshowerG4_SDToolConfig import PreshowerSensorSDCfg
-# from FaserSCT_G4_SD.FaserSCT_G4_SDToolConfig import SctSensorSDCfg
-# from EcalG4_SD.EcalG4_SDToolConfig import EcalSensorSDCfg
-
-# def generateNeutrinoSensitiveDetectorList(ConfigFlags):
-
-#     result = ComponentAccumulator()
-#     SensitiveDetectorList=[]
-
-#     if ConfigFlags.Detector.EnableEmulsion:
-#         accEmulsion,toolEmulsion = EmulsionSensorSDCfg(ConfigFlags)
-#         SensitiveDetectorList += [ toolEmulsion ]
-#         result.merge(accEmulsion)
-    
-#     return result, SensitiveDetectorList #List of tools here now! (CALL IT TOOL LIST?)
-
-# def generateScintSensitiveDetectorList(ConfigFlags):
-
-#     result = ComponentAccumulator()
-#     SensitiveDetectorList=[]
-
-#     if ConfigFlags.Detector.EnableVeto:
-#         accVeto,toolVeto = VetoSensorSDCfg(ConfigFlags)
-#         SensitiveDetectorList += [ toolVeto ]
-#         result.merge(accVeto)
-    
-#     if ConfigFlags.Detector.EnableTrigger:
-#         accTrigger,toolTrigger = TriggerSensorSDCfg(ConfigFlags)
-#         SensitiveDetectorList += [ toolTrigger ]
-#         result.merge(accTrigger)
-    
-#     if ConfigFlags.Detector.EnablePreshower:
-#         accPreshower,toolPreshower = PreshowerSensorSDCfg(ConfigFlags)
-#         SensitiveDetectorList += [ toolPreshower ]
-#         result.merge(accPreshower)
-    
-#     return result, SensitiveDetectorList #List of tools here now! (CALL IT TOOL LIST?)
-
-# def generateTrackerSensitiveDetectorList(ConfigFlags):
-
-#     result = ComponentAccumulator()
-#     SensitiveDetectorList=[]
-
-#     if ConfigFlags.Detector.EnableFaserSCT:
-#         accSCT,toolSCT = SctSensorSDCfg(ConfigFlags)
-#         SensitiveDetectorList += [ toolSCT ]
-#         result.merge(accSCT)
-        
-#     return result, SensitiveDetectorList #List of tools here now! (CALL IT TOOL LIST?)
-
-# def generateCaloSensitiveDetectorList(ConfigFlags):
-
-#     result = ComponentAccumulator()
-#     SensitiveDetectorList=[]
-
-#     if ConfigFlags.Detector.EnableEcal:
-#         accEcal,toolEcal = EcalSensorSDCfg(ConfigFlags)
-#         SensitiveDetectorList += [ toolEcal ]
-#         result.merge(accEcal)
-    
-#     return result, SensitiveDetectorList #List of tools here now! (CALL IT TOOL LIST?)
-
-# def generateSensitiveDetectorList(ConfigFlags):
-#     result = ComponentAccumulator()
-#     SensitiveDetectorList=[]
-#     # SensitiveDetectorList += generateEnvelopeSensitiveDetectorList(ConfigFlags) # to update
-
-#     acc_NeutrinoSensitiveDetector, NeutrinoSensitiveDetectorList = generateNeutrinoSensitiveDetectorList(ConfigFlags)
-#     SensitiveDetectorList += NeutrinoSensitiveDetectorList
-
-#     acc_ScintSensitiveDetector, ScintSensitiveDetectorList = generateScintSensitiveDetectorList(ConfigFlags)
-#     SensitiveDetectorList += ScintSensitiveDetectorList
-
-#     acc_TrackerSensitiveDetector, TrackerSensitiveDetectorList = generateTrackerSensitiveDetectorList(ConfigFlags)
-#     SensitiveDetectorList += TrackerSensitiveDetectorList
-
-#     acc_CaloSensitiveDetector, CaloSensitiveDetectorList = generateCaloSensitiveDetectorList(ConfigFlags)
-#     SensitiveDetectorList += CaloSensitiveDetectorList
-
-#     result.merge(acc_NeutrinoSensitiveDetector)
-#     result.merge(acc_ScintSensitiveDetector)
-#     result.merge(acc_TrackerSensitiveDetector)
-#     result.merge(acc_CaloSensitiveDetector)
-
-#     result.setPrivateTools(SensitiveDetectorList)
-#     return result
-
-
 def NeutrinoSensitiveDetectorListCfg(ConfigFlags):
     result = ComponentAccumulator()
     tools = []

graphics/VTI12/VTI12Systems/VTI12TrackSystems/src/TrackPropagationHelper.cxx

@@ -303,7 +303,9 @@ bool TrackPropagationHelper::makePointsCharged( std::vector<Amg::Vector3D >& poi
     //get individual surfaces
 
     //TODO - optimise this!
-    const std::vector< const Trk::Surface * > * bsurfs = volume->volumeBounds ().decomposeToSurfaces (volume->transform ());
+    const std::vector<const Trk::Surface*>* bsurfs =
+      const_cast<Trk::VolumeBounds&>(volume->volumeBounds())
+        .decomposeToSurfaces(volume->transform());
 
     if (bsurfs){
       messageVerbose("Has this many surfaces:"+str(bsurfs->size()));