From e367c65d6d85881203dcc8a650aac4c24097d204 Mon Sep 17 00:00:00 2001 From: swagata87 Date: Tue, 18 Apr 2023 12:50:50 +0200 Subject: [PATCH] Squash commits --- .../python/Impl/ppEra_Run3_2023.py | 33 +++++++++++++++++++ .../DataProcessing/python/RecoTLR.py | 5 +++ .../DataProcessing/test/run_CfgTest.sh | 2 +- .../Eras/python/Era_Run3_2023_cff.py | 6 ++++ .../python/Modifier_run3_egamma_2023_cff.py | 3 ++ .../StandardSequences/python/Eras.py | 1 + .../python/egammaHBHERecHitThreshold_cff.py | 9 ++++- .../python/particleFlowClusterHBHE_cfi.py | 17 ++++++++++ .../python/particleFlowClusterHCAL_cfi.py | 10 ++++++ .../python/particleFlowRecHitHBHE_cfi.py | 7 ++++ 10 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 Configuration/DataProcessing/python/Impl/ppEra_Run3_2023.py create mode 100644 Configuration/Eras/python/Era_Run3_2023_cff.py create mode 100644 Configuration/Eras/python/Modifier_run3_egamma_2023_cff.py diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run3_2023.py b/Configuration/DataProcessing/python/Impl/ppEra_Run3_2023.py new file mode 100644 index 0000000000000..33bd6101cf174 --- /dev/null +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run3_2023.py @@ -0,0 +1,33 @@ +#!/usr/bin/env python3 +""" +_ppEra_Run3_2023_ + +Scenario supporting proton collisions for 2023 with updated HCAL Barrel thresholds + +""" + +import os +import sys + +from Configuration.DataProcessing.Reco import Reco +import FWCore.ParameterSet.Config as cms +from Configuration.Eras.Era_Run3_2023_cff import Run3_2023 + +from Configuration.DataProcessing.Impl.pp import pp + +class ppEra_Run3_2023(pp): + def __init__(self): + pp.__init__(self) + self.recoSeq='' + self.cbSc='pp' + self.eras=Run3_2023 + self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2023' ] + self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2023' ] + self.visCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2023' ] + """ + _ppEra_Run3_2023_ + + Implement configuration building for data processing for proton + collision data taking for Run3_2023 + + """ diff --git a/Configuration/DataProcessing/python/RecoTLR.py b/Configuration/DataProcessing/python/RecoTLR.py index 7b270f6750947..1e78235fa7025 100644 --- a/Configuration/DataProcessing/python/RecoTLR.py +++ b/Configuration/DataProcessing/python/RecoTLR.py @@ -90,6 +90,11 @@ def customisePostEra_Run3(process): customisePostEra_Run2_2018(process) return process +def customisePostEra_Run3_2023(process): + #start with a repeat of Run3 + customisePostEra_Run3(process) + return process + def customisePostEra_Run3_express_trackingOnly(process): #start with a repeat of 2018 customisePostEra_Run2_2018_express_trackingOnly(process) diff --git a/Configuration/DataProcessing/test/run_CfgTest.sh b/Configuration/DataProcessing/test/run_CfgTest.sh index 9840f8d184097..a63756bc7f6c9 100755 --- a/Configuration/DataProcessing/test/run_CfgTest.sh +++ b/Configuration/DataProcessing/test/run_CfgTest.sh @@ -38,7 +38,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") +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") for scenario in "${arr[@]}" do runTest "${LOCAL_TEST_DIR}/RunPromptReco.py --scenario $scenario --reco --aod --dqmio --global-tag GLOBALTAG --lfn=/store/whatever --alcareco TkAlMinBias+SiStripCalMinBias" diff --git a/Configuration/Eras/python/Era_Run3_2023_cff.py b/Configuration/Eras/python/Era_Run3_2023_cff.py new file mode 100644 index 0000000000000..8b14afa323e92 --- /dev/null +++ b/Configuration/Eras/python/Era_Run3_2023_cff.py @@ -0,0 +1,6 @@ +import FWCore.ParameterSet.Config as cms + +from Configuration.Eras.Era_Run3_cff import Run3 +from Configuration.Eras.Modifier_run3_egamma_2023_cff import run3_egamma_2023 + +Run3_2023 = cms.ModifierChain(Run3, run3_egamma_2023) diff --git a/Configuration/Eras/python/Modifier_run3_egamma_2023_cff.py b/Configuration/Eras/python/Modifier_run3_egamma_2023_cff.py new file mode 100644 index 0000000000000..dc3296a329635 --- /dev/null +++ b/Configuration/Eras/python/Modifier_run3_egamma_2023_cff.py @@ -0,0 +1,3 @@ +import FWCore.ParameterSet.Config as cms + +run3_egamma_2023 =cms.Modifier() diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py index d3d5de80dd970..837d5f1d1acc2 100644 --- a/Configuration/StandardSequences/python/Eras.py +++ b/Configuration/StandardSequences/python/Eras.py @@ -34,6 +34,7 @@ def __init__(self): 'Run2_2018_highBetaStar', 'Run2_2018_noMkFit', 'Run3', + 'Run3_2023', 'Run3_noMkFit', 'Run3_pp_on_PbPb', 'Run3_pp_on_PbPb_approxSiStripClusters', diff --git a/RecoEgamma/EgammaIsolationAlgos/python/egammaHBHERecHitThreshold_cff.py b/RecoEgamma/EgammaIsolationAlgos/python/egammaHBHERecHitThreshold_cff.py index a020211b9329e..c276700ed4760 100644 --- a/RecoEgamma/EgammaIsolationAlgos/python/egammaHBHERecHitThreshold_cff.py +++ b/RecoEgamma/EgammaIsolationAlgos/python/egammaHBHERecHitThreshold_cff.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -from RecoParticleFlow.PFClusterProducer.particleFlowRecHitHBHE_cfi import _thresholdsHBphase1, _thresholdsHEphase1 +from RecoParticleFlow.PFClusterProducer.particleFlowRecHitHBHE_cfi import _thresholdsHBphase1, _thresholdsHEphase1, _thresholdsHBphase1_2023 egammaHBHERecHit = cms.PSet( hbheRecHits = cms.InputTag('hbhereco'), @@ -8,3 +8,10 @@ recHitEThresholdHE = _thresholdsHEphase1, maxHcalRecHitSeverity = cms.int32(9), ) + +egammaHBHERecHit_2023 = egammaHBHERecHit.clone( + recHitEThresholdHB = _thresholdsHBphase1_2023 +) + +from Configuration.Eras.Modifier_run3_egamma_2023_cff import run3_egamma_2023 +run3_egamma_2023.toReplaceWith(egammaHBHERecHit,egammaHBHERecHit_2023) diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHBHE_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHBHE_cfi.py index 3c0e046f48a1c..e602f29e15d75 100644 --- a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHBHE_cfi.py +++ b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHBHE_cfi.py @@ -9,6 +9,10 @@ _seedingThresholdsHE = cms.vdouble(1.1, 1.1, 1.1, 1.1, 1.1, 1.1, 1.1) _seedingThresholdsHBphase1 = cms.vdouble(0.125, 0.25, 0.35, 0.35) _seedingThresholdsHEphase1 = cms.vdouble(0.1375, 0.275, 0.275, 0.275, 0.275, 0.275, 0.275) +#updated HB RecHit threshold for 2023 +_thresholdsHBphase1_2023 = cms.vdouble(0.4, 0.3, 0.3, 0.3) +#updated HB seeding threshold for 2023 +_seedingThresholdsHBphase1_2023 = cms.vdouble(0.6, 0.5, 0.5, 0.5) #### PF CLUSTER HCAL #### @@ -142,6 +146,19 @@ ), ) +# offline 2023 +from Configuration.Eras.Modifier_run3_egamma_2023_cff import run3_egamma_2023 +run3_egamma_2023.toModify(particleFlowClusterHBHE, + seedFinder = dict(thresholdsByDetector = {0 : dict(seedingThreshold = _seedingThresholdsHBphase1_2023) } ), + initialClusteringStep = dict(thresholdsByDetector = {0 : dict(gatheringThreshold = _thresholdsHBphase1_2023) } ), + pfClusterBuilder = dict( + recHitEnergyNorms = {0 : dict(recHitEnergyNorm = _thresholdsHBphase1_2023) }, + positionCalc = dict(logWeightDenominatorByDetector = {0 : dict(logWeightDenominator = _thresholdsHBphase1_2023) } ), + allCellsPositionCalc = dict(logWeightDenominatorByDetector = {0 : dict(logWeightDenominator = _thresholdsHBphase1_2023) } ), + ), +) + + # HCALonly WF particleFlowClusterHBHEOnly = particleFlowClusterHBHE.clone( recHitsSource = "particleFlowRecHitHBHEOnly" diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHCAL_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHCAL_cfi.py index 645f2d1e1b4db..6245a8dc1847f 100644 --- a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHCAL_cfi.py +++ b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHCAL_cfi.py @@ -4,6 +4,8 @@ _thresholdsHE = cms.vdouble(0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8) _thresholdsHBphase1 = cms.vdouble(0.1, 0.2, 0.3, 0.3) _thresholdsHEphase1 = cms.vdouble(0.1, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2) +#updated HB RecHit threshold for 2023 +_thresholdsHBphase1_2023 = cms.vdouble(0.4, 0.3, 0.3, 0.3) particleFlowClusterHCAL = cms.EDProducer('PFMultiDepthClusterProducer', clustersSource = cms.InputTag("particleFlowClusterHBHE"), @@ -51,6 +53,14 @@ ), ) +# offline 2023 +from Configuration.Eras.Modifier_run3_egamma_2023_cff import run3_egamma_2023 +run3_egamma_2023.toModify(particleFlowClusterHCAL, + pfClusterBuilder = dict( + allCellsPositionCalc = dict(logWeightDenominatorByDetector = {0 : dict(logWeightDenominator = _thresholdsHBphase1_2023) } ), + ), +) + # HCALonly WF particleFlowClusterHCALOnly = particleFlowClusterHCAL.clone( clustersSource = "particleFlowClusterHBHEOnly" diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHBHE_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHBHE_cfi.py index 815e60d3c2b5a..272ae984a0876 100644 --- a/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHBHE_cfi.py +++ b/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHBHE_cfi.py @@ -4,6 +4,8 @@ _thresholdsHE = cms.vdouble(0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8) _thresholdsHBphase1 = cms.vdouble(0.1, 0.2, 0.3, 0.3) _thresholdsHEphase1 = cms.vdouble(0.1, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2) +#updated HB RecHit threshold for 2023 +_thresholdsHBphase1_2023 = cms.vdouble(0.4, 0.3, 0.3, 0.3) particleFlowRecHitHBHE = cms.EDProducer("PFRecHitProducer", navigator = cms.PSet( @@ -54,6 +56,11 @@ producers = {0 : dict(qualityTests = {0 : dict(cuts = {0 : dict(threshold = _thresholdsHBphase1) } ) } ) }, ) +from Configuration.Eras.Modifier_run3_egamma_2023_cff import run3_egamma_2023 +run3_egamma_2023.toModify(particleFlowRecHitHBHE, + producers = {0 : dict(qualityTests = {0 : dict(cuts = {0 : dict(threshold = _thresholdsHBphase1_2023) } ) } ) }, +) + # HCALonly WF particleFlowRecHitHBHEOnly = particleFlowRecHitHBHE.clone( producers = { 0: dict(src = "hbheprereco") }