Merge branch 'master-ITkStripSDConfig' into 'master'

ITk Strip Sensitive Detector Config

See merge request atlas/athena!36126

InnerDetector/InDetG4/SCT_G4_SD/python/SCT_G4_SDConfig.py

@@ -22,9 +22,9 @@ def getSctSensorSD(name="SctSensorSD", **kwargs):
 
 
 def getSLHC_SctSensorSD(name="SLHC_SctSensorSD", **kwargs):
-    kwargs.setdefault("LogicalVolumeNames", ["SCT::BRLSensor","SCT::BRLSensorSS","SCT::BRLSensorMS",
-                                             "SCT::ECSensor0","SCT::ECSensor1","SCT::ECSensor2",
-                                             "SCT::ECSensor3","SCT::ECSensor4","SCT::ECSensor5"])
+    kwargs.setdefault("LogicalVolumeNames", ["ITkStrip::BRLSensor","ITkStrip::BRLSensorSS","ITkStrip::BRLSensorMS",
+                                             "ITkStrip::ECSensor0","ITkStrip::ECSensor1","ITkStrip::ECSensor2",
+                                             "ITkStrip::ECSensor3","ITkStrip::ECSensor4","ITkStrip::ECSensor5"])
     return getSctSensorSD(name, **kwargs)
 
 

InnerDetector/InDetG4/SCT_G4_SD/python/SCT_G4_SDToolConfig.py

@@ -30,9 +30,9 @@ def SctSensorSDCfg(ConfigFlags, name="SctSensorSD", **kwargs):
 
 def SLHC_SctSensorSDCfg(ConfigFlags, name="SLHC_SctSensorSD", **kwargs):
 
-    kwargs.setdefault("LogicalVolumeNames", ["SCT::BRLSensor","SCT::BRLSensorSS","SCT::BRLSensorMS",
-                                             "SCT::ECSensor0","SCT::ECSensor1","SCT::ECSensor2",
-                                             "SCT::ECSensor3","SCT::ECSensor4","SCT::ECSensor5"])
+    kwargs.setdefault("LogicalVolumeNames", ["ITkStrip::BRLSensor","ITkStrip::BRLSensorSS","ITkStrip::BRLSensorMS",
+                                             "ITkStrip::ECSensor0","ITkStrip::ECSensor1","ITkStrip::ECSensor2",
+                                             "ITkStrip::ECSensor3","ITkStrip::ECSensor4","ITkStrip::ECSensor5"])
     return SctSensorSDCfg(ConfigFlags, name, **kwargs)
 
 

Simulation/G4Atlas/G4AtlasAlg/python/G4AtlasAlgConfigNew.py

@@ -122,6 +122,10 @@ def G4AtlasAlgOutputCfg(ConfigFlags):
                      "TRTUncompressedHitCollection#*",
                      "TrackRecordCollection#CaloEntryLayer"]
 
+    if ConfigFlags.Detector.SimulateITk:
+        ItemList += ["SiHitCollection#*",
+                     "TrackRecordCollection#CaloEntryLayer"]
+
     if ConfigFlags.Detector.SimulateCalo:
         ItemList += ["CaloCalibrationHitContainer#*",
                      "LArHitContainer#*",

Simulation/G4Atlas/G4AtlasTools/python/G4AtlasToolsConfigNew.py

@@ -14,7 +14,7 @@ from PixelG4_SD.PixelG4_SDToolConfig import PixelSensorSDCfg
 from PixelG4_SD.PixelG4_SDToolConfig import PixelSensor_CTBCfg
 
 from SCT_G4_SD.SCT_G4_SDToolConfig import SctSensorSDCfg
-from SCT_G4_SD.SCT_G4_SDToolConfig import SLHC_SctSensorSDCfg
+from SCT_G4_SD.SCT_G4_SDToolConfig import SLHC_SctSensorSD_GmxCfg #Change name?
 from SCT_G4_SD.SCT_G4_SDToolConfig import SctSensor_CTBCfg
 
 from TRT_G4_SD.TRT_G4_SDToolConfig import TRTSensitiveDetectorCfg
@@ -98,15 +98,29 @@ def generateTrackFastSimSensitiveDetectorList(ConfigFlags):
     return SensitiveDetectorList
 
 
+def generateITkSensitiveDetectorList(ConfigFlags):
+
+    result = ComponentAccumulator()
+    SensitiveDetectorList=[]
+
+    if ConfigFlags.Detector.SimulateITkPixel:
+        accITkPixel, toolITkPixel = PixelSensorSDCfg(ConfigFlags)
+        SensitiveDetectorList += [ toolITkPixel ]
+        result.merge(accITkPixel)
+    if ConfigFlags.Detector.SimulateITkStrip:
+        accITkStrip,toolITkStrip = SLHC_SctSensorSD_GmxCfg(ConfigFlags) #This tool should be renamed, and maybe moved to separate package?
+        SensitiveDetectorList += [ toolITkStrip ]
+        result.merge(accITkStrip)
+    return result, SensitiveDetectorList #List of tools here now! (CALL IT TOOL LIST?)
+
 def generateInDetSensitiveDetectorList(ConfigFlags):
 
     result = ComponentAccumulator()
     SensitiveDetectorList=[]
 
-    isUpgrade = ConfigFlags.GeoModel.Run=="RUN4"
     #EDIT THIS LATER(geoflags...)...!!
     isRUN2 = (ConfigFlags.GeoModel.Run in ["RUN2", "RUN3"]) or (ConfigFlags.GeoModel.Run=="UNDEFINED" )#and geoFlags.isIBL()) #isIBL may cause issues later....
-    isRUN1 = not (isRUN2 or isUpgrade)
+    isRUN1 = not (isRUN2)
 
     if ConfigFlags.Detector.SimulatePixel:
         if isRUN1 or isRUN2:
@@ -121,15 +135,10 @@ def generateInDetSensitiveDetectorList(ConfigFlags):
         SensitiveDetectorList += [ toolPixel ]
         result.merge(accPixel)
     if ConfigFlags.Detector.SimulateSCT:
-        if isUpgrade:
-            accSCT, toolSCT = SLHC_SctSensorSDCfg(ConfigFlags)
-            SensitiveDetectorList += [ toolSCT ]
-            result.merge(accSCT)
-        else:
-            accSCT,toolSCT = SctSensorSDCfg(ConfigFlags)
-            SensitiveDetectorList += [ toolSCT ]
-            result.merge(accSCT)
-    if ConfigFlags.Detector.SimulateTRT and not isUpgrade:
+        accSCT,toolSCT = SctSensorSDCfg(ConfigFlags)
+        SensitiveDetectorList += [ toolSCT ]
+        result.merge(accSCT)
+    if ConfigFlags.Detector.SimulateTRT:
         accTRT, toolTRT = TRTSensitiveDetectorCfg(ConfigFlags)
         SensitiveDetectorList += [ toolTRT ]
         result.merge(accTRT)
@@ -246,9 +255,13 @@ def generateSensitiveDetectorList(ConfigFlags):
     SensitiveDetectorList=[]
     SensitiveDetectorList += generateEnvelopeSensitiveDetectorList(ConfigFlags) # to update
 
-    acc_InDetSensitiveDetector, InDetSensitiveDetectorList = generateInDetSensitiveDetectorList(ConfigFlags)
-    SensitiveDetectorList += InDetSensitiveDetectorList
+    if ConfigFlags.Detector.SimulateID:
+        acc_InDetSensitiveDetector, InDetSensitiveDetectorList = generateInDetSensitiveDetectorList(ConfigFlags)
+        SensitiveDetectorList += InDetSensitiveDetectorList
 
+    if ConfigFlags.Detector.SimulateITk:
+        acc_ITkSensitiveDetector, ITkSensitiveDetectorList = generateITkSensitiveDetectorList(ConfigFlags)
+        SensitiveDetectorList += ITkSensitiveDetectorList
 
     acc_CaloSensitiveDetector = generateCaloSensitiveDetectorList(ConfigFlags)
     SensitiveDetectorList+=result.popToolsAndMerge(acc_CaloSensitiveDetector)
@@ -260,7 +273,10 @@ def generateSensitiveDetectorList(ConfigFlags):
     SensitiveDetectorList += generateTrackFastSimSensitiveDetectorList(ConfigFlags)
     SensitiveDetectorList += generateFwdSensitiveDetectorList(ConfigFlags)
 
-    result.merge(acc_InDetSensitiveDetector)
+    if ConfigFlags.Detector.SimulateID:
+        result.merge(acc_InDetSensitiveDetector)
+    if ConfigFlags.Detector.SimulateITk:
+        result.merge(acc_ITkSensitiveDetector)
 
     result.setPrivateTools(SensitiveDetectorList)
     return result

Simulation/G4Atlas/G4AtlasTools/python/G4PhysicsRegionConfigNew.py

@@ -86,10 +86,9 @@ def ITkPixelPhysicsRegionToolCfg(ConfigFlags, name='ITkPixelPhysicsRegionTool',
 
 def ITkStripPhysicsRegionToolCfg(ConfigFlags, name='ITkStripPhysicsRegionTool', **kwargs):
     kwargs.setdefault("RegionName", 'ITkStrip')
-    #Need to find what these should be set to for ITk...
-    volumeList = ['SCT::BRLSensor', 'SCT::BRLSensorSS', 'SCT::BRLSensorMS',
-                   'SCT::ECSensor0', 'SCT::ECSensor1', 'SCT::ECSensor2',
-                   'SCT::ECSensor3', 'SCT::ECSensor4', 'SCT::ECSensor5']
+    volumeList = ['ITkStrip::BRLSensor', 'ITkStrip::BRLSensorSS', 'ITkStrip::BRLSensorMS',
+                   'ITkStrip::ECSensor0', 'ITkStrip::ECSensor1', 'ITkStrip::ECSensor2',
+                   'ITkStrip::ECSensor3', 'ITkStrip::ECSensor4', 'ITkStrip::ECSensor5']
     kwargs.setdefault("VolumeList",  volumeList)
     kwargs.setdefault("ElectronCut", 0.05)
     kwargs.setdefault("PositronCut", 0.05)