Add combined premixing workflows for Run 3

Configuration/PyReleaseValidation/python/relval_2017.py

@@ -22,9 +22,9 @@
 #        (TTbar trackingOnly, pixelTrackingOnly)
 #         he collapse: TTbar, TTbar PU, TTbar design
 #         ParkingBPH: TTbar
-#   2021 (ZMM, TTbar, ZEE, MinBias, TTbar PU, ZEE PU, TTbar design)
-#   2023 (TTbar, TTbar PU)
-#   2024 (TTbar, TTbar PU)
+#   2021 (ZMM, TTbar, ZEE, MinBias, TTbar PU, TTbar PU premix, ZEE PU, TTbar design)
+#   2023 (TTbar, TTbar PU, TTbar PU premix)
+#   2024 (TTbar, TTbar PU, TTbar PU premix)
 numWFIB = [10001.0,10002.0,10003.0,10004.0,10005.0,10006.0,10007.0,10008.0,10009.0,10059.0,10071.0,
            10042.0,10024.0,10025.0,10026.0,10023.0,10224.0,10225.0,10424.0,
            10024.1,10024.2,10024.3,10024.4,10024.5,
@@ -33,9 +33,9 @@
            10824.1,10824.5,
            10824.6,11024.6,11224.6,
            10824.8,
-           11650.0,11634.0,11646.0,11640.0,11834.0,11846.0,12024.0,
-           12434.0,12634.0,
-           12834.0,13034.0]
+           11650.0,11634.0,11646.0,11640.0,11834.0,11834.99,11846.0,12024.0,
+           12434.0,12634.0,12634.99,
+           12834.0,13034.0,13034.99]
 for numWF in numWFIB:
     if not numWF in _upgrade_workflows: continue
     workflows[numWF] = _upgrade_workflows[numWF]

Configuration/PyReleaseValidation/python/relval_upgrade.py

@@ -105,12 +105,20 @@ def makeStepName(key,frag,step,suffix):
             if upgradeDatasetFromFragment[frag]=="TTbar_13" and '2018' in key:
                 workflows[numWF+upgradeSteps['ParkingBPH']['offset']] = [ upgradeDatasetFromFragment[frag], stepList['ParkingBPH']]
 
+            inclPremix = 'PU' in key
+            if inclPremix:
+                inclPremix = False
+                for y in ['2021', '2023', '2024', '2026']:
+                    if y in key:
+                        inclPremix = True
+                        continue
+
             # premixing stage1, only for NuGun
-            if upgradeDatasetFromFragment[frag]=="NuGun" and 'PU' in key and '2026' in key:
+            if inclPremix and upgradeDatasetFromFragment[frag]=="NuGun":
                 workflows[numWF+upgradeSteps['Premix']['offset']] = [upgradeDatasetFromFragment[frag], stepList['Premix']]
 
             # premixing stage2, only for ttbar for time being
-            if 'PU' in key and '2026' in key and upgradeDatasetFromFragment[frag]=="TTbar_14TeV":
+            if inclPremix and upgradeDatasetFromFragment[frag]=="TTbar_14TeV":
                 slist = []
                 for step in stepList['baseline']:
                     s = step
@@ -124,6 +132,6 @@ def makeStepName(key,frag,step,suffix):
                                                       [slist[0]] +                      # Start with signal generation
                                                       stepList['Premix'] +              # Premixing stage1
                                                       [slist[1].replace("PUPRMX", "PUPRMXCombined")] + # Premixing stage2, customized for the combined (defined in relval_steps.py)
-                                                      slist[2:]]                        # Remaining standard steps
+                                                      filter(lambda x: "nano" not in x.lower(), slist[2:])]    # Remaining standard steps (excluding NANOAOD because of input file numbering mismatch)
 
             numWF+=1