Updating matrix, IB tests and input datasets for 2024

cms-sw · Feb 25, 2024 · 41bbf53 · 41bbf53
1 parent 32b3592
commit 41bbf53
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 27 deletions.
diff --git a/Configuration/PyReleaseValidation/python/relval_2017.py b/Configuration/PyReleaseValidation/python/relval_2017.py
@@ -50,12 +50,16 @@
 #        (Nu Gun)
 #   2024 (TTbar, TTbar PU, TTbar PU premix)
 #        (TTbar trackingMkFit)
+#        (Alpaka Pixel Only, Alpaka ECal only)
+#        (TTbar FastSim, TTbar FastSim PU, MinBiasFS for mixing))
 #        (ZEE)
+#        (Nu Gun)
 
 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,
            10224.15,
+           # 2018
            10801.0,10802.0,10803.0,10804.0,10805.0,10806.0,10807.0,10808.0,10809.0,10859.0,10871.0,
            10804.31, 10805.31,
            10842.0,10824.0,10825.0,10826.0,10823.0,11024.0,11025.0,11224.0,
@@ -67,11 +71,11 @@
            10824.501,10824.505,
            10824.511,
            10824.521,
+           # 2021
            11634.911, 11650.911,
            11634.914, 11650.914,
            11601.0,11602.0,11603.0,11604.0,11605.0,11606.0,11607.0,11608.0,11609.0,11630.0,11643.0,
            11650.0,11634.0,11646.0,11640.0,11834.0,11834.99,11846.0,12034.0,
-           #11725.0,11925.0,
            11634.1,11634.5,11634.7,11634.71,11634.72,11634.91,
            11634.15,
            11634.24,11834.24,
@@ -81,6 +85,7 @@
            11834.21,
            11723.17,
            11634.601,
+           # 2023
            12434.0,12634.0,12634.99,
            12434.7,
            12434.501,12434.505,
@@ -90,9 +95,14 @@
            14034.0,14234.0,14040.303,
            12446.0,
            12461.0,	
+           # 2024
            12834.0,13034.0,13034.99,
            12834.7,
-           12846.0]
+           12846.0,
+           12834.402, 12834.412,
+           14434.0, 14634.0, 14440.303,
+           12846.0,
+           12861.0]
 
 for numWF in numWFIB:
     if not numWF in _upgrade_workflows:

diff --git a/Configuration/PyReleaseValidation/python/relval_gpu.py b/Configuration/PyReleaseValidation/python/relval_gpu.py
@@ -28,6 +28,9 @@
 #           full reco with Patatrack pixel-only quadruplets:    TTbar - on GPU (optional), GPU-vs-CPU validation
 #           full reco with Patatrack pixel-only triplets:       TTbar - on GPU (optional), GPU-vs-CPU validation
 #           Patatrack pixel-only quadruplets:                   Single Nu E10 on GPU (optional)
+# mc 2024   Alpaka pixel-only quadruplets:                      ZMM: any backend, any backend vs cpu validation, profiling
+#           Alpaka pixel-only quadruplets:                      TTbar: any backend, any backend vs cpu validation, profiling
+#           Alpaka ECAL-only:                                   TTbar: any backend 
 # mc 2026   Patatrack pixel-only quadruplets:                   Single Nu E10 on GPU (optional)
 numWFIB = [
            # 2023, Alpaka-based
@@ -49,6 +52,13 @@
            12434.592, 12434.593,
            12434.596, 12434.597,
            12461.502,
+           # 2024, Alpaka-based
+           12650.402, 12650.403, 12650.404,
+           #12650.406, 12650.407, 12650.408
+           12634.402, 12634.403, 12634.404,
+           #12634.406, 12634.407, 12634.408
+           12634.412, #12634.413, 12634.414
+           12661.402,
            # 2026, CUDA-based
            24861.502
         ]

diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py
@@ -4182,7 +4182,7 @@ def gen2023HiMix(fragment,howMuch):
 defaultDataSets['2021FS']='CMSSW_12_4_13-124X_mcRun3_2022_realistic_v12_2021_FastSim-v'
 defaultDataSets['2023']='CMSSW_13_0_10-130X_mcRun3_2023_realistic_withEarly2023BS_v1_2023-v'
 defaultDataSets['2023FS']='CMSSW_13_0_11-130X_mcRun3_2023_realistic_withEarly2023BS_v1_FastSim-v'
-defaultDataSets['2024']='CMSSW_12_5_0_pre4-124X_mcRun3_2024_realistic_v11_BS2022-v'
+defaultDataSets['2024']='CMSSW_14_0_0_pre3-140X_mcRun3_2024_realistic_v1_STD_2024_noPU-v'
 defaultDataSets['2026D49']='CMSSW_12_0_0_pre4-113X_mcRun4_realistic_v7_2026D49noPU-v'
 defaultDataSets['2026D76']='CMSSW_12_0_0_pre4-113X_mcRun4_realistic_v7_2026D76noPU-v'
 defaultDataSets['2026D77']='CMSSW_12_1_0_pre2-113X_mcRun4_realistic_v7_2026D77noPU-v'

diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
@@ -423,7 +423,7 @@ def setup__(self, step, stepName, stepDict, k, properties):
         if 'Digi' in step: stepDict[stepName][k] = merge([self.step2, stepDict[step][k]])
         if 'Reco' in step: stepDict[stepName][k] = merge([self.step3, stepDict[step][k]])
     def condition_(self, fragment, stepList, key, hasHarvest):
-        return ('2017' in key or '2021' in key or '2023' in key or '2024' in key) and ('FS' not in key)
+        return ('2017' in key or '2021' in key or '2023' in key and '2024' in key) and ('FS' not in key)
 upgradeWFs['trackingMkFit'] = UpgradeWorkflow_trackingMkFit(
     steps = [
         'Digi',
@@ -787,16 +787,9 @@ def condition(self, fragment, stepList, key, hasHarvest):
 
 
 # Patatrack workflows (NoPU and PU):
-#   - 2018 conditions, TTbar
-#   - 2018 conditions, Z->mumu
-#   - 2022 conditions (labelled "2021"), TTbar
-#   - 2022 conditions (labelled "2021"), NuGun
-#   - 2022 conditions (labelled "2021"), Z->mumu
-#   - 2023 conditions, TTbar
-#   - 2023 conditions, NuGun
-#   - 2023 conditions, Z->mumu
-#   - 2026 conditions, TTbar
-#   - 2026 conditions, NuGu
+#   - TTbar_14, ZMM_14", ZEE_14, ZTT_14, NuGun, SingleMu, QCD_Pt15To7000_Flat for
+#       > 2021, 2022, 2023, 2024 and 2026 conditions, TTbar
+#   - Hydjet for HI conditions
 class PatatrackWorkflow(UpgradeWorkflow):
     def __init__(self, digi = {}, reco = {}, mini = {}, harvest = {}, **kwargs):
         # adapt the parameters for the UpgradeWorkflow init method
@@ -850,17 +843,11 @@ def __init__(self, digi = {}, reco = {}, mini = {}, harvest = {}, **kwargs):
 
     def condition(self, fragment, stepList, key, hasHarvest):
         # select only a subset of the workflows
+        years = ['2021','2023','2024','2026']
+        fragments = ["TTbar_14","ZMM_14","ZEE_14","ZTT_14","NuGun","SingleMu","QCD_Pt15To7000_Flat"]
         selected = [
-            ('2018' in key and fragment == "TTbar_13"),
-            ('2021' in key and fragment == "TTbar_14TeV" and 'FS' not in key),
-            ('2023' in key and fragment == "TTbar_14TeV" and 'FS' not in key),
-            ('2021' in key and fragment == "NuGun"),
-            ('2023' in key and fragment == "NuGun"),
-            ('2018' in key and fragment == "ZMM_13"),
-            ('2021' in key and fragment == "ZMM_14" and 'FS' not in key),
-            ('2023' in key and fragment == "ZMM_14" and 'FS' not in key),
-            ('2026' in key and (fragment == "TTbar_14TeV" or fragment=="NuGun")),
-            (('HI' in key) and 'Hydjet' in fragment and "PixelOnly" in self.suffix )
+            (any(y in key for y in years) and ('FS' not in key) and any( f in fragment for f in fragments)),
+            (('HI' in key) and ('Hydjet' in fragment) and ("PixelOnly" in self.suffix) )
         ]
         result = any(selected) and hasHarvest
 

diff --git a/Configuration/PyReleaseValidation/scripts/README.md b/Configuration/PyReleaseValidation/scripts/README.md
@@ -321,9 +321,10 @@ MC workflows for pp collisions:
 | 11634.0 	| TTbar_14TeV 	| phase1_2022_realistic 	| Run3 	|  	|  	
 | 13234.0 	| RelValTTbar_14TeV 	| phase1_2022_realistic 	| Run3_FastSim 	| *FastSim*  |  	
 | 12434.0 	| RelValTTbar_14TeV 	| phase1_2023_realistic 	| Run3_2023 	|  	|  	
-| 12446.0 	| RelValZEE_14 	| phase1_2023_realistic 	| Run3_2023 	|  	|  	
-| 12634.0 	| RelValTTbar_14TeV 	| phase1_2023_realistic 	| Run3_2023 	|  Run3_Flat55To75_PoissonOOTPU 	|  	
-| 12434.7 	| RelValTTbar_14TeV 	| phase1_2023_realistic 	| Run3_2023 	| mkFit 	|  	
+| 12834.0 	| RelValTTbar_14TeV 	| phase1_2023_realistic 	| Run3_2024 	|  	| 
+| 12846.0 	| RelValZEE_14 	| phase1_2023_realistic 	| Run3_2024 	|  	|  	
+| 13034.0 	| RelValTTbar_14TeV 	| phase1_2023_realistic 	| Run3_2024 	|  Run3_Flat55To75_PoissonOOTPU 	|  	
+| 12834.7 	| RelValTTbar_14TeV 	| phase1_2023_realistic 	| Run3_2024 	| mkFit 	|  	
 | 14034.0 	| RelValTTbar_14TeV 	| phase1_2023_realistic 	| Run3_2023_FastSim 	|  	*FastSim* |  	
 | 14234.0 	| RelValTTbar_14TeV 	| phase1_2023_realistic 	| Run3_2023_FastSim 	| *FastSim*  Run3_Flat55To75_PoissonOOTPU 	|  	
 | 2500.4 	| RelValTTbar_14TeV 	| phase1_2022_realistic 	| Run3 	| NanoAOD from existing MINI 	|  	

diff --git a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py
@@ -80,6 +80,7 @@ def runSelected(opt):
                     # Run3
                     11634.0,    # TTbar_14TeV                   2021
                     13234.0,    # RelValTTbar_14TeV             2021 FastsSim
+                    12434.0,    # RelValTTbar_14TeV             2023
                     12834.0,    # RelValTTbar_14TeV             2024
                     12846.0,    # RelValZEE_13                  2024
                     13034.0,    # RelValTTbar_14TeV             2024 PU = Run3_Flat55To75_PoissonOOTPU