Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add 2024 HI eras to reco processing configuation #45981

Merged
merged 4 commits into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions Configuration/DataProcessing/python/Impl/ppEra_Run3_2024_UPC.py
Original file line number Diff line number Diff line change
@@ -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'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mandrenguyen, IIUC the datasets that now you would be processing with this scenario are the ones that last year were processed with hiForwardScenario = "ppEra_Run3_2023_repacked".
That scenario has

why is it not implemented here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, yes, thanks for spotting it.
I guess that's in relation to this failure right? :
#46186 (comment)
Will fix.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fix is here: #46194

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
"""
29 changes: 29 additions & 0 deletions Configuration/DataProcessing/python/Impl/ppEra_Run3_2024_ppRef.py
Original file line number Diff line number Diff line change
@@ -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
"""
Original file line number Diff line number Diff line change
@@ -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

"""
Original file line number Diff line number Diff line change
@@ -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)

"""
16 changes: 16 additions & 0 deletions Configuration/DataProcessing/python/RecoTLR.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,22 @@ 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 customisePostEra_Run3_2024_ppRef(process):
customisePostEra_Run3_2024(process)
return process

##############################################################################
def customisePPData(process):
#deprecated process= customiseCommon(process)
Expand Down
2 changes: 1 addition & 1 deletion Configuration/DataProcessing/test/run_CfgTest_5.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" "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"
Expand Down