Merge pull request #38186 from mmusich/renameLongAlCaStreamName

Shorten the names of two ALCARECOStreams in order to fit into DBS database schema limitations
cms-sw · Jun 2, 2022 · 1d3b5c4 · 1d3b5c4
2 parents a54d721 + c011b6e
commit 1d3b5c4
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/...ation/TkAlCaRecoProducers/python/ALCARECOPromptCalibProdSiPixelLorentzAngle_Output_cff.py b/...ation/TkAlCaRecoProducers/python/ALCARECOPromptCalibProdSiPixelLorentzAngle_Output_cff.py
@@ -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')
     ),
@@ -9,5 +9,5 @@
         'keep *_MEtoEDMConvertSiPixelLorentzAngle_*_*',
     )
 )
-OutALCARECOPromptCalibProdSiPixelLorentzAngle=OutALCARECOPromptCalibProdSiPixelLorentzAngle_noDrop.clone()
-OutALCARECOPromptCalibProdSiPixelLorentzAngle.outputCommands.insert(0, "drop *")
+OutALCARECOPromptCalibProdSiPixelLA=OutALCARECOPromptCalibProdSiPixelLA_noDrop.clone()
+OutALCARECOPromptCalibProdSiPixelLA.outputCommands.insert(0, "drop *")
diff --git a/...tion/TkAlCaRecoProducers/python/ALCARECOPromptCalibProdSiStripHitEfficiency_Output_cff.py b/...tion/TkAlCaRecoProducers/python/ALCARECOPromptCalibProdSiStripHitEfficiency_Output_cff.py
@@ -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 *")
diff --git a/Configuration/AlCa/python/autoPCL.py b/Configuration/AlCa/python/autoPCL.py
@@ -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',

diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py
@@ -2215,12 +2215,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',
@@ -2717,13 +2717,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',
@@ -2847,17 +2847,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']),

diff --git a/Configuration/StandardSequences/python/AlCaRecoStreams_cff.py b/Configuration/StandardSequences/python/AlCaRecoStreams_cff.py
@@ -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')
         )