diff --git a/CalibPPS/AlignmentGlobal/python/ALCARECOPPSAlignment_Output_cff.py b/CalibPPS/AlignmentGlobal/python/ALCARECOPPSAlignment_Output_cff.py deleted file mode 100644 index 8ff556699bdaf..0000000000000 --- a/CalibPPS/AlignmentGlobal/python/ALCARECOPPSAlignment_Output_cff.py +++ /dev/null @@ -1,13 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -OutALCARECOPPSAlignment_noDrop = cms.PSet( - SelectEvents = cms.untracked.PSet( - SelectEvents = cms.vstring('pathALCARECOPPSAlignment') - ), - outputCommands = cms.untracked.vstring( - 'keep *_MEtoEDMConvertPPSAlignment_*_*', - ) -) - -OutALCARECOPPSAlignment = OutALCARECOPPSAlignment_noDrop.clone() -OutALCARECOPPSAlignment.outputCommands.insert(0, 'drop *') diff --git a/CalibPPS/AlignmentGlobal/python/ALCARECOPromptCalibProdPPSAlignment_Output_cff.py b/CalibPPS/AlignmentGlobal/python/ALCARECOPromptCalibProdPPSAlignment_Output_cff.py new file mode 100644 index 0000000000000..11f99cee08740 --- /dev/null +++ b/CalibPPS/AlignmentGlobal/python/ALCARECOPromptCalibProdPPSAlignment_Output_cff.py @@ -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 *') diff --git a/CalibPPS/AlignmentGlobal/python/ALCARECOPPSAlignment_cff.py b/CalibPPS/AlignmentGlobal/python/ALCARECOPromptCalibProdPPSAlignment_cff.py similarity index 87% rename from CalibPPS/AlignmentGlobal/python/ALCARECOPPSAlignment_cff.py rename to CalibPPS/AlignmentGlobal/python/ALCARECOPromptCalibProdPPSAlignment_cff.py index 3b01706270500..b08b4462bcd79 100644 --- a/CalibPPS/AlignmentGlobal/python/ALCARECOPPSAlignment_cff.py +++ b/CalibPPS/AlignmentGlobal/python/ALCARECOPromptCalibProdPPSAlignment_cff.py @@ -10,7 +10,7 @@ deleteAfterCopy=cms.untracked.bool(True) ) -taskALCARECOPPSAlignment = cms.Task( +taskALCARECOPromptCalibProdPPSAlignment = cms.Task( ppsAlignmentWorker, MEtoEDMConvertPPSAlignment ) 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/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/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index bdfca7ad6c077..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':'', @@ -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..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 @@ -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) @@ -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') )