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.

Sign up for GitHub

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

Jump to bottom

PPS alignment tier0 renaming #58

Merged
merged 4 commits into from
Jan 21, 2022
Merged

PPS alignment tier0 renaming #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
390035c
renaming according to guidelines for Tier0 replay
grzanka Jan 12, 2022
0c63513
pps alignment renaming - part 2
MatiXOfficial Jan 12, 2022
bba88f6
pps alignment renaming - part 3 (paths)
MatiXOfficial Jan 12, 2022
42be74f
Updated the PPS alignment AlCa file names.
MatiXOfficial Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 0 additions & 13 deletions CalibPPS/AlignmentGlobal/python/ALCARECOPPSAlignment_Output_cff.py
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions CalibPPS/AlignmentGlobal/python/ALCARECOPromptCalibProdPPSAlignment_Output_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import FWCore.ParameterSet.Config as cms

OutALCARECOPromptCalibProdPPSAlignment_noDrop = cms.PSet(
SelectEvents = cms.untracked.PSet(
SelectEvents = cms.vstring('pathALCARECOPromptCalibProdPPSAlignment')
),
outputCommands = cms.untracked.vstring(
'keep *_MEtoEDMConvertPPSAlignment_*_*',
)
)

OutALCARECOPromptCalibProdPPSAlignment = OutALCARECOPromptCalibProdPPSAlignment_noDrop.clone()
OutALCARECOPromptCalibProdPPSAlignment.outputCommands.insert(0, 'drop *')
2 changes: 1 addition & 1 deletion ...Global/python/ALCARECOPPSAlignment_cff.py → ...LCARECOPromptCalibProdPPSAlignment_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
deleteAfterCopy=cms.untracked.bool(True)
)

taskALCARECOPPSAlignment = cms.Task(
taskALCARECOPromptCalibProdPPSAlignment = cms.Task(
ppsAlignmentWorker,
MEtoEDMConvertPPSAlignment
)
2 changes: 1 addition & 1 deletion Configuration/AlCa/python/autoPCL.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
'PromptCalibProdLumiPCC': 'LumiPCC',
'PromptCalibProdPPS' : 'PPSTimingCalibration',
'PromptCalibProdPPSDiamondSampic' : 'PPSDiamondSampicTimingCalibration',
'PromptCalibProdPPSAlig' : 'PPSAlignment'
'PromptCalibProdPPSAlignment' : 'PPSAlignment'
}
2 changes: 1 addition & 1 deletion Configuration/EventContent/python/AlCaRecoOutput_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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':'',
Expand Down Expand Up @@ -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',
Expand Down
14 changes: 7 additions & 7 deletions Configuration/StandardSequences/python/AlCaRecoStreams_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -906,12 +906,12 @@
dataTier = cms.untracked.string('ALCARECO')
)

ALCARECOStreamPPSAlignment = cms.FilteredStream(
ALCARECOStreamPromptCalibProdPPSAlignment = cms.FilteredStream(
responsible = 'Mateusz Kocot',
name = 'PPSAlignment',
paths = (pathALCARECOPPSAlignment),
content = OutALCARECOPPSAlignment.outputCommands,
selectEvents = OutALCARECOPPSAlignment.SelectEvents,
name = 'PromptCalibProdPPSAlignment',
paths = (pathALCARECOPromptCalibProdPPSAlignment),
content = OutALCARECOPromptCalibProdPPSAlignment.outputCommands,
selectEvents = OutALCARECOPromptCalibProdPPSAlignment.SelectEvents,
dataTier = cms.untracked.string('ALCARECO')
)

Expand Down