Merge branch 'master-22.0.29-ecal' into 'master'

Add ECAL to runG4.py and runG4Cosmics.py

See merge request faser/calypso!119

Simulation/G4Faser/G4FaserAlg/test/runG4.py

@@ -65,6 +65,8 @@ if __name__ == "__main__":
     ConfigFlags.Detector.GeometryPreshower   = True
     ConfigFlags.Detector.SimulateFaserSCT   = True
     ConfigFlags.Detector.GeometryFaserSCT   = True
+    ConfigFlags.Detector.SimulateEcal = True
+    ConfigFlags.Detector.GeometryEcal = True
     ConfigFlags.Detector.SimulateUpstreamDipole = True
     ConfigFlags.Detector.SimulateCentralDipole = True
     ConfigFlags.Detector.SimulateDownstreamDipole = True
@@ -108,7 +110,8 @@ if __name__ == "__main__":
                               "McEventCollection#TruthEvent",
                               "McEventCollection#GEN_EVENT",
                               "ScintHitCollection#*",
-                              "FaserSiHitCollection#*"
+                              "FaserSiHitCollection#*",
+                              "CaloHitCollection#*"
                             ], disableEventTag=True))
     acc.getEventAlgo("OutputStreamHITS").AcceptAlgs = ["G4FaserAlg"]               # optional
     acc.getEventAlgo("OutputStreamHITS").WritingTool.ProcessingTag = "StreamHITS"  # required

Simulation/G4Faser/G4FaserAlg/test/runG4Cosmics.py

@@ -66,6 +66,8 @@ if __name__ == "__main__":
     ConfigFlags.Detector.GeometryPreshower   = True
     ConfigFlags.Detector.SimulateFaserSCT   = True
     ConfigFlags.Detector.GeometryFaserSCT   = True
+    ConfigFlags.Detector.SimulateEcal = True
+    ConfigFlags.Detector.GeometryEcal = True
     ConfigFlags.Detector.SimulateUpstreamDipole = True
     ConfigFlags.Detector.SimulateCentralDipole = True
     ConfigFlags.Detector.SimulateDownstreamDipole = True
@@ -108,7 +110,8 @@ if __name__ == "__main__":
                               "McEventCollection#TruthEvent",
                               "McEventCollection#GEN_EVENT",
                               "ScintHitCollection#*",
-                              "FaserSiHitCollection#*"
+                              "FaserSiHitCollection#*",
+                               "CaloHitCollection#*"
                             ], disableEventTag=True))
     acc.getEventAlgo("OutputStreamHITS").AcceptAlgs = ["G4FaserAlg"]               # optional
     acc.getEventAlgo("OutputStreamHITS").WritingTool.ProcessingTag = "StreamHITS"  # required