Merge pull request #16168 from boudoul/alcaphase1

introducing AlcaRecos in 2017 WFs
cms-sw · Oct 12, 2016 · b89c45e · b89c45e
2 parents 8eb4915 + 1a949a2
commit b89c45e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py
@@ -1750,7 +1750,8 @@ def lhegensim(fragment,howMuch):
                                     '--mc':'',
                                     '--geometry' : geom,
                                     '--scenario' : 'pp',
-                                    '--filetype':'DQM'
+                                    '--filetype':'DQM',
+				    '--filein':'file:step3_inDQM.root'
                                     }
     if cust!=None : upgradeStepDict['HARVESTFull'][k]['--customise']=cust
     if era is not None: upgradeStepDict['HARVESTFull'][k]['--era']=era
@@ -1765,6 +1766,20 @@ def lhegensim(fragment,howMuch):
         upgradeStepDict['HARVESTFull_trackingOnlyPU'][k]=merge([PUDataSets[k2],upgradeStepDict['HARVESTFull_trackingOnly'][k]])
         upgradeStepDict['HARVESTFullGlobalPU'][k]=merge([PUDataSets[k2],upgradeStepDict['HARVESTFullGlobal'][k]])
 
+
+
+    upgradeStepDict['ALCAFull'][k] = {'-s':'ALCA:TkAlMuonIsolated+TkAlMinBias+MuAlOverlaps+EcalESAlign',
+                                      '--conditions':gt,
+                                      '--datatier':'ALCARECO',
+                                      '-n':'10',
+                                      '--eventcontent':'ALCARECO',
+                                      '--geometry' : geom
+                                      }
+    if cust!=None : upgradeStepDict['RecoFull'][k]['--customise']=cust
+    if era is not None: upgradeStepDict['RecoFull'][k]['--era']=era
+
+
+
     upgradeStepDict['FastSim'][k]={'-s':'GEN,SIM,RECO,VALIDATION',
                                    '--eventcontent':'FEVTDEBUGHLT,DQM',
                                    '--datatier':'GEN-SIM-DIGI-RECO,DQMIO',

diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
@@ -53,7 +53,8 @@
     'HARVESTFull_trackingOnly',
     'HARVESTFull_trackingOnlyPU',
     'HARVESTFullGlobal',
-    'HARVESTFullGlobalPU'
+    'HARVESTFullGlobalPU',
+    'ALCAFull'
 ]
 
 upgradeProperties = {}
@@ -63,25 +64,25 @@
         'Geom' : 'DB:Extended',
         'GT' : 'auto:phase1_2017_realistic',
         'Era' : 'Run2_2017',
-        'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+        'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','ALCAFull','HARVESTFull'],
     },
     '2017NewFPix' : {
         'Geom' : 'Extended2017NewFPix',
         'GT' : 'auto:phase1_2017_realistic',
         'Era' : 'Run2_2017_NewFPix',
-        'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+        'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','ALCAFull','HARVESTFull'],
     },
     '2017HCALdev' : {
         'Geom' : 'Extended2017dev',
         'GT' : 'auto:phase1_2017_hcaldev',
         'Era' : 'Run2_2017_HCALdev',
-        'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+        'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','ALCAFull','HARVESTFull'],
     },
     '2017AllNew' : {
         'Geom' : 'Extended2017new',
         'GT' : 'auto:phase1_2017_hcaldev',
         'Era' : 'Run2_2017_new',
-        'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+        'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','ALCAFull','HARVESTFull'],
     },
 }