From 390035c9713b2191e500874f996a67c1ca226c93 Mon Sep 17 00:00:00 2001 From: grzanka Date: Wed, 12 Jan 2022 17:27:19 +0100 Subject: [PATCH 1/4] renaming according to guidelines for Tier0 replay --- Configuration/AlCa/python/autoPCL.py | 2 +- Configuration/PyReleaseValidation/python/relval_steps.py | 4 ++-- Configuration/StandardSequences/python/AlCaRecoStreams_cff.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Configuration/AlCa/python/autoPCL.py b/Configuration/AlCa/python/autoPCL.py index 0e1a7d75ff313..4e4d4cc57c082 100644 --- a/Configuration/AlCa/python/autoPCL.py +++ b/Configuration/AlCa/python/autoPCL.py @@ -11,5 +11,5 @@ 'PromptCalibProdLumiPCC': 'LumiPCC', 'PromptCalibProdPPS' : 'PPSTimingCalibration', 'PromptCalibProdPPSDiamondSampic' : 'PPSDiamondSampicTimingCalibration', - 'PromptCalibProdPPSAlig' : 'PPSAlignment' + 'PromptCalibProdPPSAlignment' : 'PPSAlignment' } diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index bdfca7ad6c077..d9fbde20937c4 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -2217,12 +2217,12 @@ def lhegensim2018ml(fragment,howMuch): '--era':'Run2_2017', '--filein':'file:PPSTimingCalib.root'} -steps['ALCAHARVDPPSALIG']={'-s':'ALCAHARVEST:%s'%(autoPCL['PromptCalibProdPPSAlig']), +steps['ALCAHARVDPPSALIG']={'-s':'ALCAHARVEST:%s'%(autoPCL['PromptCalibProdPPSAlignment']), '--conditions':'auto:run3_data_express', '--scenario':'pp', '--data':'', '--era':'Run2_2017', - '--filein':'file:PPSAlignment.root'} + '--filein':'file:PromptCalibProdPPSAlignment.root'} steps['RECOCOSD']=merge([{'--scenario':'cosmics', '-s':'RAW2DIGI,L1Reco,RECO,DQM', diff --git a/Configuration/StandardSequences/python/AlCaRecoStreams_cff.py b/Configuration/StandardSequences/python/AlCaRecoStreams_cff.py index ad3bc858f980b..c0918065b9395 100644 --- a/Configuration/StandardSequences/python/AlCaRecoStreams_cff.py +++ b/Configuration/StandardSequences/python/AlCaRecoStreams_cff.py @@ -906,9 +906,9 @@ dataTier = cms.untracked.string('ALCARECO') ) -ALCARECOStreamPPSAlignment = cms.FilteredStream( +ALCARECOStreamPromptCalibProdPPSAlignment = cms.FilteredStream( responsible = 'Mateusz Kocot', - name = 'PPSAlignment', + name = 'PromptCalibProdPPSAlignment', paths = (pathALCARECOPPSAlignment), content = OutALCARECOPPSAlignment.outputCommands, selectEvents = OutALCARECOPPSAlignment.SelectEvents, From 0c63513d0b45de86210000585a4e4bcf5211c437 Mon Sep 17 00:00:00 2001 From: Mateusz Date: Wed, 12 Jan 2022 18:36:58 +0100 Subject: [PATCH 2/4] pps alignment renaming - part 2 --- .../python/ALCARECOPPSAlignment_Output_cff.py | 6 +++--- Configuration/PyReleaseValidation/python/relval_steps.py | 2 +- .../StandardSequences/python/AlCaRecoStreams_cff.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CalibPPS/AlignmentGlobal/python/ALCARECOPPSAlignment_Output_cff.py b/CalibPPS/AlignmentGlobal/python/ALCARECOPPSAlignment_Output_cff.py index 8ff556699bdaf..4a35dba4ead2e 100644 --- a/CalibPPS/AlignmentGlobal/python/ALCARECOPPSAlignment_Output_cff.py +++ b/CalibPPS/AlignmentGlobal/python/ALCARECOPPSAlignment_Output_cff.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -OutALCARECOPPSAlignment_noDrop = cms.PSet( +OutALCARECOPromptCalibProdPPSAlignment_noDrop = cms.PSet( SelectEvents = cms.untracked.PSet( SelectEvents = cms.vstring('pathALCARECOPPSAlignment') ), @@ -9,5 +9,5 @@ ) ) -OutALCARECOPPSAlignment = OutALCARECOPPSAlignment_noDrop.clone() -OutALCARECOPPSAlignment.outputCommands.insert(0, 'drop *') +OutALCARECOPromptCalibProdPPSAlignment = OutALCARECOPromptCalibProdPPSAlignment_noDrop.clone() +OutALCARECOPromptCalibProdPPSAlignment.outputCommands.insert(0, 'drop *') diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index d9fbde20937c4..c58a9c030fbd3 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -2160,7 +2160,7 @@ def lhegensim2018ml(fragment,howMuch): '--triggerResultsProcess':'RECO', } -steps['ALCASPLITPPSALIG']={'-s':'ALCAOUTPUT:PPSCalTrackBasedSel,ALCA:PPSAlignment', +steps['ALCASPLITPPSALIG']={'-s':'ALCAOUTPUT:PPSCalTrackBasedSel,ALCA:PromptCalibProdPPSAlignment', '-n':1000, '--scenario':'pp', '--data':'', diff --git a/Configuration/StandardSequences/python/AlCaRecoStreams_cff.py b/Configuration/StandardSequences/python/AlCaRecoStreams_cff.py index c0918065b9395..5bab8f9aa6ad7 100644 --- a/Configuration/StandardSequences/python/AlCaRecoStreams_cff.py +++ b/Configuration/StandardSequences/python/AlCaRecoStreams_cff.py @@ -910,8 +910,8 @@ responsible = 'Mateusz Kocot', name = 'PromptCalibProdPPSAlignment', paths = (pathALCARECOPPSAlignment), - content = OutALCARECOPPSAlignment.outputCommands, - selectEvents = OutALCARECOPPSAlignment.SelectEvents, + content = OutALCARECOPromptCalibProdPPSAlignment.outputCommands, + selectEvents = OutALCARECOPromptCalibProdPPSAlignment.SelectEvents, dataTier = cms.untracked.string('ALCARECO') ) From bba88f6b7f0d6d3bbab6bd26db373a549f2b46d9 Mon Sep 17 00:00:00 2001 From: Mateusz Date: Wed, 12 Jan 2022 18:51:33 +0100 Subject: [PATCH 3/4] pps alignment renaming - part 3 (paths) --- .../AlignmentGlobal/python/ALCARECOPPSAlignment_Output_cff.py | 2 +- CalibPPS/AlignmentGlobal/python/ALCARECOPPSAlignment_cff.py | 2 +- Configuration/StandardSequences/python/AlCaRecoStreams_cff.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CalibPPS/AlignmentGlobal/python/ALCARECOPPSAlignment_Output_cff.py b/CalibPPS/AlignmentGlobal/python/ALCARECOPPSAlignment_Output_cff.py index 4a35dba4ead2e..11f99cee08740 100644 --- a/CalibPPS/AlignmentGlobal/python/ALCARECOPPSAlignment_Output_cff.py +++ b/CalibPPS/AlignmentGlobal/python/ALCARECOPPSAlignment_Output_cff.py @@ -2,7 +2,7 @@ OutALCARECOPromptCalibProdPPSAlignment_noDrop = cms.PSet( SelectEvents = cms.untracked.PSet( - SelectEvents = cms.vstring('pathALCARECOPPSAlignment') + SelectEvents = cms.vstring('pathALCARECOPromptCalibProdPPSAlignment') ), outputCommands = cms.untracked.vstring( 'keep *_MEtoEDMConvertPPSAlignment_*_*', diff --git a/CalibPPS/AlignmentGlobal/python/ALCARECOPPSAlignment_cff.py b/CalibPPS/AlignmentGlobal/python/ALCARECOPPSAlignment_cff.py index 3b01706270500..b08b4462bcd79 100644 --- a/CalibPPS/AlignmentGlobal/python/ALCARECOPPSAlignment_cff.py +++ b/CalibPPS/AlignmentGlobal/python/ALCARECOPPSAlignment_cff.py @@ -10,7 +10,7 @@ deleteAfterCopy=cms.untracked.bool(True) ) -taskALCARECOPPSAlignment = cms.Task( +taskALCARECOPromptCalibProdPPSAlignment = cms.Task( ppsAlignmentWorker, MEtoEDMConvertPPSAlignment ) diff --git a/Configuration/StandardSequences/python/AlCaRecoStreams_cff.py b/Configuration/StandardSequences/python/AlCaRecoStreams_cff.py index 5bab8f9aa6ad7..62b09ffd1ce6d 100644 --- a/Configuration/StandardSequences/python/AlCaRecoStreams_cff.py +++ b/Configuration/StandardSequences/python/AlCaRecoStreams_cff.py @@ -245,7 +245,7 @@ pathALCARECORpcCalHLT = cms.Path(seqALCARECORpcCalHLT) pathALCARECOPPSTimingCalib = cms.Path(taskALCARECOPPSTimingCalib) pathALCARECOPPSDiamondSampicTimingCalib = cms.Path(taskALCARECOPPSDiamondSampicTimingCalib) -pathALCARECOPPSAlignment = cms.Path(taskALCARECOPPSAlignment) +pathALCARECOPromptCalibProdPPSAlignment = cms.Path(taskALCARECOPromptCalibProdPPSAlignment) pathALCARECOTkAlBeamHalo = cms.Path(seqALCARECOTkAlBeamHalo*ALCARECOTkAlBeamHaloDQM) pathALCARECOMuAlBeamHaloOverlaps = cms.Path(seqALCARECOMuAlBeamHaloOverlaps) pathALCARECOMuAlBeamHalo = cms.Path(seqALCARECOMuAlBeamHalo) @@ -909,7 +909,7 @@ ALCARECOStreamPromptCalibProdPPSAlignment = cms.FilteredStream( responsible = 'Mateusz Kocot', name = 'PromptCalibProdPPSAlignment', - paths = (pathALCARECOPPSAlignment), + paths = (pathALCARECOPromptCalibProdPPSAlignment), content = OutALCARECOPromptCalibProdPPSAlignment.outputCommands, selectEvents = OutALCARECOPromptCalibProdPPSAlignment.SelectEvents, dataTier = cms.untracked.string('ALCARECO') From 42be74f7b3d925da59ec2bfabbaf7189bdfc94f6 Mon Sep 17 00:00:00 2001 From: Mateusz Date: Thu, 13 Jan 2022 15:10:59 +0100 Subject: [PATCH 4/4] Updated the PPS alignment AlCa file names. PPSAlignment -> PromptCalibProdPPSAlignment --- ...cff.py => ALCARECOPromptCalibProdPPSAlignment_Output_cff.py} | 0 ...gnment_cff.py => ALCARECOPromptCalibProdPPSAlignment_cff.py} | 0 Configuration/EventContent/python/AlCaRecoOutput_cff.py | 2 +- Configuration/StandardSequences/python/AlCaRecoStreams_cff.py | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename CalibPPS/AlignmentGlobal/python/{ALCARECOPPSAlignment_Output_cff.py => ALCARECOPromptCalibProdPPSAlignment_Output_cff.py} (100%) rename CalibPPS/AlignmentGlobal/python/{ALCARECOPPSAlignment_cff.py => ALCARECOPromptCalibProdPPSAlignment_cff.py} (100%) diff --git a/CalibPPS/AlignmentGlobal/python/ALCARECOPPSAlignment_Output_cff.py b/CalibPPS/AlignmentGlobal/python/ALCARECOPromptCalibProdPPSAlignment_Output_cff.py similarity index 100% rename from CalibPPS/AlignmentGlobal/python/ALCARECOPPSAlignment_Output_cff.py rename to CalibPPS/AlignmentGlobal/python/ALCARECOPromptCalibProdPPSAlignment_Output_cff.py diff --git a/CalibPPS/AlignmentGlobal/python/ALCARECOPPSAlignment_cff.py b/CalibPPS/AlignmentGlobal/python/ALCARECOPromptCalibProdPPSAlignment_cff.py similarity index 100% rename from CalibPPS/AlignmentGlobal/python/ALCARECOPPSAlignment_cff.py rename to CalibPPS/AlignmentGlobal/python/ALCARECOPromptCalibProdPPSAlignment_cff.py diff --git a/Configuration/EventContent/python/AlCaRecoOutput_cff.py b/Configuration/EventContent/python/AlCaRecoOutput_cff.py index 835c8b99eaf70..183b57b61a5d4 100644 --- a/Configuration/EventContent/python/AlCaRecoOutput_cff.py +++ b/Configuration/EventContent/python/AlCaRecoOutput_cff.py @@ -149,7 +149,7 @@ from CalibPPS.TimingCalibration.ALCARECOPPSCalTrackBasedSel_Output_cff import * from CalibPPS.TimingCalibration.ALCARECOPPSTimingCalib_Output_cff import * from CalibPPS.TimingCalibration.ALCARECOPPSDiamondSampicTimingCalib_Output_cff import * -from CalibPPS.AlignmentGlobal.ALCARECOPPSAlignment_Output_cff import * +from CalibPPS.AlignmentGlobal.ALCARECOPromptCalibProdPPSAlignment_Output_cff import * ############################################################### # stream for prompt-calibration @ Tier0 diff --git a/Configuration/StandardSequences/python/AlCaRecoStreams_cff.py b/Configuration/StandardSequences/python/AlCaRecoStreams_cff.py index 62b09ffd1ce6d..bfa25e34ccbdf 100644 --- a/Configuration/StandardSequences/python/AlCaRecoStreams_cff.py +++ b/Configuration/StandardSequences/python/AlCaRecoStreams_cff.py @@ -134,7 +134,7 @@ from CalibPPS.TimingCalibration.ALCARECOPPSTimingCalib_cff import * from CalibPPS.TimingCalibration.ALCARECOPPSDiamondSampicTimingCalib_cff import * # Alignment -from CalibPPS.AlignmentGlobal.ALCARECOPPSAlignment_cff import * +from CalibPPS.AlignmentGlobal.ALCARECOPromptCalibProdPPSAlignment_cff import * ############################################################### # nonbeam alcas