From 00a2afe0b6ff23dc9336819bf4d252ed53176873 Mon Sep 17 00:00:00 2001 From: Matthew Date: Wed, 11 Sep 2024 19:24:01 +0200 Subject: [PATCH 1/4] Update reco processing config with 2024 HI eras --- Configuration/DataProcessing/python/RecoTLR.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Configuration/DataProcessing/python/RecoTLR.py b/Configuration/DataProcessing/python/RecoTLR.py index 997fe5f31d00b..f6bb21fc060a8 100644 --- a/Configuration/DataProcessing/python/RecoTLR.py +++ b/Configuration/DataProcessing/python/RecoTLR.py @@ -126,6 +126,18 @@ def customisePostEra_Run3_pp_on_PbPb_approxSiStripClusters_2023(process): customisePostEra_Run3_pp_on_PbPb_2023(process) return process +def customisePostEra_Run3_pp_on_PbPb_2024(process): + customisePostEra_Run3_2024(process) + return process + +def customisePostEra_Run3_pp_on_PbPb_approxSiStripClusters_2024(process): + customisePostEra_Run3_pp_on_PbPb_2024(process) + return process + +def customisePostEra_Run3_2024_UPC(process): + customisePostEra_Run3_2024(process) + return process + ############################################################################## def customisePPData(process): #deprecated process= customiseCommon(process) From 42c32a87c93bfed4e32fe9030f6fa3ce62384f86 Mon Sep 17 00:00:00 2001 From: Matthew Date: Wed, 11 Sep 2024 19:25:20 +0200 Subject: [PATCH 2/4] add new files --- .../python/Impl/ppEra_Run3_2024_UPC.py | 29 +++++++++++++++ .../python/Impl/ppEra_Run3_pp_on_PbPb_2024.py | 34 ++++++++++++++++++ ...3_pp_on_PbPb_approxSiStripClusters_2024.py | 35 +++++++++++++++++++ 3 files changed, 98 insertions(+) create mode 100644 Configuration/DataProcessing/python/Impl/ppEra_Run3_2024_UPC.py create mode 100644 Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_2024.py create mode 100644 Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2024.py diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run3_2024_UPC.py b/Configuration/DataProcessing/python/Impl/ppEra_Run3_2024_UPC.py new file mode 100644 index 0000000000000..444097ff329d4 --- /dev/null +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run3_2024_UPC.py @@ -0,0 +1,29 @@ +#!/usr/bin/env python3 +""" +_ppEra_Run3_2024_UPC_ +Scenario supporting UPC collisions for 2024 +""" + +import os +import sys + +from Configuration.DataProcessing.Reco import Reco +import FWCore.ParameterSet.Config as cms +from Configuration.Eras.Era_Run3_2024_UPC_cff import Run3_2024_UPC + +from Configuration.DataProcessing.Impl.pp import pp + +class ppEra_Run3_2024_UPC(pp): + def __init__(self): + pp.__init__(self) + self.recoSeq='' + self.cbSc='pp' + self.eras=Run3_2024_UPC + self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2024_UPC' ] + self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2024_UPC' ] + self.visCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2024_UPC' ] + """ + _ppEra_Run3_2024_UPC_ + Implement configuration building for data processing for proton + collision data taking for Run3_2024 + """ diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_2024.py b/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_2024.py new file mode 100644 index 0000000000000..ca63fc7d636d7 --- /dev/null +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_2024.py @@ -0,0 +1,34 @@ +#!/usr/bin/env python3 +""" +_ppEra_Run3_pp_on_PbPb_2024_ + +Scenario supporting heavy ions 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_2024_cff import Run3_pp_on_PbPb_2024 + +from Configuration.DataProcessing.Impl.pp import pp + +class ppEra_Run3_pp_on_PbPb_2024(pp): + def __init__(self): + pp.__init__(self) + self.recoSeq='' + self.cbSc='pp' + self.isRepacked=True + self.eras=Run3_pp_on_PbPb_2024 + self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_2024' ] + self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_2024' ] + self.visCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_2024' ] + """ + _ppEra_Run3_pp_on_PbPb_2024_ + + 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_2024.py b/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2024.py new file mode 100644 index 0000000000000..8b0b600207e70 --- /dev/null +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2024.py @@ -0,0 +1,35 @@ +#!/usr/bin/env python3 +""" +_ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2024_ + +Scenario supporting heavy ions collisions + +""" + +import os +import sys + +from Configuration.DataProcessing.Reco import Reco +from Configuration.Eras.Era_Run3_pp_on_PbPb_approxSiStripClusters_2024_cff import Run3_pp_on_PbPb_approxSiStripClusters_2024 +import FWCore.ParameterSet.Config as cms + +from Configuration.DataProcessing.Impl.pp import pp + +class ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2024(pp): + def __init__(self): + pp.__init__(self) + self.recoSeq='' + self.cbSc='pp' + self.isRepacked=True + self.eras=Run3_pp_on_PbPb_approxSiStripClusters_2024 + self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_approxSiStripClusters_2024' ] + self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_approxSiStripClusters_2024' ] + self.visCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_approxSiStripClusters_2024' ] + + """ + _ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2024_ + + Implement configuration building for data processing for pp-like processing of HI + collision data taking for Run3 with approxSiStripClusters (rawprime format) + + """ From c0c1dfd928b37d233a479f09c86fbf501b9a0eb9 Mon Sep 17 00:00:00 2001 From: Matthew Date: Wed, 11 Sep 2024 22:40:49 +0200 Subject: [PATCH 3/4] added new era to run_CfgTest_5.sh --- Configuration/DataProcessing/test/run_CfgTest_5.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/DataProcessing/test/run_CfgTest_5.sh b/Configuration/DataProcessing/test/run_CfgTest_5.sh index c930630845844..a3bfc972966dd 100755 --- a/Configuration/DataProcessing/test/run_CfgTest_5.sh +++ b/Configuration/DataProcessing/test/run_CfgTest_5.sh @@ -10,7 +10,7 @@ function die { echo $1: status $2 ; exit $2; } function runTest { echo $1 ; python3 $1 || die "Failure for configuration: $1" $?; } -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" "ppEra_Run3_2024") +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" "ppEra_Run3_2024" "ppEra_Run3_pp_on_PbPb_2024" "ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2024" "ppEra_Run3_2024_UPC") 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 a8dc46f3e0b42cc20a31bc20e8f87fe48656447a Mon Sep 17 00:00:00 2001 From: Matthew Date: Thu, 12 Sep 2024 07:29:18 +0200 Subject: [PATCH 4/4] add 2024 pp ref --- .../python/Impl/ppEra_Run3_2024_ppRef.py | 29 +++++++++++++++++++ .../DataProcessing/python/RecoTLR.py | 4 +++ .../DataProcessing/test/run_CfgTest_5.sh | 2 +- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 Configuration/DataProcessing/python/Impl/ppEra_Run3_2024_ppRef.py diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run3_2024_ppRef.py b/Configuration/DataProcessing/python/Impl/ppEra_Run3_2024_ppRef.py new file mode 100644 index 0000000000000..13c3a063947e1 --- /dev/null +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run3_2024_ppRef.py @@ -0,0 +1,29 @@ +#!/usr/bin/env python3 +""" +_ppEra_Run3_2024_ppRef_ +Scenario supporting ppRef collisions for 2024 +""" + +import os +import sys + +from Configuration.DataProcessing.Reco import Reco +import FWCore.ParameterSet.Config as cms +from Configuration.Eras.Era_Run3_2024_ppRef_cff import Run3_2024_ppRef + +from Configuration.DataProcessing.Impl.pp import pp + +class ppEra_Run3_2024_ppRef(pp): + def __init__(self): + pp.__init__(self) + self.recoSeq='' + self.cbSc='pp' + self.eras=Run3_2024_ppRef + self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2024_ppRef' ] + self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2024_ppRef' ] + self.visCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2024_ppRef' ] + """ + _ppEra_Run3_2024_ppRef_ + Implement configuration building for data processing for proton + collision data taking for Run3_2024 + """ diff --git a/Configuration/DataProcessing/python/RecoTLR.py b/Configuration/DataProcessing/python/RecoTLR.py index f6bb21fc060a8..d78af0520ea68 100644 --- a/Configuration/DataProcessing/python/RecoTLR.py +++ b/Configuration/DataProcessing/python/RecoTLR.py @@ -138,6 +138,10 @@ def customisePostEra_Run3_2024_UPC(process): customisePostEra_Run3_2024(process) return process +def customisePostEra_Run3_2024_ppRef(process): + customisePostEra_Run3_2024(process) + return process + ############################################################################## def customisePPData(process): #deprecated process= customiseCommon(process) diff --git a/Configuration/DataProcessing/test/run_CfgTest_5.sh b/Configuration/DataProcessing/test/run_CfgTest_5.sh index a3bfc972966dd..7d71eba553761 100755 --- a/Configuration/DataProcessing/test/run_CfgTest_5.sh +++ b/Configuration/DataProcessing/test/run_CfgTest_5.sh @@ -10,7 +10,7 @@ function die { echo $1: status $2 ; exit $2; } function runTest { echo $1 ; python3 $1 || die "Failure for configuration: $1" $?; } -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" "ppEra_Run3_2024" "ppEra_Run3_pp_on_PbPb_2024" "ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2024" "ppEra_Run3_2024_UPC") +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" "ppEra_Run3_2024" "ppEra_Run3_pp_on_PbPb_2024" "ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2024" "ppEra_Run3_2024_UPC" "ppEra_Run3_2024_ppRef") 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"