Merge branch 'upgrade/minifcal' into 'master'

Disable LArMiniFCALSensitiveDetectorTool in simulation

See merge request !45139

Simulation/G4Atlas/G4AtlasTools/python/G4AtlasToolsConfig.py

@@ -98,9 +98,11 @@ def generateCaloSensitiveDetectorList():
     from AthenaCommon.DetFlags import DetFlags
     if DetFlags.simulate.LAr_on():
         SensitiveDetectorList += [ 'LArEMBSensitiveDetector','LArEMECSensitiveDetector','LArFCALSensitiveDetector',\
-                                   'LArHECSensitiveDetector','LArMiniFCALSensitiveDetector']
+                                   'LArHECSensitiveDetector']
+        if False:  # disabled for now
+            SensitiveDetectorList += [ 'LArMiniFCALSensitiveDetector' ]
         if hasattr(DetFlags.simulate, 'HGTD_on') and DetFlags.simulate.HGTD_on():
-            SensitiveDetectorList += [ 'HGTDSensorSD' ]
+            raise RuntimeError('High Luminosity LHC configurations only supported in CA-based configuration')
         else:
             SensitiveDetectorList += [ 'MinBiasScintillatorSD' ]
         from G4AtlasApps.SimFlags import simFlags

Simulation/G4Atlas/G4AtlasTools/python/G4AtlasToolsConfigNew.py

@@ -141,12 +141,14 @@ def CaloSensitiveDetectorListCfg(ConfigFlags):
     tools = []
 
     if ConfigFlags.Detector.EnableLAr:
-        from LArG4SD.LArG4SDToolConfig import LArEMBSensitiveDetectorCfg, LArEMECSensitiveDetectorCfg, LArFCALSensitiveDetectorCfg, LArHECSensitiveDetectorCfg, LArMiniFCALSensitiveDetectorToolCfg
+        from LArG4SD.LArG4SDToolConfig import LArEMBSensitiveDetectorCfg, LArEMECSensitiveDetectorCfg, LArFCALSensitiveDetectorCfg, LArHECSensitiveDetectorCfg
         tools += [ result.popToolsAndMerge(LArEMBSensitiveDetectorCfg(ConfigFlags)) ]
         tools += [ result.popToolsAndMerge(LArEMECSensitiveDetectorCfg(ConfigFlags)) ]
         tools += [ result.popToolsAndMerge(LArFCALSensitiveDetectorCfg(ConfigFlags)) ]
         tools += [ result.popToolsAndMerge(LArHECSensitiveDetectorCfg(ConfigFlags)) ]
-        tools += [ result.popToolsAndMerge(LArMiniFCALSensitiveDetectorToolCfg(ConfigFlags)) ]
+        if False:  # disabled for now
+            from LArG4SD.LArG4SDToolConfig import LArMiniFCALSensitiveDetectorToolCfg
+            tools += [ result.popToolsAndMerge(LArMiniFCALSensitiveDetectorToolCfg(ConfigFlags)) ]
 
         if ConfigFlags.Detector.EnableMBTS:
             from MinBiasScintillator.MinBiasScintillatorToolConfig import MinBiasScintillatorSDCfg

Tools/PROCTools/python/RunTier0TestsTools.py

@@ -27,7 +27,7 @@ ciRefFileMap = {
                 's3505-21.0'           : 'v2',
                 's3505-21.3'           : 'v1',
                 's3505-21.9'           : 'v1',
-                's3505-22.0'           : 'v10',
+                's3505-22.0'           : 'v11',
                 # OverlayTier0Test_required-test
                 'overlay-d1498-21.0'   : 'v2',
                 'overlay-d1498-22.0'   : 'v38',