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

[12.3.X] Shorten the names of two ALCARECOStreams in order to fit into DBS database schema limitations #38188

Merged
merged 3 commits into from Jun 3, 2022
Merged

[12.3.X] Shorten the names of two ALCARECOStreams in order to fit into DBS database schema limitations #38188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69839c2
rename ALCARECOStreamPromptCalibProdSiStripHitEfficiency -> ALCARECOS…
mmusich Jun 1, 2022
aade899
update autoPCL to reflect the new naming scheme
mmusich Jun 2, 2022
f86a438
rename also the Output commands
mmusich Jun 2, 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
6 changes: 3 additions & 3 deletions ...ation/TkAlCaRecoProducers/python/ALCARECOPromptCalibProdSiPixelLorentzAngle_Output_cff.py
View file
Open in desktop
@@ -1,6 +1,6 @@
import FWCore.ParameterSet.Config as cms

OutALCARECOPromptCalibProdSiPixelLorentzAngle_noDrop = cms.PSet(
OutALCARECOPromptCalibProdSiPixelLA_noDrop = cms.PSet(
SelectEvents = cms.untracked.PSet(
SelectEvents = cms.vstring('pathALCARECOPromptCalibProdSiPixelLorentzAngle')
),
Expand All @@ -9,5 +9,5 @@
'keep *_MEtoEDMConvertSiPixelLorentzAngle_*_*',
)
)
OutALCARECOPromptCalibProdSiPixelLorentzAngle=OutALCARECOPromptCalibProdSiPixelLorentzAngle_noDrop.clone()
OutALCARECOPromptCalibProdSiPixelLorentzAngle.outputCommands.insert(0, "drop *")
OutALCARECOPromptCalibProdSiPixelLA=OutALCARECOPromptCalibProdSiPixelLA_noDrop.clone()
OutALCARECOPromptCalibProdSiPixelLA.outputCommands.insert(0, "drop *")
6 changes: 3 additions & 3 deletions ...tion/TkAlCaRecoProducers/python/ALCARECOPromptCalibProdSiStripHitEfficiency_Output_cff.py
View file
Open in desktop
@@ -1,9 +1,9 @@
import FWCore.ParameterSet.Config as cms

OutALCARECOPromptCalibProdSiStripHitEfficiency_noDrop = cms.PSet(
OutALCARECOPromptCalibProdSiStripHitEff_noDrop = cms.PSet(
SelectEvents = cms.untracked.PSet(
SelectEvents = cms.vstring('pathALCARECOPromptCalibProdSiStripHitEfficiency')),
outputCommands = cms.untracked.vstring('keep *_MEtoEDMConvertSiStripHitEff_*_*'))

OutALCARECOPromptCalibProdSiStripHitEfficiency = OutALCARECOPromptCalibProdSiStripHitEfficiency_noDrop.clone()
OutALCARECOPromptCalibProdSiStripHitEfficiency.outputCommands.insert(0, "drop *")
OutALCARECOPromptCalibProdSiStripHitEff = OutALCARECOPromptCalibProdSiStripHitEff_noDrop.clone()
OutALCARECOPromptCalibProdSiStripHitEff.outputCommands.insert(0, "drop *")
4 changes: 2 additions & 2 deletions Configuration/AlCa/python/autoPCL.py
View file
Open in desktop
Expand Up @@ -4,10 +4,10 @@
'PromptCalibProdSiStrip' : 'SiStripQuality',
'PromptCalibProdSiStripGains' : 'SiStripGains',
'PromptCalibProdSiStripGainsAAG' : 'SiStripGainsAAG',
'PromptCalibProdSiStripHitEfficiency' : 'SiStripHitEff',
'PromptCalibProdSiStripHitEff' : 'SiStripHitEff',
'PromptCalibProdSiPixelAli' : 'SiPixelAli',
'PromptCalibProdSiPixel' : 'SiPixelQuality',
'PromptCalibProdSiPixelLorentzAngle' : 'SiPixelLA',
'PromptCalibProdSiPixelLA' : 'SiPixelLA',
'PromptCalibProdEcalPedestals': 'EcalPedestals',
'PromptCalibProdLumiPCC': 'LumiPCC',
'PromptCalibProdPPSTimingCalib' : 'PPSTimingCalibration',
Expand Down
16 changes: 8 additions & 8 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Expand Up @@ -2207,12 +2207,12 @@ def lhegensim2018ml(fragment,howMuch):
'--data':'',
'--filein':'file:PromptCalibProdSiPixel.root'}

steps['ALCAHARVDSIPIXELCALLA']={'-s':'ALCAHARVEST:%s'%(autoPCL['PromptCalibProdSiPixelLorentzAngle']),
steps['ALCAHARVDSIPIXELCALLA']={'-s':'ALCAHARVEST:%s'%(autoPCL['PromptCalibProdSiPixelLA']),
'--conditions':'auto:run3_data_express',
'--scenario':'pp',
'--data':'',
'--era':'Run2_2017',
'--filein':'file:PromptCalibProdSiPixelLorentzAngle.root'}
'--filein':'file:PromptCalibProdSiPixelLA.root'}

steps['ALCAHARVDPPSCAL']={'-s':'ALCAHARVEST:%s'%(autoPCL['PromptCalibProdPPSTimingCalib']),
'--conditions':'auto:run3_data_express',
Expand Down Expand Up @@ -2709,13 +2709,13 @@ def gen2021HiMix(fragment,howMuch):
'--conditions':'auto:run1_data',
'--datatier':'ALCARECO',
'--eventcontent':'ALCARECO'}
steps['ALCAEXP']={'-s':'ALCAOUTPUT:SiStripCalZeroBias+TkAlMinBias+Hotline+LumiPixelsMinBias+AlCaPCCZeroBiasFromRECO+AlCaPCCRandomFromRECO+SiPixelCalSingleMuon,ALCA:PromptCalibProd+PromptCalibProdSiStrip+PromptCalibProdSiStripGains+PromptCalibProdSiStripGainsAAG+PromptCalibProdSiStripHitEfficiency+PromptCalibProdSiPixelAli+PromptCalibProdSiPixel+PromptCalibProdSiPixelLorentzAngle',
steps['ALCAEXP']={'-s':'ALCAOUTPUT:SiStripCalZeroBias+TkAlMinBias+Hotline+LumiPixelsMinBias+AlCaPCCZeroBiasFromRECO+AlCaPCCRandomFromRECO+SiPixelCalSingleMuon,ALCA:PromptCalibProd+PromptCalibProdSiStrip+PromptCalibProdSiStripGains+PromptCalibProdSiStripGainsAAG+PromptCalibProdSiStripHitEff+PromptCalibProdSiPixelAli+PromptCalibProdSiPixel+PromptCalibProdSiPixelLA',
'--conditions':'auto:run1_data',
'--datatier':'ALCARECO',
'--eventcontent':'ALCARECO',
'--triggerResultsProcess': 'RECO'}

steps['ALCAEXPRUN2']={'-s':'ALCAOUTPUT:SiStripCalZeroBias+TkAlMinBias+LumiPixelsMinBias+AlCaPCCZeroBiasFromRECO+AlCaPCCRandomFromRECO+SiPixelCalZeroBias+SiPixelCalSingleMuon,ALCA:PromptCalibProd+PromptCalibProdSiStrip+PromptCalibProdSiStripGains+PromptCalibProdSiStripGainsAAG+PromptCalibProdSiStripHitEfficiency+PromptCalibProdSiPixelAli+PromptCalibProdSiPixel+PromptCalibProdSiPixelLorentzAngle',
steps['ALCAEXPRUN2']={'-s':'ALCAOUTPUT:SiStripCalZeroBias+TkAlMinBias+LumiPixelsMinBias+AlCaPCCZeroBiasFromRECO+AlCaPCCRandomFromRECO+SiPixelCalZeroBias+SiPixelCalSingleMuon,ALCA:PromptCalibProd+PromptCalibProdSiStrip+PromptCalibProdSiStripGains+PromptCalibProdSiStripGainsAAG+PromptCalibProdSiStripHitEff+PromptCalibProdSiPixelAli+PromptCalibProdSiPixel+PromptCalibProdSiPixelLA',
'--conditions':'auto:run2_data',
'--datatier':'ALCARECO',
'--eventcontent':'ALCARECO',
Expand Down Expand Up @@ -2839,17 +2839,17 @@ def gen2021HiMix(fragment,howMuch):
'--data':'',
'--filein':'file:PromptCalibProdSiPixel.root'}

steps['ALCAHARVD7']={'-s':'ALCAHARVEST:%s'%(autoPCL['PromptCalibProdSiPixelLorentzAngle']),
steps['ALCAHARVD7']={'-s':'ALCAHARVEST:%s'%(autoPCL['PromptCalibProdSiPixelLA']),
'--conditions':'auto:run1_data',
'--scenario':'pp',
'--data':'',
'--filein':'file:PromptCalibProdSiPixelLorentzAngle.root'}
'--filein':'file:PromptCalibProdSiPixelLA.root'}

steps['ALCAHARVD8']={'-s':'ALCAHARVEST:%s'%(autoPCL['PromptCalibProdSiStripHitEfficiency']),
steps['ALCAHARVD8']={'-s':'ALCAHARVEST:%s'%(autoPCL['PromptCalibProdSiStripHitEff']),
'--conditions':'auto:run1_data',
'--scenario':'pp',
'--data':'',
'--filein':'file:PromptCalibProdSiStripHitEfficiency.root'}
'--filein':'file:PromptCalibProdSiStripHitEff.root'}

steps['ALCAHARVD5HI']=merge([{'--scenario':'HeavyIons'},steps['ALCAHARVD5']])
steps['ALCAHARVDTE']={'-s':'ALCAHARVEST:%s'%(autoPCL['PromptCalibProdEcalPedestals']),
Expand Down
16 changes: 8 additions & 8 deletions Configuration/StandardSequences/python/AlCaRecoStreams_cff.py
View file
Open in desktop
Expand Up @@ -1007,21 +1007,21 @@
dataTier = cms.untracked.string('ALCARECO')
)

ALCARECOStreamPromptCalibProdSiStripHitEfficiency = cms.FilteredStream(
ALCARECOStreamPromptCalibProdSiStripHitEff = cms.FilteredStream(
responsible = 'Marco Musich',
name = 'PromptCalibProdSiStripHitEfficiency',
name = 'PromptCalibProdSiStripHitEff',
paths = (pathALCARECOPromptCalibProdSiStripHitEfficiency),
content = OutALCARECOPromptCalibProdSiStripHitEfficiency.outputCommands,
selectEvents = OutALCARECOPromptCalibProdSiStripHitEfficiency.SelectEvents,
content = OutALCARECOPromptCalibProdSiStripHitEff.outputCommands,
selectEvents = OutALCARECOPromptCalibProdSiStripHitEff.SelectEvents,
dataTier = cms.untracked.string('ALCARECO')
)

ALCARECOStreamPromptCalibProdSiPixelLorentzAngle = cms.FilteredStream(
ALCARECOStreamPromptCalibProdSiPixelLA = cms.FilteredStream(
responsible = 'Marco Musich',
name = 'PromptCalibProdSiPixelLorentzAngle',
name = 'PromptCalibProdSiPixelLA',
paths = (pathALCARECOPromptCalibProdSiPixelLorentzAngle),
content = OutALCARECOPromptCalibProdSiPixelLorentzAngle.outputCommands,
selectEvents = OutALCARECOPromptCalibProdSiPixelLorentzAngle.SelectEvents,
content = OutALCARECOPromptCalibProdSiPixelLA.outputCommands,
selectEvents = OutALCARECOPromptCalibProdSiPixelLA.SelectEvents,
dataTier = cms.untracked.string('ALCARECO')
)

Expand Down