From b8f0b285f7b5d5b3f776a42ca433eebb3222334f Mon Sep 17 00:00:00 2001 From: mmusich Date: Mon, 4 Jul 2022 15:05:01 +0200 Subject: [PATCH] fix the SiStrip AlCaReco event contents to cope with no SCAL in Run3 --- .../python/ALCARECOSiStripCalCosmics_Output_cff.py | 12 ++++++------ .../ALCARECOSiStripCalMinBiasAAGHI_Output_cff.py | 13 ++++++------- .../ALCARECOSiStripCalMinBiasAAG_Output_cff.py | 13 ++++++------- .../ALCARECOSiStripCalMinBiasHI_Output_cff.py | 13 ++++++------- .../python/ALCARECOSiStripCalMinBias_Output_cff.py | 13 ++++++------- .../ALCARECOSiStripCalSmallBiasScan_Output_cff.py | 13 ++++++------- 6 files changed, 36 insertions(+), 41 deletions(-) diff --git a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalCosmics_Output_cff.py b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalCosmics_Output_cff.py index ccfa14ee8c736..4db019d136c67 100644 --- a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalCosmics_Output_cff.py +++ b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalCosmics_Output_cff.py @@ -17,12 +17,9 @@ 'keep *_TriggerResults_*_*') ) -import copy -OutALCARECOSiStripCalCosmics=copy.deepcopy(OutALCARECOSiStripCalCosmics_noDrop) -OutALCARECOSiStripCalCosmics.outputCommands.insert(0,"drop *") - # in Run3, SCAL digis replaced by onlineMetaDataDigis -_run3_common_removedCommands = OutALCARECOSiStripCalCosmics.outputCommands +import copy +_run3_common_removedCommands = OutALCARECOSiStripCalCosmics_noDrop.outputCommands.copy() _run3_common_removedCommands.remove('keep LumiScalerss_scalersRawToDigi_*_*') _run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*') @@ -30,4 +27,7 @@ 'keep OnlineLuminosityRecord_onlineMetaDataDigis_*_*'] from Configuration.Eras.Modifier_run3_common_cff import run3_common -run3_common.toModify(OutALCARECOSiStripCalCosmics, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) +run3_common.toModify(OutALCARECOSiStripCalCosmics_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) + +OutALCARECOSiStripCalCosmics=OutALCARECOSiStripCalCosmics_noDrop.clone() +OutALCARECOSiStripCalCosmics.outputCommands.insert(0,"drop *") diff --git a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasAAGHI_Output_cff.py b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasAAGHI_Output_cff.py index cf1fc0c02dc3d..a7a4c07624319 100644 --- a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasAAGHI_Output_cff.py +++ b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasAAGHI_Output_cff.py @@ -17,13 +17,9 @@ 'keep *_TriggerResults_*_*') ) - -import copy -OutALCARECOSiStripCalMinBiasAAG=copy.deepcopy(OutALCARECOSiStripCalMinBiasAAG_noDrop) -OutALCARECOSiStripCalMinBiasAAG.outputCommands.insert(0,"drop *") - # in Run3, SCAL digis replaced by onlineMetaDataDigis -_run3_common_removedCommands = OutALCARECOSiStripCalMinBiasAAG.outputCommands +import copy +_run3_common_removedCommands = OutALCARECOSiStripCalMinBiasAAG_noDrop.outputCommands.copy() _run3_common_removedCommands.remove('keep LumiScalerss_scalersRawToDigi_*_*') _run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*') @@ -31,4 +27,7 @@ 'keep OnlineLuminosityRecord_onlineMetaDataDigis_*_*'] from Configuration.Eras.Modifier_run3_common_cff import run3_common -run3_common.toModify(OutALCARECOSiStripCalMinBiasAAG, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) +run3_common.toModify(OutALCARECOSiStripCalMinBiasAAG_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) + +OutALCARECOSiStripCalMinBiasAAG=OutALCARECOSiStripCalMinBiasAAG_noDrop.clone() +OutALCARECOSiStripCalMinBiasAAG.outputCommands.insert(0,"drop *") diff --git a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasAAG_Output_cff.py b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasAAG_Output_cff.py index cf1fc0c02dc3d..a7a4c07624319 100644 --- a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasAAG_Output_cff.py +++ b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasAAG_Output_cff.py @@ -17,13 +17,9 @@ 'keep *_TriggerResults_*_*') ) - -import copy -OutALCARECOSiStripCalMinBiasAAG=copy.deepcopy(OutALCARECOSiStripCalMinBiasAAG_noDrop) -OutALCARECOSiStripCalMinBiasAAG.outputCommands.insert(0,"drop *") - # in Run3, SCAL digis replaced by onlineMetaDataDigis -_run3_common_removedCommands = OutALCARECOSiStripCalMinBiasAAG.outputCommands +import copy +_run3_common_removedCommands = OutALCARECOSiStripCalMinBiasAAG_noDrop.outputCommands.copy() _run3_common_removedCommands.remove('keep LumiScalerss_scalersRawToDigi_*_*') _run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*') @@ -31,4 +27,7 @@ 'keep OnlineLuminosityRecord_onlineMetaDataDigis_*_*'] from Configuration.Eras.Modifier_run3_common_cff import run3_common -run3_common.toModify(OutALCARECOSiStripCalMinBiasAAG, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) +run3_common.toModify(OutALCARECOSiStripCalMinBiasAAG_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) + +OutALCARECOSiStripCalMinBiasAAG=OutALCARECOSiStripCalMinBiasAAG_noDrop.clone() +OutALCARECOSiStripCalMinBiasAAG.outputCommands.insert(0,"drop *") diff --git a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasHI_Output_cff.py b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasHI_Output_cff.py index d98d9febd3de4..1c55ac73a515f 100644 --- a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasHI_Output_cff.py +++ b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasHI_Output_cff.py @@ -17,13 +17,9 @@ 'keep *_TriggerResults_*_*') ) - -import copy -OutALCARECOSiStripCalMinBias=copy.deepcopy(OutALCARECOSiStripCalMinBias_noDrop) -OutALCARECOSiStripCalMinBias.outputCommands.insert(0,"drop *") - # in Run3, SCAL digis replaced by onlineMetaDataDigis -_run3_common_removedCommands = OutALCARECOSiStripCalMinBias.outputCommands +import copy +_run3_common_removedCommands = OutALCARECOSiStripCalMinBias_noDrop.outputCommands.copy() _run3_common_removedCommands.remove('keep LumiScalerss_scalersRawToDigi_*_*') _run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*') @@ -31,4 +27,7 @@ 'keep OnlineLuminosityRecord_onlineMetaDataDigis_*_*'] from Configuration.Eras.Modifier_run3_common_cff import run3_common -run3_common.toModify(OutALCARECOSiStripCalMinBias, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) +run3_common.toModify(OutALCARECOSiStripCalMinBias_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) + +OutALCARECOSiStripCalMinBias=OutALCARECOSiStripCalMinBias_noDrop.clone() +OutALCARECOSiStripCalMinBias.outputCommands.insert(0,"drop *") diff --git a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBias_Output_cff.py b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBias_Output_cff.py index d98d9febd3de4..1c55ac73a515f 100644 --- a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBias_Output_cff.py +++ b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBias_Output_cff.py @@ -17,13 +17,9 @@ 'keep *_TriggerResults_*_*') ) - -import copy -OutALCARECOSiStripCalMinBias=copy.deepcopy(OutALCARECOSiStripCalMinBias_noDrop) -OutALCARECOSiStripCalMinBias.outputCommands.insert(0,"drop *") - # in Run3, SCAL digis replaced by onlineMetaDataDigis -_run3_common_removedCommands = OutALCARECOSiStripCalMinBias.outputCommands +import copy +_run3_common_removedCommands = OutALCARECOSiStripCalMinBias_noDrop.outputCommands.copy() _run3_common_removedCommands.remove('keep LumiScalerss_scalersRawToDigi_*_*') _run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*') @@ -31,4 +27,7 @@ 'keep OnlineLuminosityRecord_onlineMetaDataDigis_*_*'] from Configuration.Eras.Modifier_run3_common_cff import run3_common -run3_common.toModify(OutALCARECOSiStripCalMinBias, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) +run3_common.toModify(OutALCARECOSiStripCalMinBias_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) + +OutALCARECOSiStripCalMinBias=OutALCARECOSiStripCalMinBias_noDrop.clone() +OutALCARECOSiStripCalMinBias.outputCommands.insert(0,"drop *") diff --git a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalSmallBiasScan_Output_cff.py b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalSmallBiasScan_Output_cff.py index 6794594e99f39..80bcc054b73b5 100644 --- a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalSmallBiasScan_Output_cff.py +++ b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalSmallBiasScan_Output_cff.py @@ -17,13 +17,9 @@ 'keep *_TriggerResults_*_*') ) - -import copy -OutALCARECOSiStripCalSmallBiasScan=copy.deepcopy(OutALCARECOSiStripCalSmallBiasScan_noDrop) -OutALCARECOSiStripCalSmallBiasScan.outputCommands.insert(0,"drop *") - # in Run3, SCAL digis replaced by onlineMetaDataDigis -_run3_common_removedCommands = OutALCARECOSiStripCalSmallBiasScan.outputCommands +import copy +_run3_common_removedCommands = OutALCARECOSiStripCalSmallBiasScan_noDrop.outputCommands.copy() _run3_common_removedCommands.remove('keep LumiScalerss_scalersRawToDigi_*_*') _run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*') @@ -31,4 +27,7 @@ 'keep OnlineLuminosityRecord_onlineMetaDataDigis_*_*'] from Configuration.Eras.Modifier_run3_common_cff import run3_common -run3_common.toModify(OutALCARECOSiStripCalSmallBiasScan, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) +run3_common.toModify(OutALCARECOSiStripCalSmallBiasScan_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands) + +OutALCARECOSiStripCalSmallBiasScan=OutALCARECOSiStripCalSmallBiasScan_noDrop.clone() +OutALCARECOSiStripCalSmallBiasScan.outputCommands.insert(0,"drop *")