From b8aae3ac2d5fe076f6e7145e28c5735719055549 Mon Sep 17 00:00:00 2001
From: Sunil <subansal@cern.ch>
Date: Wed, 23 Nov 2022 17:43:41 +0100
Subject: [PATCH 1/4] addition of WFs with post EE GT and HLT keys

---
 .../python/upgradeWorkflowComponents.py                | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
index f5fb6832ac324..f84a262803ada 100644
--- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
+++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
@@ -24,6 +24,8 @@
     '2023PU',
     '2024',
     '2024PU',
+    '2022postEE',
+    '2022postEEPU', 
 ]
 
 upgradeKeys[2026] = [
@@ -2013,6 +2015,14 @@ def condition(self, fragment, stepList, key, hasHarvest):
         'BeamSpot': 'Run3RoundOptics25ns13TeVLowSigmaZ',
         'ScenToRun' : ['GenSim','Digi','RecoNano','HARVESTNano','ALCA'],
     },
+    '2022postEE' : {
+        'Geom' : 'DB:Extended',
+        'GT' : 'auto:phase1_2022_realistic_postEE',
+        'HLTmenu': '@relval2022_postEE',
+        'Era' : 'Run3',
+        'BeamSpot': 'Run3RoundOptics25ns13TeVLowSigmaZ',
+        'ScenToRun' : ['GenSim','Digi','RecoNano','HARVESTNano','ALCA'],
+    },
 }
 
 # standard PU sequences

From c435616f411b1fea2818d7919444328780388650 Mon Sep 17 00:00:00 2001
From: Sunil <subansal@cern.ch>
Date: Wed, 23 Nov 2022 18:29:17 +0100
Subject: [PATCH 2/4] addition of WFs with post EE GT and HLT keys

---
 .../PyReleaseValidation/python/upgradeWorkflowComponents.py     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
index f84a262803ada..08b17dad72b2e 100644
--- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
+++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
@@ -2020,7 +2020,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
         'GT' : 'auto:phase1_2022_realistic_postEE',
         'HLTmenu': '@relval2022_postEE',
         'Era' : 'Run3',
-        'BeamSpot': 'Run3RoundOptics25ns13TeVLowSigmaZ',
+        'BeamSpot': 'Realistic25ns13p6TeVEarly2022Collision',
         'ScenToRun' : ['GenSim','Digi','RecoNano','HARVESTNano','ALCA'],
     },
 }

From dba9dd9956777f5a4babfd3a3a67bf91d635cc76 Mon Sep 17 00:00:00 2001
From: Sunil <subansal@cern.ch>
Date: Sat, 26 Nov 2022 07:26:39 +0100
Subject: [PATCH 3/4] fix WFs ID

---
 .../PyReleaseValidation/python/upgradeWorkflowComponents.py     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
index 08b17dad72b2e..2eb65c47088ea 100644
--- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
+++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
@@ -78,7 +78,7 @@
 }
 numWFSkip=200
 # temporary measure to keep other WF numbers the same
-numWFConflict = [[20000,23200],[23600,28200],[28600,31400],[31800,32200],[32600,34600],[50000,51000]]
+numWFConflict = [[13200,13600],[20000,23200],[23600,28200],[28600,31400],[31800,32200],[32600,34600],[50000,51000]]
 numWFAll={
     2017: [],
     2026: []

From 1c44a3a98768fce5315d4f328ab779b34bca4937 Mon Sep 17 00:00:00 2001
From: Sunil <subansal@cern.ch>
Date: Sun, 27 Nov 2022 08:02:56 +0100
Subject: [PATCH 4/4] fix year consistency

---
 .../PyReleaseValidation/python/upgradeWorkflowComponents.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
index 2eb65c47088ea..5b3ed7f5ef9d1 100644
--- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
+++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
@@ -24,8 +24,8 @@
     '2023PU',
     '2024',
     '2024PU',
-    '2022postEE',
-    '2022postEEPU', 
+    '2021postEE',
+    '2021postEEPU', 
 ]
 
 upgradeKeys[2026] = [
@@ -2015,7 +2015,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
         'BeamSpot': 'Run3RoundOptics25ns13TeVLowSigmaZ',
         'ScenToRun' : ['GenSim','Digi','RecoNano','HARVESTNano','ALCA'],
     },
-    '2022postEE' : {
+    '2021postEE' : {
         'Geom' : 'DB:Extended',
         'GT' : 'auto:phase1_2022_realistic_postEE',
         'HLTmenu': '@relval2022_postEE',