Merge pull request #39078 from nurfikri89/portFrom125XTo124X_JMENanoR…

…un3_forPR

[JMENanoAOD] Backport of #39000 (Updates for Run-3) to 12_4_X

Configuration/PyReleaseValidation/python/relval_2017.py

@@ -16,14 +16,14 @@
 #   2017 (ele guns 10, 35, 1000; pho guns 10, 35; mu guns 1, 10, 100, 1000, QCD 3TeV, QCD Flat)
 #        (ZMM, TTbar, ZEE, MinBias, TTbar PU, ZEE PU, TTbar design)
 #        (TTbar trackingOnly, trackingRun2, trackingOnlyRun2, trackingLowPU, pixelTrackingOnly)
-#        (TTbar PU with JME NanoAOD, disable for now due to Run-3 Nano-Prompt preparation)
+#        (TTbar PU with JME NanoAOD)
 #   2018 (ele guns 10, 35, 1000; pho guns 10, 35; mu guns 1, 10, 100, 1000, QCD 3TeV, QCD Flat)
 #        (pho guns 10, 35 with photonDRN enabled)
 #   2018 (ZMM, TTbar, ZEE, MinBias, TTbar PU, ZEE PU, TTbar design)
 #        (TTbar trackingOnly, pixelTrackingOnly)
 #        (HE collapse: TTbar, TTbar PU, TTbar design)
 #        (ParkingBPH: TTbar)
-#        (TTbar PU with JME NanoAOD, disable for now due to Run-3 Nano-Prompt preparation)
+#        (TTbar PU with JME NanoAOD)
 #        (Patatrack pixel-only: ZMM - on CPU: quadruplets, triplets)
 #        (Patatrack pixel-only: TTbar - on CPU: quadruplets, triplets)
 #        (Patatrack ECAL-only: TTbar - on CPU)
@@ -33,6 +33,7 @@
 #        (ele guns 10, 35, 1000; pho guns 10, 35; mu guns 1, 10, 100, 1000, QCD 3TeV, QCD Flat)
 #        (ZMM, TTbar, ZEE, MinBias, TTbar PU, TTbar PU premix, ZEE PU, TTbar design, GluGluTo2Jets, GluGluTo2Jets PU)
 #        (TTbar trackingOnly, pixelTrackingOnly, trackingMkFit, trackdnn)
+#        (TTbar with JME NanoAOD)
 #        (Patatrack pixel-only: ZMM - on CPU: quadruplets, triplets)
 #        (Patatrack pixel-only: TTbar - on CPU: quadruplets, triplets)
 #        (Patatrack ECAL-only: TTbar - on CPU)
@@ -48,14 +49,14 @@
 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,
+           10224.15,
            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,
            10824.1,10824.5,
            10824.6,11024.6,11224.6,
            10824.8,
-           #11024.15,
+           11024.15,
            10842.501,10842.505,
            10824.501,10824.505,
            10824.511,
@@ -65,6 +66,7 @@
            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,
            11650.501,11650.505,
            11634.501,11634.505,
            11634.511,

Configuration/PyReleaseValidation/python/relval_pileup.py

@@ -39,7 +39,7 @@
 workflows[25202]=['',['TTbar_13','DIGIUP15_PU25','RECOUP15_PU25','HARVESTUP15_PU25','NANOUP15_PU25']]
 workflows[25202.1]=['',['TTbar_13','DIGIUP15APVSimu_PU25','RECOUP15_PU25','HARVESTUP15_PU25']]
 workflows[25202.2]=['',['TTbar_13','DIGIUP15APVSimu_PU25','RECOUP15_PU25_HIPM','HARVESTUP15_PU25']]
-#workflows[25202.15]=['',['TTbar_13','DIGIUP15_PU25','RECOUP15_PU25','HARVESTUP15_PU25','NANOUP15MC_PU25_JME']] #JME NanoAOD, disable until Nano-Run3 prompt dev is done
+workflows[25202.15]=['',['TTbar_13','DIGIUP15_PU25','RECOUP15_PU25','HARVESTUP15_PU25','NANOUP15MC_PU25_JME']]
 workflows[25203]=['',['H125GGgluonfusion_13','DIGIUP15_PU25','RECOUP15_PU25','HARVESTUP15_PU25','NANOUP15_PU25']]
 workflows[25204]=['',['QQH1352T_13','DIGIUP15_PU25','RECOUP15_PU25','HARVESTUP15_PU25']]
 workflows[25205]=['',['ZTT_13','DIGIUP15_PU25','RECOUP15_PU25','HARVESTUP15_PU25','NANOUP15_PU25']]

Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

@@ -1412,10 +1412,11 @@ def setup_(self, step, stepName, stepDict, k, properties):
         if 'Nano' in step:
             stepDict[stepName][k] = merge([{'--customise': 'PhysicsTools/NanoAOD/custom_jme_cff.PrepJMECustomNanoAOD_MC'}, stepDict[step][k]])
     def condition(self, fragment, stepList, key, hasHarvest):
-        return fragment=="TTbar_13" and ('2017' in key or '2018' in key)
+        return (fragment=="TTbar_13" or fragment=="TTbar_14TeV") and ('2017' in key or '2018' in key or '2021' in key) and ('FS' not in key)
 upgradeWFs['JMENano'] = UpgradeWorkflow_JMENano(
     steps = [
         'Nano',
+        'RecoNano',
     ],
     PU = [],
     suffix = '_JMENano',