diff --git a/Det/DDDB/python/DDDB/Configuration.py b/Det/DDDB/python/DDDB/Configuration.py index 147996238cd9f86e63f3041d2599165edf390e8b..327d9c64d62006b3024cb30c4cda69a128dbe149 100755 --- a/Det/DDDB/python/DDDB/Configuration.py +++ b/Det/DDDB/python/DDDB/Configuration.py @@ -72,7 +72,7 @@ class DDDBConf(ConfigurableUser): } _propertyDocDct = { 'DbRoot' : """ Root file of the detector description """, - 'DataType' : """ Symbolic name for the data type. Allowed values: ["2016", "2015", "2013", "2012", "2011", "2010", "2009","2008","Upgrade"] """, + 'DataType' : """ Symbolic name for the data type. Allowed values: ["2016", "2015", "2013", "2012", "2011", "2010", "2009","2008"] """, 'Simulation' : """ Boolean flag to select the simulation or real-data configuration """, 'InitialTime' : """ How to set the initial time. None/'Safe' uses a list of dummy times for each year and sets that time. 'Now' uses the current time. Sepcifying a number assumes that is a time in utc.""", 'OnlineMode' : """ To use to run online jobs (Monitoring, ...) """, @@ -182,10 +182,11 @@ class DDDBConf(ConfigurableUser): raise ValueError("Invalid value %r for property DetDesc().DataType." " (allowed: %r)"% (dataType, self.__data_types_handlers__.keys())) - if dataType in [ "Upgrade" ]: - sim = self.getProp("Simulation") - if not sim: - log.info("%s data is _always_ simulation", dataType ) + if dataType not in self.__data_types_handlers__: + raise ValueError( + "Invalid value %r for property DetDesc().DataType." + " (allowed: %r)" % (dataType, + self.__data_types_handlers__.keys())) # calls the specific configuration function for the requested data type self.__data_types_handlers__[dataType](self) @@ -342,13 +343,6 @@ class DDDBConf(ConfigurableUser): else: self.__set_tag__(["SIMCOND"], "sim-20090212") - def __Upgrade_conf__(self): - """ - Default database for Upgrade MonteCarlo production and analysis - """ - # Need also to change connection string to DDDB - CondDB().PartitionConnectionString = {"DDDB":"sqlite_file:$SQLITEDBPATH/DDDB_upgrade.db/DDDB"} - __data_types_handlers__ = { "2016": __2016_conf__, "2015": __2015_conf__, "2013": __2013_conf__, @@ -356,5 +350,4 @@ class DDDBConf(ConfigurableUser): "2011": __2011_conf__, "2010": __2010_conf__, "2009": __2009_conf__, - "2008": __2008_conf__, - "Upgrade": __Upgrade_conf__ } + "2008": __2008_conf__ } diff --git a/Det/DetCond/python/DetCond/Configuration.py b/Det/DetCond/python/DetCond/Configuration.py index 7e7f1918f5795e83e01a91ce8cffb66f2c3a8301..0524a3f7abd50f41df31542c8272c1930093a823 100644 --- a/Det/DetCond/python/DetCond/Configuration.py +++ b/Det/DetCond/python/DetCond/Configuration.py @@ -34,7 +34,6 @@ class CondDB(ConfigurableUser): """ __slots__ = { "Tags" : {}, "Simulation" : False, - "Upgrade" : False, "UseOracle" : False, "LocalTags" : {}, "LogFile" : "", @@ -70,7 +69,6 @@ class CondDB(ConfigurableUser): 'Tags' : """ Dictionary of tags (partition:tag) to use for the COOL databases. """ """The special tag value '<latest:DataType>' can be used to select the latest global tag for the specified DataType """, 'Simulation' : """ Boolean flag to select the simulation or real-data configuration """, - 'Upgrade' : """ Boolean flag to select the Upgrade simulation configuration """, 'UseOracle' : """ Boolean flag to enable the usage of the CondDB from Oracle servers. NB: Obsolete as Oracle support is now dropped""", 'LocalTags' : """ Dictionary with local tags to use to override the global ones (partition: list of local tags) """, 'LogFile' : """ Record the requests to the database the specified file """, @@ -264,8 +262,6 @@ class CondDB(ConfigurableUser): return tag, [] from CondDBUI.Admin.TagsFilter import last_gt_lts rel_notes = None - if self.getProp('Upgrade'): - rel_notes = os.path.join(os.environ['SQLITEUPGRADEDBPATH'], '..', 'doc', 'release_notes.xml') tags = last_gt_lts(partition, datatype, rel_notes) if not tags: raise NoTagError(partition, datatype) @@ -330,9 +326,6 @@ class CondDB(ConfigurableUser): # Set the latest tags from CondDBUI.Admin.TagsFilter import all_lts rel_notes = None - if self.getProp('Upgrade'): - rel_notes = os.path.join(os.environ['SQLITEUPGRADEDBPATH'], '..', 'doc', 'release_notes.xml') - for partition in partitions: local_tags = [] for dt in DataTypes: @@ -452,8 +445,8 @@ class CondDB(ConfigurableUser): from DDDB.Configuration import GIT_CONDDBS - # In the Online/Upgrade/Simulation/GitCondDB environment, LoadCALIBDB should be defaulted to HLT1 - if self.getProp("Online") or self.getProp('Upgrade') or self.getProp('Simulation') or GIT_CONDDBS: + # In the Online/Simulation/GitCondDB environment, LoadCALIBDB should be defaulted to HLT1 + if self.getProp("Online") or self.getProp('Simulation') or GIT_CONDDBS: self._properties["LoadCALIBDB"].setDefault("HLT1") # Set up environment variables for loading CALIBOFF layers, must be before loading any tags LoadCALIBDB = self.getProp('LoadCALIBDB') @@ -536,7 +529,6 @@ class CondDB(ConfigurableUser): ("SIMCOND", CondDBAccessSvc), ("DQFLAGS", CondDBAccessSvc)] if LoadCALIBDB is "OFFLINE": - # CALIBOFF not needed for the upgrade parttypes += [("CALIBOFF", CondDBAccessSvc)] else: # ignore CALIBOFF tag if we do not need CALIBOFF @@ -551,9 +543,6 @@ class CondDB(ConfigurableUser): partition[p].ConnectionString = conns[p] del conns[p] - # Override connection strings for Upgrade case - if self.getProp('Simulation') and self.getProp('Upgrade') and type(partition[p]) is CondDBAccessSvc: - partition[p].ConnectionString = os.path.join('sqlite_file:$SQLITEUPGRADEDBPATH', p + '.db', p) # Override tags if p in tags and p != "ONLINE": partition[p].DefaultTAG = tags[p] @@ -697,11 +686,6 @@ class CondDB(ConfigurableUser): if ger: if not ger.isPropertySet('Commit'): ger.Commit = self.getProp("Tags").get(partition, 'HEAD') - if (self.getProp('Upgrade') and - not (ger.Commit.startswith('upgrade/') or - ger.Commit in ('', 'HEAD', 'upgrade') or - re.match(r'^[0-9a-f]{7,40}$', ger.Commit))): - ger.Commit = 'upgrade/' + ger.Commit VFSSvc().FileAccessTools.append(ger) if localTags.get(partition): log.warning('local tags in %s are ignored', partition) diff --git a/Det/DetDescChecks/python/DetDescChecks/Options.py b/Det/DetDescChecks/python/DetDescChecks/Options.py index d85f64bb1c9157dfb322ba4cc6d44e7d102fadf4..262203f4685a803b5d2bf80918dcb8bc2f385b54 100644 --- a/Det/DetDescChecks/python/DetDescChecks/Options.py +++ b/Det/DetDescChecks/python/DetDescChecks/Options.py @@ -12,8 +12,7 @@ def LoadDDDBTest(datatype, sim=False, loctags=True, paths=None): IgnoreHeartBeat = True, EnableRunStampCheck = False) # Set up conditions database configuration (ignore checks for up-to-date) - CondDB(Upgrade = datatype == "Upgrade", - LatestGlobalTagByDataTypes = [datatype], + CondDB(LatestGlobalTagByDataTypes = [datatype], LatestLocalTagsByDataType = [datatype] if loctags else []) # Set up application main = GaudiSequencer(MeasureTime=True) diff --git a/Kernel/LHCbAlgs/python/LHCbAlgs/Configuration.py b/Kernel/LHCbAlgs/python/LHCbAlgs/Configuration.py index 48b02852a5f6bcdc0d21cc3ae7a35c3544651171..1f6ecf669b3cf9d6a05e94c6bd89fa8d9ff451bb 100755 --- a/Kernel/LHCbAlgs/python/LHCbAlgs/Configuration.py +++ b/Kernel/LHCbAlgs/python/LHCbAlgs/Configuration.py @@ -73,19 +73,12 @@ class LHCbApp(LHCbConfigurableUser): "velo" : "Velo", "puveto" : "PuVeto", "muon" : "Muon", - "muonnom1" : "MuonNoM1", "it" : "IT", - "ot" : "OT", "tt" : "TT", "rich" : "Rich", - "richpmt" : "RichPmt", "rich1" : "Rich1", "rich2" : "Rich2", - "rich1pmt" : "Rich1Pmt", - "rich2pmt" : "Rich2Pmt", - "rich1horiz" : "Rich1Horiz", "magnet" : "Magnet", - "compact" : "Compact", "ot" : "OT" } @@ -97,18 +90,6 @@ class LHCbApp(LHCbConfigurableUser): detList.append( det.lower() ) return detList - def upgradeDetectors(self): - upgradeDetectorList = [] - if self.isPropertySet("Detectors"): - tmpUpgradeDetectorList = [det for det in self.createDetList() if det not in self.__nominalDetectors] - for det in tmpUpgradeDetectorList: - if self.__dtMapping.has_key(det): - upgradeDetectorList.append( self.__dtMapping[det] ) - else: - log.warning("Unknown Upgrade detector: %s" %(det)) - return upgradeDetectorList - - def knownMonitors(self): return ["SC", "FPE"]