From dafb7b0d9ea9caeb6ea250641fd7da9368d97c8d Mon Sep 17 00:00:00 2001
From: Gloria Corti <gloria.corti@cern.ch>
Date: Tue, 12 Dec 2023 18:48:30 +0100
Subject: [PATCH 1/2] add 2024 and Run3 datatypes
---
Det/DDDB/python/DDDB/Configuration.py | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/Det/DDDB/python/DDDB/Configuration.py b/Det/DDDB/python/DDDB/Configuration.py
index 11fbe899..6c1b6139 100755
--- a/Det/DDDB/python/DDDB/Configuration.py
+++ b/Det/DDDB/python/DDDB/Configuration.py
@@ -106,7 +106,7 @@ class DDDBConf(ConfigurableUser):
'DbRoot':
""" Root file of the detector description """,
'DataType':
- """ Symbolic name for the data type. Allowed values: ["2023", "2022", "2018", "2017", "2016", "2015", "2013", "2012", "2011", "2010", "2009","2008","Upgrade"] """,
+ """ Symbolic name for the data type. Allowed values: ["2024", "2023", "2022", "2018", "2017", "2016", "2015", "2013", "2012", "2011", "2010", "2009", "2008", "Run3", "Upgrade"] """,
'Simulation':
""" Boolean flag to select the simulation or real-data configuration """,
'InitialTime':
@@ -243,7 +243,8 @@ class DDDBConf(ConfigurableUser):
# by default, use the latest DQFLAGS tag for the requested data type
# (unless already set by a data type handler)
if not self.getProp("Simulation") and dataType not in ("Upgrade",
- "2022", "2023"):
+ "2022", "2023",
+ "2024", "Run3"):
self.__set_tag__(["DQFLAGS"], "<latest:{0}>".format(dataType))
# Get particle properties table from condDB
@@ -311,6 +312,13 @@ class DDDBConf(ConfigurableUser):
"EventClockSvc().InitialTime already set to %s UTC (requested %s UTC)",
t.isoformat(), utcDatetime.isoformat())
+ def __2024_conf__(self):
+ """
+ Default configuration for 2024 data
+ to be updated after final configuration is taken
+ """
+ pass
+
def __2023_conf__(self):
"""
Default configuration for 2023 data
@@ -445,6 +453,12 @@ class DDDBConf(ConfigurableUser):
else:
self.__set_tag__(["SIMCOND"], "sim-20090212")
+ def __Run3_conf__(self):
+ """
+ Default database for Run3 MonteCarlo production and analysis
+ """
+ pass # nothing special here
+
def __Upgrade_conf__(self):
"""
Default database for Upgrade MonteCarlo production and analysis
@@ -452,6 +466,7 @@ class DDDBConf(ConfigurableUser):
pass # nothing special here
__data_types_handlers__ = {
+ "2024": __2024_conf__,
"2023": __2023_conf__,
"2022": __2022_conf__,
"2018": __2018_conf__,
@@ -464,5 +479,6 @@ class DDDBConf(ConfigurableUser):
"2010": __2010_conf__,
"2009": __2009_conf__,
"2008": __2008_conf__,
+ "Run3": __Run3_conf__,
"Upgrade": __Upgrade_conf__
}
--
GitLab
From 8b37e46e27ec67e194bf0f22ea0285f57ea86fdd Mon Sep 17 00:00:00 2001
From: Menglin Xu <menglin.xu@cern.ch>
Date: Wed, 17 Apr 2024 09:56:41 +0200
Subject: [PATCH 2/2] change the default GeometryVerision seetting
---
Det/DDDB/python/DDDB/Configuration.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Det/DDDB/python/DDDB/Configuration.py b/Det/DDDB/python/DDDB/Configuration.py
index 6c1b6139..807ff65c 100755
--- a/Det/DDDB/python/DDDB/Configuration.py
+++ b/Det/DDDB/python/DDDB/Configuration.py
@@ -90,7 +90,7 @@ class DDDBConf(ConfigurableUser):
"GeometryLocation":
"",
"GeometryVersion":
- "trunk",
+ "run3/trunk",
"GeometryMain":
"LHCb.xml",
"ConditionsLocation":
--
GitLab