Only run workflow 1000 over Run 1 skims

Author: flodamas

Configuration/Applications/python/ConfigBuilder.py

@@ -1909,10 +1909,16 @@ def prepare_SKIM(self, stepSpec = "all"):
             print("replacing %s process name - step SKIM:%s will use '%s'" % (stdHLTProcName, sequence, newHLTProcName))
 
         ## support @Mu+DiJet+@Electron configuration via autoSkim.py
-        from Configuration.Skimming.autoSkim import autoSkim
+        from Configuration.Skimming.autoSkim import autoSkim, autoSkimRunI
         skimlist = sequence.split('+')
         self.expandMapping(skimlist,autoSkim)
 
+        autoSkimRunIList = list(set(
+            item
+            for v in autoSkimRunI.values()
+            for item in v.split('+')
+        ))
+
         #print("dictionary for skims:", skimConfig.__dict__)
         for skim in skimConfig.__dict__:
             skimstream = getattr(skimConfig, skim)
@@ -1931,6 +1937,10 @@ def prepare_SKIM(self, stepSpec = "all"):
             shortname = skim.replace('SKIMStream','')
             if (sequence=="all"):
                 self.addExtraStream(skim,skimstream)
+            elif (sequence=="allRun1"):
+                if not shortname in autoSkimRunIList:
+                    continue
+                self.addExtraStream(skim,skimstream)
             elif (shortname in skimlist):
                 self.addExtraStream(skim,skimstream)
                 #add a DQM eventcontent for this guy
@@ -1948,7 +1958,7 @@ def prepare_SKIM(self, stepSpec = "all"):
                 for i in range(skimlist.count(shortname)):
                     skimlist.remove(shortname)
 
-        if (skimlist.__len__()!=0 and sequence!="all"):
+        if (skimlist.__len__()!=0 and sequence!="all" and sequence!="allRun1"):
             print('WARNING, possible typo with SKIM:'+'+'.join(skimlist))
             raise Exception('WARNING, possible typo with SKIM:'+'+'.join(skimlist))
 

Configuration/PyReleaseValidation/python/relval_production.py

@@ -9,7 +9,7 @@
 # the name of step1 will be used
 
 ## data production test
-workflows[1000] = [ '',['RunMinBias2011A','TIER0','SKIMD','HARVESTDfst2','ALCASPLIT']]
+workflows[1000] = [ '',['RunMinBias2011A','TIER0','SKIMDRun1','HARVESTDfst2','ALCASPLIT']]
 workflows[1001] = [ '',['RunMinBias2011A','TIER0EXP','ALCAEXP','ALCAHARVDSIPIXELCALRUN1','ALCAHARVD1','ALCAHARVD2','ALCAHARVD3','ALCAHARVD4','ALCAHARVD5','ALCAHARVD7','ALCAHARVD8']]
 workflows[1001.2] = [ '',['RunZeroBias2017F','TIER0EXPRUN2','ALCAEXPRUN2','ALCAHARVDSIPIXELCAL','ALCAHARVDSIPIXELCALLA','ALCAHARVD4','ALCAHARVDSIPIXELALIHG']]
 workflows[1001.3] = [ '',['RunSingleMuon2022B','TIER0EXPRUN3','ALCAEXPRUN3','ALCAHARVDEXPRUN3']]

Configuration/PyReleaseValidation/python/relval_steps.py

@@ -4418,6 +4418,13 @@ def gen2024HiMix(fragment,howMuch):
 
 steps['SKIMDreHLT'] = merge([ {'--conditions':'auto:run1_data_%s'%menu, '--hltProcess':'reHLT', '--filein':'file:step3.root'}, steps['SKIMD'] ])
 
+steps['SKIMDRun1']={'-s':'SKIM:allRun1',
+                '--conditions':'auto:run1_data',
+                '--data':'',
+                '--scenario':'pp',
+                '--filein':'file:step2.root',
+                '--secondfilein':'filelist:step1_dasquery.log'}
+
 steps['SKIMCOSD']={'-s':'SKIM:all',
                    '--conditions':'auto:run1_data',
                    '--data':'',