Merge pull request #35 from hufnagel/extend-reco-config

add data tiers and number of threads to reco config, fixes #30
dmwm · Mar 9, 2018 · 2ef5df5 · 2ef5df5
2 parents 7eb4067 + 8e0c1f5
commit 2ef5df5
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 6 deletions.
diff --git a/etc/OracleSchema.sql b/etc/OracleSchema.sql
@@ -8,6 +8,9 @@ CREATE TABLE express_config (
   scram_arch varchar2(50) not null,
   global_tag varchar2(50) not null,
   scenario varchar2(50) not null,
+  multicore int not null default 4,
+  write_tiers varchar2(255),
+  write_dqm int default 0 not null,
   reco_cmssw varchar2(255),
   reco_scram_arch varchar2(50),
   alca_skim varchar2(700),
@@ -22,6 +25,11 @@ CREATE TABLE reco_config (
   scram_arch varchar2(50) not null,
   global_tag varchar2(50) not null,
   scenario varchar2(50) not null,
+  multicore int default 4 not null,
+  write_reco int default 0 not null,
+  write_dqm int default 0 not null,
+  write_aod int default 0 not null,
+  write_miniaod int default 0 not null,
   alca_skim varchar2(700),
   physics_skim varchar2(700),
   dqm_seq varchar2(700),

diff --git a/src/python/DataExpressConfig.py b/src/python/DataExpressConfig.py
@@ -34,7 +34,10 @@ def get(self,run, stream):
                     express_config.alca_skim,
                     express_config.dqm_seq,
                     express_config.global_tag,
-                    express_config.scenario
+                    express_config.scenario,
+                    express_config.multicore,
+                    express_config.write_tiers,
+                    express_config.write_dqm
              FROM express_config
              WHERE %s %s"""
 
@@ -48,7 +51,8 @@ def get(self,run, stream):
     configs = []
     for result in c.fetchall():
 
-        (run, stream, cmssw, scram_arch, reco_cmssw, reco_scram_arch, alca_skim, dqm_seq, global_tag, scenario) = result
+        (run, stream, cmssw, scram_arch, reco_cmssw, reco_scram_arch, alca_skim,
+         dqm_seq, global_tag, scenario, multicore, write_tiers, write_dqm) = result
 
         config = { "run" : run,
                    "stream" : stream,
@@ -59,7 +63,10 @@ def get(self,run, stream):
                    "alca_skim" : alca_skim,
                    "dqm_seq" : dqm_seq,
                    "global_tag" : global_tag,
-                   "scenario" : scenario }
+                   "scenario" : scenario,
+                   "multicore" : multicore,
+                   "write_tiers" : write_tiers,
+                   "write_dqm" : bool(write_dqm) }
         configs.append(config)
 
     return configs
diff --git a/src/python/DataRecoConfig.py b/src/python/DataRecoConfig.py
@@ -33,7 +33,12 @@ def get(self,run, primary_dataset):
                     reco_config.physics_skim,
                     reco_config.dqm_seq,
                     reco_config.global_tag,
-                    reco_config.scenario
+                    reco_config.scenario,
+                    reco_config.multicore,
+                    reco_config.write_reco,
+                    reco_config.write_dqm,
+                    reco_config.write_aod,
+                    reco_config.write_miniaod
              FROM reco_config
              WHERE %s %s"""
 
@@ -47,7 +52,8 @@ def get(self,run, primary_dataset):
     configs = []
     for result in c.fetchall():
 
-        (run, primds, cmssw, scram_arch, alca_skim, physics_skim, dqm_seq, global_tag, scenario) = result
+        (run, primds, cmssw, scram_arch, alca_skim, physics_skim, dqm_seq,
+         global_tag, scenario, multicore, write_reco, write_dqm, write_aod, write_miniaod) = result
 
         config = { "run" : run,
                    "primary_dataset" : primds,
@@ -57,7 +63,12 @@ def get(self,run, primary_dataset):
                    "physics_skim" : physics_skim,
                    "dqm_seq" : dqm_seq,
                    "global_tag" : global_tag,
-                   "scenario" : scenario }
+                   "scenario" : scenario,
+                   "multicore" : multicore,
+                   "write_reco": bool(write_reco),
+                   "write_dqm" : bool(write_dqm),
+                   "write_aod" : bool(write_aod),
+                   "write_miniaod" : bool(write_miniaod) }
         configs.append(config)
 
     return configs