Fix oracle implementation of nano flavours

dmwm · Jan 22, 2025 · 304689b · 304689b
1 parent 1db87d7
commit 304689b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/python/T0/WMBS/Oracle/Create.py b/src/python/T0/WMBS/Oracle/Create.py
@@ -338,7 +338,7 @@ def __init__(self, logger = None, dbi = None, params = None):
                  alca_skim      varchar2(700),
                  physics_skim   varchar2(700),
                  dqm_seq        varchar2(700),
-                 nano_flavour   varchar2(700),
+                 nano_flavour   varchar2(50),
                  primary key (run_id, primds_id)
                ) ORGANIZATION INDEX"""
 

diff --git a/src/python/T0/WMBS/Oracle/RunConfig/GetRecoConfig.py b/src/python/T0/WMBS/Oracle/RunConfig/GetRecoConfig.py
@@ -24,6 +24,7 @@ def execute(self, run, stream, conn = None, transaction = False):
                         reco_config.proc_version,
                         reco_config.alca_skim,
                         reco_config.dqm_seq,
+                        reco_config.nano_flavour,
                         cmssw_version.name,
                         reco_config.scram_arch,
                         reco_config.multicore,
@@ -69,10 +70,11 @@ def execute(self, run, stream, conn = None, transaction = False):
             resultDict[primds]['proc_ver'] = result[8]
             resultDict[primds]['alca_skim'] = result[9]
             resultDict[primds]['dqm_seq'] = result[10]
-            resultDict[primds]['cmssw'] = result[11]
-            resultDict[primds]['scram_arch'] = result[12]
-            resultDict[primds]['multicore'] = result[13]
-            resultDict[primds]['global_tag'] = result[14]
-            resultDict[primds]['scenario'] = result[15]
+            resultDict[primds]['nano_flavour'] = result[11]
+            resultDict[primds]['cmssw'] = result[12]
+            resultDict[primds]['scram_arch'] = result[13]
+            resultDict[primds]['multicore'] = result[14]
+            resultDict[primds]['global_tag'] = result[15]
+            resultDict[primds]['scenario'] = result[16]
 
         return resultDict
diff --git a/src/python/T0/WMBS/Oracle/RunConfig/InsertRecoConfig.py b/src/python/T0/WMBS/Oracle/RunConfig/InsertRecoConfig.py
@@ -14,7 +14,7 @@ def execute(self, binds, conn = None, transaction = False):
         sql = """INSERT INTO reco_config
                  (RUN_ID, PRIMDS_ID, DO_RECO, RECO_SPLIT, WRITE_RECO, WRITE_DQM,
                   WRITE_AOD, WRITE_MINIAOD, WRITE_NANOAOD, PROC_VERSION, ALCA_SKIM, PHYSICS_SKIM,
-                  DQM_SEQ, CMSSW_ID, MULTICORE, SCRAM_ARCH, GLOBAL_TAG)
+                  DQM_SEQ, NANO_FLAVOUR, CMSSW_ID, MULTICORE, SCRAM_ARCH, GLOBAL_TAG)
                  VALUES (:RUN,
                          (SELECT id FROM primary_dataset WHERE name = :PRIMDS),
                          :DO_RECO,
@@ -28,6 +28,7 @@ def execute(self, binds, conn = None, transaction = False):
                          :ALCA_SKIM,
                          :PHYSICS_SKIM,
                          :DQM_SEQ,
+                         :NANO_FLAVOUR,
                          (SELECT id FROM cmssw_version WHERE name = :CMSSW),
                          :MULTICORE,
                          :SCRAM_ARCH,