From 28ef813425eb136b1e5d7c45b546acc92b7e641b Mon Sep 17 00:00:00 2001 From: Norraphat Date: Sun, 9 Mar 2025 00:21:07 +0100 Subject: [PATCH] Squashed commit of the following: commit 5bc33d89e3c407d4357c536e9fde2cde7c0fb3f8 Author: Norraphat Date: Sun Mar 9 00:19:30 2025 +0100 fix RecoTLR commit bd959e675b8cd9773f2c45548d2ea5b32227dbe2 Author: Norraphat Date: Sun Mar 9 00:11:12 2025 +0100 2025 scenario commit ebac7cf9edcbbc1fef57bed456cf52c5bc643bf0 Author: Norraphat Date: Sun Mar 9 00:08:38 2025 +0100 2025 scenario --- .../python/Impl/hltScoutingEra_Run3_2025.py | 26 ++++++++++++++ .../python/Impl/ppEra_Run3_2025.py | 29 +++++++++++++++ .../python/Impl/ppEra_Run3_2025_OXY.py | 30 ++++++++++++++++ .../python/Impl/ppEra_Run3_2025_UPC.py | 30 ++++++++++++++++ .../python/Impl/ppEra_Run3_pp_on_PbPb_2025.py | 34 ++++++++++++++++++ ...3_pp_on_PbPb_approxSiStripClusters_2025.py | 35 +++++++++++++++++++ .../DataProcessing/python/RecoTLR.py | 23 +++++++++++- .../python/Era_Run3_pp_on_PbPb_2025_cff.py | 8 +++++ ..._on_PbPb_approxSiStripClusters_2025_cff.py | 8 +++++ .../Modifier_pp_on_PbPb_run3_2025_cff.py | 4 +++ .../StandardSequences/python/Eras.py | 2 ++ 11 files changed, 228 insertions(+), 1 deletion(-) create mode 100644 Configuration/DataProcessing/python/Impl/hltScoutingEra_Run3_2025.py create mode 100644 Configuration/DataProcessing/python/Impl/ppEra_Run3_2025.py create mode 100644 Configuration/DataProcessing/python/Impl/ppEra_Run3_2025_OXY.py create mode 100644 Configuration/DataProcessing/python/Impl/ppEra_Run3_2025_UPC.py create mode 100644 Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_2025.py create mode 100644 Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2025.py create mode 100644 Configuration/Eras/python/Era_Run3_pp_on_PbPb_2025_cff.py create mode 100644 Configuration/Eras/python/Era_Run3_pp_on_PbPb_approxSiStripClusters_2025_cff.py create mode 100644 Configuration/Eras/python/Modifier_pp_on_PbPb_run3_2025_cff.py diff --git a/Configuration/DataProcessing/python/Impl/hltScoutingEra_Run3_2025.py b/Configuration/DataProcessing/python/Impl/hltScoutingEra_Run3_2025.py new file mode 100644 index 0000000000000..b7537905d6e72 --- /dev/null +++ b/Configuration/DataProcessing/python/Impl/hltScoutingEra_Run3_2025.py @@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +""" +_hltScoutingEra_Run3_2025_ + +Scenario supporting proton collisions with input HLT scouting data for 2025 + +""" + +import os +import sys + +from Configuration.Eras.Era_Run3_2025_cff import Run3_2025 +from Configuration.DataProcessing.Impl.hltScouting import hltScouting + +class hltScoutingEra_Run3_2025(hltScouting): + def __init__(self): + hltScouting.__init__(self) + self.recoSeq = '' + self.cbSc = 'pp' + self.eras = Run3_2025 + self.promptCustoms += ['Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2025'] + """ + _hltScoutingEra_Run3_2025_ + Implement configuration building for data processing for proton + collision data taking with input HLT scouting data for Era_Run3_2025 + """ diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run3_2025.py b/Configuration/DataProcessing/python/Impl/ppEra_Run3_2025.py new file mode 100644 index 0000000000000..be70f1e3b3fef --- /dev/null +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run3_2025.py @@ -0,0 +1,29 @@ +#!/usr/bin/env python3 +""" +_ppEra_Run3_2025_ +Scenario supporting proton collisions for 2025 +""" + +import os +import sys + +from Configuration.DataProcessing.Reco import Reco +import FWCore.ParameterSet.Config as cms +from Configuration.Eras.Era_Run3_2025_cff import Run3_2025 + +from Configuration.DataProcessing.Impl.pp import pp + +class ppEra_Run3_2025(pp): + def __init__(self): + pp.__init__(self) + self.recoSeq='' + self.cbSc='pp' + self.eras=Run3_2025 + self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2025' ] + self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2025' ] + self.visCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2025' ] + """ + _ppEra_Run3_2025_ + Implement configuration building for data processing for proton + collision data taking for Run3_2025 + """ diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run3_2025_OXY.py b/Configuration/DataProcessing/python/Impl/ppEra_Run3_2025_OXY.py new file mode 100644 index 0000000000000..73c74c1ed78f9 --- /dev/null +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run3_2025_OXY.py @@ -0,0 +1,30 @@ +#!/usr/bin/env python3 +""" +_ppEra_Run3_2025_OXY_ +Scenario supporting OXY collisions for 2025 +""" + +import os +import sys + +from Configuration.DataProcessing.Reco import Reco +import FWCore.ParameterSet.Config as cms +from Configuration.Eras.Era_Run3_2025_OXY_cff import Run3_2025_OXY + +from Configuration.DataProcessing.Impl.pp import pp + +class ppEra_Run3_2025_OXY(pp): + def __init__(self): + pp.__init__(self) + self.recoSeq='' + self.cbSc='pp' + self.isRepacked=True + self.eras=Run3_2025_OXY + self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2025_OXY' ] + self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2025_OXY' ] + self.visCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2025_OXY' ] + """ + _ppEra_Run3_2025_OXY_ + Implement configuration building for data processing for proton + collision data taking for Run3_2025 + """ diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run3_2025_UPC.py b/Configuration/DataProcessing/python/Impl/ppEra_Run3_2025_UPC.py new file mode 100644 index 0000000000000..f785b78591771 --- /dev/null +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run3_2025_UPC.py @@ -0,0 +1,30 @@ +#!/usr/bin/env python3 +""" +_ppEra_Run3_2025_UPC_ +Scenario supporting UPC collisions for 2025 +""" + +import os +import sys + +from Configuration.DataProcessing.Reco import Reco +import FWCore.ParameterSet.Config as cms +from Configuration.Eras.Era_Run3_2025_UPC_cff import Run3_2025_UPC + +from Configuration.DataProcessing.Impl.pp import pp + +class ppEra_Run3_2025_UPC(pp): + def __init__(self): + pp.__init__(self) + self.recoSeq='' + self.cbSc='pp' + self.isRepacked=True + self.eras=Run3_2025_UPC + self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2025_UPC' ] + self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2025_UPC' ] + self.visCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2025_UPC' ] + """ + _ppEra_Run3_2025_UPC_ + Implement configuration building for data processing for proton + collision data taking for Run3_2025 + """ diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_2025.py b/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_2025.py new file mode 100644 index 0000000000000..2882d08acb856 --- /dev/null +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_2025.py @@ -0,0 +1,34 @@ +#!/usr/bin/env python3 +""" +_ppEra_Run3_pp_on_PbPb_2025_ + +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_2025_cff import Run3_pp_on_PbPb_2025 + +from Configuration.DataProcessing.Impl.pp import pp + +class ppEra_Run3_pp_on_PbPb_2025(pp): + def __init__(self): + pp.__init__(self) + self.recoSeq='' + self.cbSc='pp' + self.isRepacked=True + self.eras=Run3_pp_on_PbPb_2025 + self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_2025' ] + self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_2025' ] + self.visCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_2025' ] + """ + _ppEra_Run3_pp_on_PbPb_2025_ + + 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_2025.py b/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2025.py new file mode 100644 index 0000000000000..d11eb5c4a9e88 --- /dev/null +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2025.py @@ -0,0 +1,35 @@ +#!/usr/bin/env python3 +""" +_ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2025_ + +Scenario supporting heavy ions collisions + +""" + +import os +import sys + +from Configuration.DataProcessing.Reco import Reco +from Configuration.Eras.Era_Run3_pp_on_PbPb_approxSiStripClusters_2025_cff import Run3_pp_on_PbPb_approxSiStripClusters_2025 +import FWCore.ParameterSet.Config as cms + +from Configuration.DataProcessing.Impl.pp import pp + +class ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2025(pp): + def __init__(self): + pp.__init__(self) + self.recoSeq='' + self.cbSc='pp' + self.isRepacked=True + self.eras=Run3_pp_on_PbPb_approxSiStripClusters_2025 + self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_approxSiStripClusters_2025' ] + self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_approxSiStripClusters_2025' ] + self.visCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_approxSiStripClusters_2025' ] + + """ + _ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2025_ + + 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 72ebfff196e24..bcda3d2e0f8f6 100644 --- a/Configuration/DataProcessing/python/RecoTLR.py +++ b/Configuration/DataProcessing/python/RecoTLR.py @@ -91,7 +91,12 @@ def customisePostEra_Run3_2023(process): def customisePostEra_Run3_2024(process): #start with a repeat of 2023 - customisePostEra_Run3(process) + customisePostEra_Run3_2023(process) + return process + +def customisePostEra_Run3_2025(process): + #start with a repeat of 2024 + customisePostEra_Run3_2024(process) return process def customisePostEra_Run3_express_trackingOnly(process): @@ -136,6 +141,22 @@ def customisePostEra_Run3_2024_ppRef(process): customisePostEra_Run3_2024(process) return process +def customisePostEra_Run3_pp_on_PbPb_2025(process): + customisePostEra_Run3_2025(process) + return process + +def customisePostEra_Run3_pp_on_PbPb_approxSiStripClusters_2025(process): + customisePostEra_Run3_pp_on_PbPb_2025(process) + return process + +def customisePostEra_Run3_2025_UPC(process): + customisePostEra_Run3_2025(process) + return process + +def customisePostEra_Run3_2025_OXY(process): + customisePostEra_Run3_2025(process) + return process + ############################################################################## def customisePPData(process): #deprecated process= customiseCommon(process) diff --git a/Configuration/Eras/python/Era_Run3_pp_on_PbPb_2025_cff.py b/Configuration/Eras/python/Era_Run3_pp_on_PbPb_2025_cff.py new file mode 100644 index 0000000000000..d79eac076b187 --- /dev/null +++ b/Configuration/Eras/python/Era_Run3_pp_on_PbPb_2025_cff.py @@ -0,0 +1,8 @@ +import FWCore.ParameterSet.Config as cms + +from Configuration.Eras.Era_Run3_2025_cff import Run3_2025 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 +from Configuration.Eras.Modifier_pp_on_PbPb_run3_2024_cff import pp_on_PbPb_run3_2024 + +Run3_pp_on_PbPb_2025 = cms.ModifierChain(Run3_2025, pp_on_AA, pp_on_PbPb_run3, pp_on_PbPb_run3_2024) diff --git a/Configuration/Eras/python/Era_Run3_pp_on_PbPb_approxSiStripClusters_2025_cff.py b/Configuration/Eras/python/Era_Run3_pp_on_PbPb_approxSiStripClusters_2025_cff.py new file mode 100644 index 0000000000000..f46a1adaf0c01 --- /dev/null +++ b/Configuration/Eras/python/Era_Run3_pp_on_PbPb_approxSiStripClusters_2025_cff.py @@ -0,0 +1,8 @@ +import FWCore.ParameterSet.Config as cms + +from Configuration.Eras.Era_Run3_2025_cff import Run3_2025 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +from Configuration.ProcessModifiers.approxSiStripClusters_cff import approxSiStripClusters +from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 + +Run3_pp_on_PbPb_approxSiStripClusters_2025 = cms.ModifierChain(Run3_2025, pp_on_AA, approxSiStripClusters, pp_on_PbPb_run3) diff --git a/Configuration/Eras/python/Modifier_pp_on_PbPb_run3_2025_cff.py b/Configuration/Eras/python/Modifier_pp_on_PbPb_run3_2025_cff.py new file mode 100644 index 0000000000000..efd1792f43b83 --- /dev/null +++ b/Configuration/Eras/python/Modifier_pp_on_PbPb_run3_2025_cff.py @@ -0,0 +1,4 @@ +import FWCore.ParameterSet.Config as cms + +pp_on_PbPb_run3_2025 = cms.Modifier() + diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py index 912a0021093ad..f49ad25a39c7d 100644 --- a/Configuration/StandardSequences/python/Eras.py +++ b/Configuration/StandardSequences/python/Eras.py @@ -44,6 +44,8 @@ def __init__(self): 'Run3_pp_on_PbPb_approxSiStripClusters_2023', 'Run3_pp_on_PbPb_2024', 'Run3_pp_on_PbPb_approxSiStripClusters_2024', + 'Run3_pp_on_PbPb_2025', + 'Run3_pp_on_PbPb_approxSiStripClusters_2025', 'Run3_dd4hep', 'Run3_DDD', 'Run3_FastSim',