Allow duplicates only on demand

Author: AdrianoDee

Configuration/PyReleaseValidation/python/MatrixRunner.py

@@ -50,12 +50,15 @@ def runTests(self, opt):
         wfs_to_run = self.workFlows
         withDups = False
         if testList:
-            withDups = len(check_dups(testList))>0
+            if opt.allowDuplicates: 
+                withDups = len(check_dups(testList))>0
+            else:
+                testList = set(testList)
             wfs_to_run = [wf for wf in self.workFlows if float(wf.numId) in testList for i in range(Counter(testList)[wf.numId])]
 
         for n,wf in enumerate(wfs_to_run):
 
-            if withDups and opt.nProcs > 1: # to avoid overwriting the work areas
+            if opt.allowDuplicates and withDups and opt.nProcs > 1: # to avoid overwriting the work areas 
                 njob = n
 
             item = wf.nameId

Configuration/PyReleaseValidation/python/relval_data_highstats.py

@@ -59,7 +59,7 @@
             wf_number = wf_number + offset_pd * p_n
             wf_number = wf_number + offset_events * evs
             wf_number = round(wf_number,6)
-            step_name = "Run" + pd + era.split("Run")[1] + e_key
+            step_name = "Run" + pd + era.split("Run")[1] + "_" + e_key
             y = str(int(base_wf))
             suff = "ZB_" if "ZeroBias" in step_name else ""
             workflows[wf_number] = ['',[step_name,'HLTDR3_' + y,'RECONANORUN3_' + suff + 'reHLT_'+y,'HARVESTRUN3_' + suff + y]]

Configuration/PyReleaseValidation/python/relval_steps.py

@@ -4597,9 +4597,7 @@ def gen2024HiMix(fragment,howMuch):
 for gen in upgradeFragments:
     for ds in defaultDataSets:
         key=gen[:-4]+'_'+ds
-        version = "1"
-        if defaultDataSets[ds] == '' or ds =='Run4D98':
-            version = undefInput
+        version = undefInput if defaultDataSets[ds] == '' else '1'
         if key in versionOverrides:
             version = versionOverrides[key]
         baseDataSetReleaseBetter[key]=defaultDataSets[ds]+version

Configuration/PyReleaseValidation/scripts/runTheMatrix.py

@@ -30,7 +30,8 @@ def runSelected(opt):
         testSet = set(opt.testList)
         undefSet = testSet - definedSet
         if len(undefSet)>0: raise ValueError('Undefined workflows: '+', '.join(map(str,list(undefSet))))
-
+        if not opt.allowDuplicates:
+            testList = testSet
     ret = 0
     if opt.show:
         mrd.show(opt.testList, opt.extended, opt.cafVeto)
@@ -186,7 +187,13 @@ def runSelected(opt):
                         dest='recycle',
                         type=str,
                         default=None)
-                        
+
+    parser.add_argument('--allowDuplicates',
+                        help='Allow to have duplicate workflow numbers in the list',
+                        dest='allowDuplicates',
+                        default=False,
+                        action='store_true')
+
     parser.add_argument('--addMemPerCore',
                         help='increase of memory per each n > 1 core:  memory(n_core) = memoryOffset + (n_core-1) * memPerCore',
                         dest='memPerCore',