From f595c2f7773ea10dfc57930deb184eeda8c83711 Mon Sep 17 00:00:00 2001
From: francescobrivio <francesco.brivio@cern.ch>
Date: Mon, 7 Aug 2023 16:19:04 +0200
Subject: [PATCH 1/2] Add 2023 HI scenarios

---
 .../python/Impl/ppEra_Run3_pp_on_PbPb_2023.py | 34 ++++++++++++++++++
 ...3_pp_on_PbPb_approxSiStripClusters_2023.py | 35 +++++++++++++++++++
 .../DataProcessing/python/RecoTLR.py          |  7 ++++
 .../DataProcessing/test/run_CfgTest.sh        |  2 +-
 4 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_2023.py
 create mode 100644 Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023.py

diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_2023.py b/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_2023.py
new file mode 100644
index 0000000000000..9f1be1844f174
--- /dev/null
+++ b/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_2023.py
@@ -0,0 +1,34 @@
+#!/usr/bin/env python3
+"""
+_ppEra_Run3_pp_on_PbPb_2023_
+
+Scenario supporting proton collisions
+
+"""
+
+import os
+import sys
+
+from Configuration.DataProcessing.Reco import Reco
+import FWCore.ParameterSet.Config as cms
+from Configuration.Eras.Era_Run3_pp_on_PbPb_2023_cff import Run3_pp_on_PbPb_2023
+
+from Configuration.DataProcessing.Impl.pp import pp
+
+class ppEra_Run3_pp_on_PbPb_2023(pp):
+    def __init__(self):
+        pp.__init__(self)
+        self.recoSeq=''
+        self.cbSc='pp'
+        self.isRepacked=True
+        self.eras=Run3_pp_on_PbPb_2023
+        self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_2023' ]
+        self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_2023' ]
+        self.visCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_2023' ]
+    """
+    _ppEra_Run3_pp_on_PbPb_2023_
+
+    Implement configuration building for data processing for pp-like processing of HI
+    collision data taking for Run3
+
+    """
diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023.py b/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023.py
new file mode 100644
index 0000000000000..00e8f72afe3cb
--- /dev/null
+++ b/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023.py
@@ -0,0 +1,35 @@
+#!/usr/bin/env python3
+"""
+_ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023_
+
+Scenario supporting proton collisions
+
+"""
+
+import os
+import sys
+
+from Configuration.DataProcessing.Reco import Reco
+from Configuration.Eras.Era_Run3_pp_on_PbPb_approxSiStripClusters_2023_cff import Run3_pp_on_PbPb_approxSiStripClusters_2023
+import FWCore.ParameterSet.Config as cms
+
+from Configuration.DataProcessing.Impl.pp import pp
+
+class ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023(pp):
+    def __init__(self):
+        pp.__init__(self)
+        self.recoSeq=''
+        self.cbSc='pp'
+        self.isRepacked=True
+        self.eras=Run3_pp_on_PbPb_approxSiStripClusters_2023
+        self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_approxSiStripClusters_2023' ]
+        self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_approxSiStripClusters_2023' ]
+        self.visCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_approxSiStripClusters_2023' ]
+
+    """
+    _ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023_
+
+    Implement configuration building for data processing for pp-like processing of HI
+    collision data taking for Run3 with approxSiStripClusters (rawprime format)
+
+    """
diff --git a/Configuration/DataProcessing/python/RecoTLR.py b/Configuration/DataProcessing/python/RecoTLR.py
index 1e78235fa7025..4539242659b77 100644
--- a/Configuration/DataProcessing/python/RecoTLR.py
+++ b/Configuration/DataProcessing/python/RecoTLR.py
@@ -109,10 +109,17 @@ def customisePostEra_Run3_pp_on_PbPb(process):
     customisePostEra_Run3(process)
     return process
 
+def customisePostEra_Run3_pp_on_PbPb_2023(process):
+    customisePostEra_Run3_2023(process)
+    return process
+
 def customisePostEra_Run3_pp_on_PbPb_approxSiStripClusters(process):
     customisePostEra_Run3_pp_on_PbPb(process)
     return process
 
+def customisePostEra_Run3_pp_on_PbPb_approxSiStripClusters_2023(process):
+    customisePostEra_Run3_pp_on_PbPb_2023(process)
+    return process
 
 ##############################################################################
 def customisePPData(process):
diff --git a/Configuration/DataProcessing/test/run_CfgTest.sh b/Configuration/DataProcessing/test/run_CfgTest.sh
index cf779eb022807..e1b7b5f2e36ff 100755
--- a/Configuration/DataProcessing/test/run_CfgTest.sh
+++ b/Configuration/DataProcessing/test/run_CfgTest.sh
@@ -37,7 +37,7 @@ do
 done
 
 
-declare -a arr=("AlCaLumiPixels" "AlCaTestEnable" "cosmicsEra_Run2_2018" "hcalnzsEra_Run2_2018" "ppEra_Run2_2018" "hcalnzsEra_Run2_2018_highBetaStar" "hcalnzsEra_Run2_2018_pp_on_AA" "ppEra_Run2_2018_highBetaStar" "ppEra_Run2_2018_pp_on_AA" "cosmicsHybridEra_Run2_2018" "cosmicsEra_Run3" "hcalnzsEra_Run3" "ppEra_Run3" "AlCaLumiPixels_Run3" "AlCaPhiSymEcal_Nano" "AlCaPPS_Run3" "ppEra_Run3_pp_on_PbPb" "hcalnzsEra_Run3_pp_on_PbPb" "ppEra_Run3_pp_on_PbPb_approxSiStripClusters" "ppEra_Run3_2023")
+declare -a arr=("AlCaLumiPixels" "AlCaTestEnable" "cosmicsEra_Run2_2018" "hcalnzsEra_Run2_2018" "ppEra_Run2_2018" "hcalnzsEra_Run2_2018_highBetaStar" "hcalnzsEra_Run2_2018_pp_on_AA" "ppEra_Run2_2018_highBetaStar" "ppEra_Run2_2018_pp_on_AA" "cosmicsHybridEra_Run2_2018" "cosmicsEra_Run3" "hcalnzsEra_Run3" "ppEra_Run3" "AlCaLumiPixels_Run3" "AlCaPhiSymEcal_Nano" "AlCaPPS_Run3" "ppEra_Run3_pp_on_PbPb" "hcalnzsEra_Run3_pp_on_PbPb" "ppEra_Run3_pp_on_PbPb_approxSiStripClusters" "ppEra_Run3_2023" "ppEra_Run3_pp_on_PbPb_2023" "ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023")
 for scenario in "${arr[@]}"
 do
      runTest "${SCRAM_TEST_PATH}/RunPromptReco.py --scenario $scenario --reco --aod --dqmio --global-tag GLOBALTAG --lfn=/store/whatever  --alcareco TkAlMinBias+SiStripCalMinBias"

From e6fb7043d169d2d0c3607e51c4aa4986c513f120 Mon Sep 17 00:00:00 2001
From: francescobrivio <francesco.brivio@cern.ch>
Date: Mon, 7 Aug 2023 16:53:56 +0200
Subject: [PATCH 2/2] fix description of Run3 HI scenarios

---
 .../DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb.py         | 2 +-
 .../DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_2023.py    | 2 +-
 .../python/Impl/ppEra_Run3_pp_on_PbPb_approxSiStripClusters.py  | 2 +-
 .../Impl/ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023.py    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb.py b/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb.py
index 8afe2ba0fccd3..e33915852fb63 100644
--- a/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb.py
+++ b/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb.py
@@ -2,7 +2,7 @@
 """
 _ppEra_Run3_pp_on_PbPb_
 
-Scenario supporting proton collisions
+Scenario supporting heavy ions collisions
 
 """
 
diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_2023.py b/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_2023.py
index 9f1be1844f174..e94245eb5c7ba 100644
--- a/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_2023.py
+++ b/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_2023.py
@@ -2,7 +2,7 @@
 """
 _ppEra_Run3_pp_on_PbPb_2023_
 
-Scenario supporting proton collisions
+Scenario supporting heavy ions collisions
 
 """
 
diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_approxSiStripClusters.py b/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_approxSiStripClusters.py
index 2d94c9d351e70..517fbbd5b2f10 100644
--- a/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_approxSiStripClusters.py
+++ b/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_approxSiStripClusters.py
@@ -2,7 +2,7 @@
 """
 _ppEra_Run3_pp_on_PbPb_approxSiStripClusters_
 
-Scenario supporting proton collisions
+Scenario supporting heavy ions collisions
 
 """
 
diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023.py b/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023.py
index 00e8f72afe3cb..7b28e5b757843 100644
--- a/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023.py
+++ b/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023.py
@@ -2,7 +2,7 @@
 """
 _ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023_
 
-Scenario supporting proton collisions
+Scenario supporting heavy ions collisions
 
 """