Compatibility with Athena 22.0.40

A number of improvements and simplifications in the configuration of simulation jobs.

runG4.py and its variants have been replaced with G4FaserAlgConfigNew_Test.py (the choice of name was made by ATLAS).

Simulation/G4Faser/G4FaserAlg/python/G4FaserAlgConfigNew.py

@@ -3,7 +3,7 @@ from G4FaserServices.G4FaserServicesConfigNew import DetectorGeometrySvcCfg, Phy
 from FaserISF_Services.FaserISF_ServicesConfigNew import FaserTruthServiceCfg, FaserInputConverterCfg
 from FaserISF_Services.FaserISF_ServicesCoreConfigNew import FaserGeoIDSvcCfg
 from G4FaserTools.G4FaserToolsConfigNew import SensitiveDetectorMasterToolCfg
-from G4AtlasTools.G4AtlasToolsConfigNew import EmptyFastSimulationMasterToolCfg
+from G4FaserTools.G4FaserToolsConfigNew import FastSimulationMasterToolCfg
 from G4FaserServices.G4FaserUserActionConfigNew import UserActionSvcCfg
 # from G4FaserApps.G4Faser_MetadataNew import writeSimulationParametersMetadata
 from AthenaConfiguration.ComponentFactory import CompFactory
@@ -52,9 +52,9 @@ def G4FaserAlgBasicCfg(ConfigFlags, name="G4FaserAlg", **kwargs):
     kwargs.setdefault("TruthRecordService", result.getService("FaserISF_TruthService"))
     #kwargs.setdefault("TruthRecordService", ConfigFlags.Sim.TruthStrategy) # TODO need to have manual override (simFlags.TruthStrategy.TruthServiceName())
 
-    accGeoID = FaserGeoIDSvcCfg(ConfigFlags)
-    result.merge(accGeoID)
-    kwargs.setdefault("GeoIDSvc", result.getService("ISF_FaserGeoIDSvc"))
+    # accGeoID = FaserGeoIDSvcCfg(ConfigFlags)
+    # result.merge(accGeoID)
+    # kwargs.setdefault("GeoIDSvc", result.getService("ISF_FaserGeoIDSvc"))
 
     #input converter
     accInputConverter = FaserInputConverterCfg(ConfigFlags)
@@ -67,7 +67,7 @@ def G4FaserAlgBasicCfg(ConfigFlags, name="G4FaserAlg", **kwargs):
     kwargs.setdefault("SenDetMasterTool", result.getPublicTool(SensitiveDetector.name))
 
     #fast simulation master tool
-    FastSimulation = result.popToolsAndMerge(EmptyFastSimulationMasterToolCfg(ConfigFlags))
+    FastSimulation = result.popToolsAndMerge(FastSimulationMasterToolCfg(ConfigFlags))
     result.addPublicTool(FastSimulation)
     kwargs.setdefault("FastSimMasterTool", result.getPublicTool(FastSimulation.name))
 
@@ -108,80 +108,32 @@ def G4FaserAlgOutputCfg(ConfigFlags):
     follows G4Atlas.flat.configuration.py
     """
     ItemList = ["EventInfo#*",
-                "McEventCollection#TruthEvent",
-                "JetCollection#*"]
+                "McEventCollection#TruthEvent"]
 
     if ConfigFlags.Sim.IncludeParentsInG4Event:
-        ItemList += ["McEventCollection#GEN_EVENT"]
-
-    # ItemList += ["xAOD::JetContainer#*",
-    #              "xAOD::JetAuxContainer#*"]
-
-    # if ConfigFlags.Detector.EnableID:
-    #     ItemList += ["SiHitCollection#*",
-    #                  "TRTUncompressedHitCollection#*",
-    #                  "TrackRecordCollection#CaloEntryLayer"]
-
-    # if ConfigFlags.Detector.EnableITk:
-    #     ItemList += ["SiHitCollection#*",
-    #                  "TrackRecordCollection#CaloEntryLayer"]
-
-    # if ConfigFlags.Detector.EnableCalo:
-    #     ItemList += ["CaloCalibrationHitContainer#*",
-    #                  "LArHitContainer#*",
-    #                  "TileHitVector#*",
-    #                  "TrackRecordCollection#MuonEntryLayer"]
-
-    # if ConfigFlags.Detector.EnableMuon:
-    #     ItemList += ["RPCSimHitCollection#*",
-    #                  "TGCSimHitCollection#*",
-    #                  "MDTSimHitCollection#*",
-    #                  "TrackRecordCollection#MuonExitLayer"]
-    #     if ConfigFlags.Detector.EnableCSC:
-    #         ItemList += ["CSCSimHitCollection#*"]
-    #     if ConfigFlags.Detector.EnablesTGC:
-    #         ItemList += ["sTGCSimHitCollection#*"]
-    #     if ConfigFlags.Detector.EnableMM:
-    #         ItemList += ["MMSimHitCollection#*"]
-
-    # if ConfigFlags.Detector.EnableLucid:
-    #     ItemList += ["LUCID_SimHitCollection#*"]
-
-    # if ConfigFlags.Detector.EnableFwdRegion:
-    #     ItemList += ["SimulationHitCollection#*"]
-
-    # if ConfigFlags.Detector.EnableZDC:
-    #     ItemList += ["ZDC_SimPixelHit_Collection#*",
-    #                  "ZDC_SimStripHit_Collection#*"]
-
-    # if ConfigFlags.Detector.EnableALFA:
-    #     ItemList += ["ALFA_HitCollection#*",
-    #                  "ALFA_ODHitCollection#*"]
-
-    # if ConfigFlags.Detector.EnableAFP:
-    #     ItemList += ["AFP_TDSimHitCollection#*",
-    #                  "AFP_SIDSimHitCollection#*"]
+        ItemList += ["McEventCollection#BeamTruthEvent"]
+
+    if ConfigFlags.Detector.EnableEmulsion:
+        ItemList += ["NeutrinoHitCollection#*"]
+
+    if ConfigFlags.Detector.EnableFaserSCT:
+        ItemList += ["FaserSiHitCollection#*"]
+
+    if ConfigFlags.Detector.EnableEcal:
+        ItemList += ["CaloHitCollection#*"]
+
+    if ConfigFlags.Detector.EnableVeto:
+        ItemList += ["ScintHitCollection#VetoHits"]
+
+    if ConfigFlags.Detector.EnableTrigger:
+        ItemList += ["ScintHitCollection#TriggerHits"]
+
+    if ConfigFlags.Detector.EnablePreshower:
+        ItemList += ["ScintHitCollection#PreshowerHits"]
 
     # TimingAlg
     # ItemList += ["RecoTimingObj#EVNTtoHITS_timings"]
 
-    # FIXME reproduce to support non standard setups
-    #0140         ## Add cosmics and test beam configuration hit persistency if required cf. geom tag
-    #0141         layout = simFlags.SimLayout.get_Value()
-    #0142         if "tb" not in layout:
-    #0143             from AthenaCommon.BeamFlags import jobproperties
-    #0144             if jobproperties.Beam.beamType() == 'cosmics' or \
-    #0145                     (hasattr(simFlags, "WriteTR") and simFlags.WriteTR.statusOn) or \
-    #0146                     (hasattr(simFlags, "ReadTR") and simFlags.ReadTR.statusOn):
-    #0147                 stream1.ItemList += ["TrackRecordCollection#CosmicRecord", "TrackRecordCollection#CosmicPerigee"]
-    #0148         else:
-    #0149             ## CTB-specific
-    #0150             if layout.startswith("ctb"):
-    #0151                 if simFlags.LArFarUpstreamMaterial.statusOn and simFlags.LArFarUpstreamMaterial.get_Value():
-    #0152                     stream1.ItemList.append("TrackRecordCollection#LArFarUpstreamMaterialExitLayer")
-    #0153             ## Persistency of test-beam layout
-    #0154             if layout.startswith('ctb') or layout.startswith('tb_Tile2000_'):
-    #0155                 stream1.ItemList += ["TBElementContainer#*"]
     acc = OutputStreamCfg(ConfigFlags,"HITS", ItemList=ItemList, disableEventTag=True)
 
     # Make stream aware of aborted events