Merge branch 'master-tile-sfr-tags-remove' into 'master'

TileConditions+TileSimAlgs: Remove Tile hardcoded tags for sampling fraction

See merge request atlas/athena!52932

TileCalorimeter/TileConditions/python/TileCondProxyConf.py

@@ -54,6 +54,8 @@ def getTileCondProxy(technology, type, source, name, **kwargs):
             conddb.addFolderSplitMC(conn, folderstr, folderstr2, className = 'CondAttrListCollection')
         if tileCoolMgr.isOfflineOnly(source):
             conddb.addFolder(conn, folderstr, className = 'CondAttrListCollection')
+        if tileCoolMgr.isForceMC(source):
+            conddb.addFolder(conn, folderstr, className = 'CondAttrListCollection', forceMC=True)
         if tileCoolMgr.isSplitOnline(source):
             conddb.addFolderSplitOnline(conn, folderstr, folderstr2, className = 'CondAttrListCollection')
         if tileCoolMgr.isSqlite(source):

TileCalorimeter/TileConditions/python/TileCoolMgrClass.py

@@ -18,7 +18,7 @@ class TileCoolMgr(object):
         self.__idDict = {}
 
         #=== Available folder types
-        self.__validTypes = ["SplitMC", "SplitOnline", "OfflineOnly", "Sqlite"]
+        self.__validTypes = ["SplitMC", "SplitOnline", "OfflineOnly", "Sqlite", "ForceMC"]
 
         #=== do we run on real data (not MC)?
         self._isMC=isMC
@@ -39,7 +39,7 @@ class TileCoolMgr(object):
     def addSource(self, condId, folder, connStr, tag, folder2, type, key = ""):
         if type not in self.__validTypes:
             self.__log.error("Folder type \'%s\' not recognized!", type)
-        if (type != "OfflineOnly") and (folder2 == ""):
+        if (type not in ["OfflineOnly", "ForceMC"]) and (folder2 == ""):
             self.__log.error("For folder type \'%s\' second folder name required!", type)
         self.__idDict[condId] = [folder, connStr, tag, folder2, type, key]
 
@@ -115,6 +115,17 @@ class TileCoolMgr(object):
                 return False
 
     #_______________________________________________________________
+    def isForceMC(self, condId):
+        idInfo = self.__idDict.get(condId)
+        if not idInfo:
+            self.__log.error("CondId \'%s\' not recognized!", condId)
+            return None
+        else:
+            if idInfo[4]=="ForceMC":
+                return True
+            else:
+                return False
+    #_______________________________________________________________
     def isSqlite(self, condId):
         idInfo = self.__idDict.get(condId)
         if not idInfo:
@@ -270,7 +281,7 @@ class TileCoolMgr(object):
         self.addSource('OfcOf1Las',      '/TILE/ONL01/FILTER/OF1/LAS', defConnStr, "", '/TILE/ONL01/FILTER/OF1/LAS', 'SplitMC')
 
         #--- sampling fraction
-        self.addSource('oflSampFrac', '/TILE/OFL02/CALIB/SFR', oflConnStr, "TileOfl02CalibSfr-SIM-00", "", 'OfflineOnly', '/TILE/OFL02/CALIB/SFR')
+        self.addSource('oflSampFrac', '/TILE/OFL02/CALIB/SFR', oflConnStr, "", "", 'ForceMC', '/TILE/OFL02/CALIB/SFR')
 
         if (self._dbInstance == 'CONDBR2'):
             #--- OFCs

TileCalorimeter/TileConditions/python/TileSamplingFractionConfig.py

@@ -31,9 +31,9 @@ def TileSamplingFractionCondAlgCfg(flags, **kwargs):
         TileCondProxyCoolFlt = CompFactory.getComp("TileCondProxyCool<TileCalibDrawerFlt>")
         samplingFractionProxy = TileCondProxyCoolFlt('TileCondProxyCool_SamplingFraction', Source = samplingFractionFolder)
 
-        samplingFractionTag = 'TileOfl02CalibSfr-SIM-02'
+        samplingFractionTag = None # Tag connected to global conditions tag is used by default
         if flags.GeoModel.Run >= LHCPeriod.Run4 or flags.Overlay.DataOverlay:
-            samplingFractionTag = 'TileOfl02CalibSfr-SIM-05'
+            samplingFractionTag = 'TileOfl02CalibSfr-SIM-07'
 
         from IOVDbSvc.IOVDbSvcConfig import addFolders
         acc.merge( addFolders(flags, samplingFractionFolder + f'<key>{samplingFractionFolder}</key>',

TileCalorimeter/TileSimAlgs/share/TileSamplingFraction_jobOptions.py

@@ -11,9 +11,6 @@ msg = logging.getLogger( 'TileSamplingFraction_jobOptions.py' )
 from TileConditions.TileInfoConfigurator import TileInfoConfigurator
 tileInfoConfigurator = TileInfoConfigurator()
 tileInfoConfigurator.setupCOOLSFR()
-# Temporary solution (this folder is only here)
-conddb.blockFolder('/TILE/OFL02/CALIB/SFR')
-conddb.addFolderWithTag('TILE_OFL','/TILE/OFL02/CALIB/SFR','TileOfl02CalibSfr-SIM-02',force=True,forceMC=True,className='CondAttrListCollection')
 
 try:
     from Digitization.DigitizationFlags import jobproperties