Skip to content

Commit

Permalink
PPS alignment tier0 renaming
Browse files Browse the repository at this point in the history
Via #58

* renaming according to guidelines for Tier0 replay

* pps alignment renaming - part 2

* pps alignment renaming - part 3 (paths)

* Updated the PPS alignment AlCa file names.

PPSAlignment -> PromptCalibProdPPSAlignment

Co-authored-by: Mateusz <mateuszkocot99@gmail.com>
  • Loading branch information
grzanka and MatiXOfficial committed Jan 23, 2022
1 parent f61b5c6 commit 689e342
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 26 deletions.
13 changes: 0 additions & 13 deletions CalibPPS/AlignmentGlobal/python/ALCARECOPPSAlignment_Output_cff.py

This file was deleted.

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 *')
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
'PromptCalibProdLumiPCC': 'LumiPCC',
'PromptCalibProdPPSTimingCalib' : 'PPSTimingCalibration',
'PromptCalibProdPPSDiamondSampic' : 'PPSDiamondSampicTimingCalibration',
'PromptCalibProdPPSAlig' : 'PPSAlignment'
'PromptCalibProdPPSAlignment' : 'PPSAlignment'
}
2 changes: 1 addition & 1 deletion Configuration/EventContent/python/AlCaRecoOutput_cff.py
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.ALCARECOPromptCalibProdPPSTimingCalib_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
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:ALCARECOStreamPromptCalibProdPPSTimingCalib.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
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
from CalibPPS.TimingCalibration.ALCARECOPromptCalibProdPPSTimingCalib_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)
pathALCARECOPromptCalibProdPPSTimingCalib = cms.Path(taskALCARECOPromptCalibProdPPSTimingCalib)
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

0 comments on commit 689e342

Please sign in to comment.