Solving a bug in PPSTransportESSource_cff and deleting python objects…

… to improve memory usage
cms-sw · May 14, 2020 · 9a66943 · 9a66943
1 parent 1e681dc
commit 9a66943
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py
@@ -54,7 +54,7 @@ def __init__(self):
                            'phase2_hgcal', 'phase2_muon', 'phase2_timing', 'phase2_hgcalV9', 'phase2_hfnose', 'phase2_hgcalV10', 'phase2_hgcalV11',
                            'phase2_timing_layer', 'phase2_hcal',
                            'phase2_trigger',
-                           'trackingLowPU', 'trackingPhase1', 'ctpps_2016', 'ctpps_2017', 'ctpps_2018', 'trackingPhase2PU140','highBetaStar_2018',
+                           'trackingLowPU', 'trackingPhase1', 'ctpps_2016', 'ctpps_2017', 'ctpps_2018', 'ctpps_2021', 'trackingPhase2PU140','highBetaStar_2018',
                            'tracker_apv_vfp30_2016', 'pf_badHcalMitigation', 'run2_miniAOD_80XLegacy','run2_miniAOD_94XFall17', 'run2_nanoAOD_92X',
                            'run2_nanoAOD_94XMiniAODv1', 'run2_nanoAOD_94XMiniAODv2', 'run2_nanoAOD_94X2016',
                            'run2_miniAOD_devel', 'run2_nanoAOD_102Xv1', 'run2_nanoAOD_106Xv1',

diff --git a/SimTransport/PPSProtonTransport/python/OpticalFunctionsConfig_cfi.py b/SimTransport/PPSProtonTransport/python/OpticalFunctionsConfig_cfi.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-baseOpticalFunctionsParameters = cms.PSet(
+_baseOpticalFunctionsParameters = cms.PSet(
           TransportMethod = cms.string('OpticalFunctions'),
           ApplyZShift = cms.bool(True),
           lhcInfoLabel = cms.string(""),
@@ -127,27 +127,27 @@
 
 _opticalfunctionsTransportSetup_2016_preTS2 =cms.PSet(
                 opticalFunctionConfig = _config_2016_preTS2.opticalFunctionConfig,
-                optics_parameters =  cms.PSet(baseOpticalFunctionsParameters,_config_2016_preTS2.optics_parameters)
+                optics_parameters =  cms.PSet(_baseOpticalFunctionsParameters,_config_2016_preTS2.optics_parameters)
 )
 
 _opticalfunctionsTransportSetup_2016_postTS2 =cms.PSet(
                 opticalFunctionConfig = _config_2016_postTS2.opticalFunctionConfig,
-                optics_parameters = cms.PSet(baseOpticalFunctionsParameters,_config_2016_postTS2.optics_parameters)
+                optics_parameters = cms.PSet(_baseOpticalFunctionsParameters,_config_2016_postTS2.optics_parameters)
 )
 
 _opticalfunctionsTransportSetup_2017_preTS2 =cms.PSet(
                 opticalFunctionConfig = _config_2017_preTS2.opticalFunctionConfig,
-                optics_parameters = cms.PSet(baseOpticalFunctionsParameters,_config_2017_preTS2.optics_parameters)
+                optics_parameters = cms.PSet(_baseOpticalFunctionsParameters,_config_2017_preTS2.optics_parameters)
 )
 
 _opticalfunctionsTransportSetup_2017_postTS2 =cms.PSet(
                 opticalFunctionConfig = _config_2017_postTS2.opticalFunctionConfig,
-                optics_parameters = cms.PSet(baseOpticalFunctionsParameters,_config_2017_postTS2.optics_parameters)
+                optics_parameters = cms.PSet(_baseOpticalFunctionsParameters,_config_2017_postTS2.optics_parameters)
 )
 
 opticalfunctionsTransportSetup_2018 =cms.PSet(
                 opticalFunctionConfig = _config_2018.opticalFunctionConfig,
-                optics_parameters = cms.PSet(baseOpticalFunctionsParameters, _config_2018.optics_parameters)
+                optics_parameters = cms.PSet(_baseOpticalFunctionsParameters, _config_2018.optics_parameters)
 )
 
 # Default setup

diff --git a/SimTransport/PPSProtonTransport/python/PPSTransportESSources_cfi.py b/SimTransport/PPSProtonTransport/python/PPSTransportESSources_cfi.py
@@ -33,7 +33,10 @@
 )
 es_prefer_ppsDBESSource = cms.ESPrefer("PoolDBESSource","ppsDBESSource")
 
-_opticsConfig = opticalfunctionsTransportSetup_2018.opticalFunctionConfig # use 2018 as default
+_opticsConfig = cms.PSet(
+                    defaultCrossingAngle=cms.double(0.0),
+                    es_source = cms.PSet()
+                )
 
 from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
 ctpps_2016.toReplaceWith(_opticsConfig, opticalfunctionsTransportSetup_2016.opticalFunctionConfig)
@@ -45,8 +48,15 @@
 ctpps_2018.toReplaceWith(_opticsConfig, opticalfunctionsTransportSetup_2018.opticalFunctionConfig)
 
 from Configuration.Eras.Modifier_ctpps_2021_cff import ctpps_2021
-ctpps_2021.toReplaceWith(_opticsConfig, opticalfunctionsTransportSetup_2018.opticalFunctionConfig)
+ctpps_2021.toReplaceWith(_opticsConfig, opticalfunctionsTransportSetup_2021.opticalFunctionConfig)
 
 ctppsBeamParametersESSource.halfXangleX45 = _opticsConfig.defaultCrossingAngle
 ctppsBeamParametersESSource.halfXangleX56 = _opticsConfig.defaultCrossingAngle
 ctppsOpticalFunctionsESSource.configuration.append(_opticsConfig.es_source)
+
+# clean up to avoid spreading uneeded modules up in the configuration chain
+del _opticsConfig
+del opticalfunctionsTransportSetup_2016
+del opticalfunctionsTransportSetup_2018
+del opticalfunctionsTransportSetup_2017
+del opticalfunctionsTransportSetup_2021