diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJetHT_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJetHT_Output_cff.py index cfc70596d00e0..5bf64d3a22e35 100644 --- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJetHT_Output_cff.py +++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJetHT_Output_cff.py @@ -17,3 +17,13 @@ OutALCARECOTkAlJetHT = OutALCARECOTkAlJetHT_noDrop.clone() OutALCARECOTkAlJetHT.outputCommands.insert(0, "drop *") + +# in Run3, SCAL digis replaced by onlineMetaDataDigis +_run3_common_removedCommands = OutALCARECOTkAlJetHT.outputCommands +_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*') + +_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*', + 'keep OnlineLuminosityRecord_onlineMetaDataDigis_*_*'] + +from Configuration.Eras.Modifier_run3_common_cff import run3_common +run3_common.toModify(OutALCARECOTkAlJetHT, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJpsiMuMuHI_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJpsiMuMuHI_Output_cff.py index 2394af5b28e66..9a5750c3b58a2 100644 --- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJpsiMuMuHI_Output_cff.py +++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJpsiMuMuHI_Output_cff.py @@ -17,3 +17,12 @@ import copy OutALCARECOTkAlJpsiMuMuHI = copy.deepcopy(OutALCARECOTkAlJpsiMuMuHI_noDrop) OutALCARECOTkAlJpsiMuMuHI.outputCommands.insert(0, "drop *") + +# in Run3, SCAL digis replaced by onlineMetaDataDigis +_run3_common_removedCommands = OutALCARECOTkAlJpsiMuMuHI.outputCommands +_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*') + +_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*'] + +from Configuration.Eras.Modifier_run3_common_cff import run3_common +run3_common.toModify(OutALCARECOTkAlJpsiMuMuHI, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJpsiMuMu_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJpsiMuMu_Output_cff.py index bbffc20da5343..f44491bccfd3d 100644 --- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJpsiMuMu_Output_cff.py +++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJpsiMuMu_Output_cff.py @@ -17,3 +17,12 @@ import copy OutALCARECOTkAlJpsiMuMu = copy.deepcopy(OutALCARECOTkAlJpsiMuMu_noDrop) OutALCARECOTkAlJpsiMuMu.outputCommands.insert(0, "drop *") + +# in Run3, SCAL digis replaced by onlineMetaDataDigis +_run3_common_removedCommands = OutALCARECOTkAlJpsiMuMu.outputCommands +_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*') + +_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*'] + +from Configuration.Eras.Modifier_run3_common_cff import run3_common +run3_common.toModify(OutALCARECOTkAlJpsiMuMu, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBiasHI_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBiasHI_Output_cff.py index 64598a1da4120..810a3304f1eaa 100644 --- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBiasHI_Output_cff.py +++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBiasHI_Output_cff.py @@ -18,3 +18,12 @@ import copy OutALCARECOTkAlMinBiasHI = copy.deepcopy(OutALCARECOTkAlMinBiasHI_noDrop) OutALCARECOTkAlMinBiasHI.outputCommands.insert(0, "drop *") + +# in Run3, SCAL digis replaced by onlineMetaDataDigis +_run3_common_removedCommands = OutALCARECOTkAlMinBiasHI.outputCommands +_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*') + +_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*'] + +from Configuration.Eras.Modifier_run3_common_cff import run3_common +run3_common.toModify(OutALCARECOTkAlMinBiasHI, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBias_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBias_Output_cff.py index 3546d98d4dfa6..91056097521f3 100644 --- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBias_Output_cff.py +++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBias_Output_cff.py @@ -18,3 +18,13 @@ import copy OutALCARECOTkAlMinBias = copy.deepcopy(OutALCARECOTkAlMinBias_noDrop) OutALCARECOTkAlMinBias.outputCommands.insert(0, "drop *") + +# in Run3, SCAL digis replaced by onlineMetaDataDigis +_run3_common_removedCommands = OutALCARECOTkAlMinBias.outputCommands +_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*') + +_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*', + 'keep OnlineLuminosityRecord_onlineMetaDataDigis_*_*'] + +from Configuration.Eras.Modifier_run3_common_cff import run3_common +run3_common.toModify(OutALCARECOTkAlMinBias, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolatedHI_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolatedHI_Output_cff.py index d774cf01d9074..0feb83d95adce 100644 --- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolatedHI_Output_cff.py +++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolatedHI_Output_cff.py @@ -17,3 +17,12 @@ import copy OutALCARECOTkAlMuonIsolatedHI = copy.deepcopy(OutALCARECOTkAlMuonIsolatedHI_noDrop) OutALCARECOTkAlMuonIsolatedHI.outputCommands.insert(0, "drop *") + +# in Run3, SCAL digis replaced by onlineMetaDataDigis +_run3_common_removedCommands = OutALCARECOTkAlMuonIsolatedHI.outputCommands +_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*') + +_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*'] + +from Configuration.Eras.Modifier_run3_common_cff import run3_common +run3_common.toModify(OutALCARECOTkAlMuonIsolatedHI, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolated_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolated_Output_cff.py index be42d0d75af65..d7e3b62a57d6f 100644 --- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolated_Output_cff.py +++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolated_Output_cff.py @@ -17,3 +17,12 @@ import copy OutALCARECOTkAlMuonIsolated = copy.deepcopy(OutALCARECOTkAlMuonIsolated_noDrop) OutALCARECOTkAlMuonIsolated.outputCommands.insert(0, "drop *") + +# in Run3, SCAL digis replaced by onlineMetaDataDigis +_run3_common_removedCommands = OutALCARECOTkAlMuonIsolated.outputCommands +_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*') + +_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*'] + +from Configuration.Eras.Modifier_run3_common_cff import run3_common +run3_common.toModify(OutALCARECOTkAlMuonIsolated, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMuHI_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMuHI_Output_cff.py index b745eda81ae59..3ee4a6fa54313 100644 --- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMuHI_Output_cff.py +++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMuHI_Output_cff.py @@ -17,3 +17,12 @@ import copy OutALCARECOTkAlUpsilonMuMuHI = copy.deepcopy(OutALCARECOTkAlUpsilonMuMuHI_noDrop) OutALCARECOTkAlUpsilonMuMuHI.outputCommands.insert(0, "drop *") + +# in Run3, SCAL digis replaced by onlineMetaDataDigis +_run3_common_removedCommands = OutALCARECOTkAlUpsilonMuMuHI.outputCommands +_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*') + +_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*'] + +from Configuration.Eras.Modifier_run3_common_cff import run3_common +run3_common.toModify(OutALCARECOTkAlUpsilonMuMuHI, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMu_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMu_Output_cff.py index ef8c18b28d244..2dcb639d6c2a7 100644 --- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMu_Output_cff.py +++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMu_Output_cff.py @@ -17,3 +17,12 @@ import copy OutALCARECOTkAlUpsilonMuMu = copy.deepcopy(OutALCARECOTkAlUpsilonMuMu_noDrop) OutALCARECOTkAlUpsilonMuMu.outputCommands.insert(0, "drop *") + +# in Run3, SCAL digis replaced by onlineMetaDataDigis +_run3_common_removedCommands = OutALCARECOTkAlUpsilonMuMu.outputCommands +_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*') + +_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*'] + +from Configuration.Eras.Modifier_run3_common_cff import run3_common +run3_common.toModify(OutALCARECOTkAlUpsilonMuMu, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMuHI_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMuHI_Output_cff.py index c8855402e3172..c6bade04cbbcf 100644 --- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMuHI_Output_cff.py +++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMuHI_Output_cff.py @@ -17,3 +17,12 @@ import copy OutALCARECOTkAlZMuMuHI = copy.deepcopy(OutALCARECOTkAlZMuMuHI_noDrop) OutALCARECOTkAlZMuMuHI.outputCommands.insert(0, "drop *") + +# in Run3, SCAL digis replaced by onlineMetaDataDigis +_run3_common_removedCommands = OutALCARECOTkAlZMuMuHI.outputCommands +_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*') + +_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*'] + +from Configuration.Eras.Modifier_run3_common_cff import run3_common +run3_common.toModify(OutALCARECOTkAlZMuMuHI, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMu_Output_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMu_Output_cff.py index 7f88da3d15991..3683299f1ffac 100644 --- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMu_Output_cff.py +++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMu_Output_cff.py @@ -17,3 +17,12 @@ import copy OutALCARECOTkAlZMuMu = copy.deepcopy(OutALCARECOTkAlZMuMu_noDrop) OutALCARECOTkAlZMuMu.outputCommands.insert(0, "drop *") + +# in Run3, SCAL digis replaced by onlineMetaDataDigis +_run3_common_removedCommands = OutALCARECOTkAlZMuMu.outputCommands +_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*') + +_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*'] + +from Configuration.Eras.Modifier_run3_common_cff import run3_common +run3_common.toModify(OutALCARECOTkAlZMuMu, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) diff --git a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalCosmics_Output_cff.py b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalCosmics_Output_cff.py index d1700322a9e4c..ccfa14ee8c736 100644 --- a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalCosmics_Output_cff.py +++ b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalCosmics_Output_cff.py @@ -20,3 +20,14 @@ import copy OutALCARECOSiStripCalCosmics=copy.deepcopy(OutALCARECOSiStripCalCosmics_noDrop) OutALCARECOSiStripCalCosmics.outputCommands.insert(0,"drop *") + +# in Run3, SCAL digis replaced by onlineMetaDataDigis +_run3_common_removedCommands = OutALCARECOSiStripCalCosmics.outputCommands +_run3_common_removedCommands.remove('keep LumiScalerss_scalersRawToDigi_*_*') +_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*') + +_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*', + 'keep OnlineLuminosityRecord_onlineMetaDataDigis_*_*'] + +from Configuration.Eras.Modifier_run3_common_cff import run3_common +run3_common.toModify(OutALCARECOSiStripCalCosmics, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) diff --git a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasAAGHI_Output_cff.py b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasAAGHI_Output_cff.py index aabd7c0637357..cf1fc0c02dc3d 100644 --- a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasAAGHI_Output_cff.py +++ b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasAAGHI_Output_cff.py @@ -21,3 +21,14 @@ import copy OutALCARECOSiStripCalMinBiasAAG=copy.deepcopy(OutALCARECOSiStripCalMinBiasAAG_noDrop) OutALCARECOSiStripCalMinBiasAAG.outputCommands.insert(0,"drop *") + +# in Run3, SCAL digis replaced by onlineMetaDataDigis +_run3_common_removedCommands = OutALCARECOSiStripCalMinBiasAAG.outputCommands +_run3_common_removedCommands.remove('keep LumiScalerss_scalersRawToDigi_*_*') +_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*') + +_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*', + 'keep OnlineLuminosityRecord_onlineMetaDataDigis_*_*'] + +from Configuration.Eras.Modifier_run3_common_cff import run3_common +run3_common.toModify(OutALCARECOSiStripCalMinBiasAAG, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) diff --git a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasAAG_Output_cff.py b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasAAG_Output_cff.py index aabd7c0637357..cf1fc0c02dc3d 100644 --- a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasAAG_Output_cff.py +++ b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasAAG_Output_cff.py @@ -21,3 +21,14 @@ import copy OutALCARECOSiStripCalMinBiasAAG=copy.deepcopy(OutALCARECOSiStripCalMinBiasAAG_noDrop) OutALCARECOSiStripCalMinBiasAAG.outputCommands.insert(0,"drop *") + +# in Run3, SCAL digis replaced by onlineMetaDataDigis +_run3_common_removedCommands = OutALCARECOSiStripCalMinBiasAAG.outputCommands +_run3_common_removedCommands.remove('keep LumiScalerss_scalersRawToDigi_*_*') +_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*') + +_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*', + 'keep OnlineLuminosityRecord_onlineMetaDataDigis_*_*'] + +from Configuration.Eras.Modifier_run3_common_cff import run3_common +run3_common.toModify(OutALCARECOSiStripCalMinBiasAAG, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) diff --git a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasHI_Output_cff.py b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasHI_Output_cff.py index 84d3e7db191f2..d98d9febd3de4 100644 --- a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasHI_Output_cff.py +++ b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasHI_Output_cff.py @@ -21,3 +21,14 @@ import copy OutALCARECOSiStripCalMinBias=copy.deepcopy(OutALCARECOSiStripCalMinBias_noDrop) OutALCARECOSiStripCalMinBias.outputCommands.insert(0,"drop *") + +# in Run3, SCAL digis replaced by onlineMetaDataDigis +_run3_common_removedCommands = OutALCARECOSiStripCalMinBias.outputCommands +_run3_common_removedCommands.remove('keep LumiScalerss_scalersRawToDigi_*_*') +_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*') + +_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*', + 'keep OnlineLuminosityRecord_onlineMetaDataDigis_*_*'] + +from Configuration.Eras.Modifier_run3_common_cff import run3_common +run3_common.toModify(OutALCARECOSiStripCalMinBias, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) diff --git a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBias_Output_cff.py b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBias_Output_cff.py index 84d3e7db191f2..d98d9febd3de4 100644 --- a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBias_Output_cff.py +++ b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBias_Output_cff.py @@ -21,3 +21,14 @@ import copy OutALCARECOSiStripCalMinBias=copy.deepcopy(OutALCARECOSiStripCalMinBias_noDrop) OutALCARECOSiStripCalMinBias.outputCommands.insert(0,"drop *") + +# in Run3, SCAL digis replaced by onlineMetaDataDigis +_run3_common_removedCommands = OutALCARECOSiStripCalMinBias.outputCommands +_run3_common_removedCommands.remove('keep LumiScalerss_scalersRawToDigi_*_*') +_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*') + +_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*', + 'keep OnlineLuminosityRecord_onlineMetaDataDigis_*_*'] + +from Configuration.Eras.Modifier_run3_common_cff import run3_common +run3_common.toModify(OutALCARECOSiStripCalMinBias, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) diff --git a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalSmallBiasScan_Output_cff.py b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalSmallBiasScan_Output_cff.py index defc658746231..6794594e99f39 100644 --- a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalSmallBiasScan_Output_cff.py +++ b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalSmallBiasScan_Output_cff.py @@ -21,3 +21,14 @@ import copy OutALCARECOSiStripCalSmallBiasScan=copy.deepcopy(OutALCARECOSiStripCalSmallBiasScan_noDrop) OutALCARECOSiStripCalSmallBiasScan.outputCommands.insert(0,"drop *") + +# in Run3, SCAL digis replaced by onlineMetaDataDigis +_run3_common_removedCommands = OutALCARECOSiStripCalSmallBiasScan.outputCommands +_run3_common_removedCommands.remove('keep LumiScalerss_scalersRawToDigi_*_*') +_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*') + +_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*', + 'keep OnlineLuminosityRecord_onlineMetaDataDigis_*_*'] + +from Configuration.Eras.Modifier_run3_common_cff import run3_common +run3_common.toModify(OutALCARECOSiStripCalSmallBiasScan, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)