avoiding trailing whitespaces in config dump

[missirol]

PR description:

This PR is an attempt to avoid trailing whitespaces in configuration file dumps. This was noticed by @fwyzard and @Sam-Harper (and maybe others), when integrating the config for the HLT Phase-2 menu in #32903.

PR validation:

Checked, with one configuration file, that the update gives the expected output (no trailing whitespaces). Example:

cmsDriver.py step3 --geometry Extended2026D49 --era Phase2C9 --conditions 111X_mcRun4_realistic_T15_v5 --processName RECO2 --step RAW2DIGI,RECO --eventcontent RECO --datatier RECO --filein /store/mc/Phase2HLTTDRSummer20ReRECOMiniAOD/QCD_Pt-15to3000_TuneCP5_Flat_14TeV-pythia8/FEVT/PU200_castor_111X_mcRun4_realistic_T15_v1-v1/100000/DA18C0FC-1189-D64B-B3B6-44F3F96F1840.root --mc --no_exec -n 10 --python_filename cfg.py --customise SLHCUpgradeSimulations/Configuration/aging.customise_aging_1000,Configuration/DataProcessing/Utils.addMonitoring
edmConfigDump cfg.py > dump.py

If this PR is a backport, please specify the original PR and why you need to backport that PR:

N/A

[fwyzard]

please test

[cmsbuild]

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-33634/22500

• This PR adds an extra 20KB to repository

• There are other open Pull requests which might conflict with changes you have proposed:

  • File FWCore/ParameterSet/python/Mixins.py modified in PR(s): update deepCore for Run3 #33531

[cmsbuild]

A new Pull Request was created by @missirol (Marino Missiroli) for master.

It involves the following packages:

FWCore/ParameterSet

@makortel, @smuzaffar, @Dr15Jones can you please review it and eventually sign? Thanks.
@makortel, @wddgit this is something you requested to watch as well.
@silviodonato, @dpiparo, @qliphy you are the release manager for this.

cms-bot commands are listed here

[Dr15Jones]

Could you add a comment to this pull request showing an example of changes this makes to the output? That would be useful for documenting this change.

[missirol]

Sure. Here are some selected examples (if a link to a full diff is more useful, it can be provided):

 process.DQMEventContent = cms.PSet(
     outputCommands = cms.untracked.vstring(
-        'drop *', 
+        'drop *',
         'keep *_MEtoEDMConverter_*_*'
     ),
     splitLevel = cms.untracked.int32(0)

         RequireBothProjections = cms.bool(False),
         ServiceParameters = cms.PSet(
             Propagators = cms.untracked.vstring(
-                'SteppingHelixPropagatorAny', 
-                'PropagatorWithMaterial', 
+                'SteppingHelixPropagatorAny',
+                'PropagatorWithMaterial',
                 'PropagatorWithMaterialOpposite'
             ),
             RPCLayers = cms.bool(True)

     cms.PSet(
         default = cms.double(-1),
         idx = cms.int32(1),
         name = cms.string('leptonEtaRel_1'),
         taggingVarName = cms.string('leptonEtaRel')
-    ), 
+    ),
     cms.PSet(
         default = cms.double(-1),
         idx = cms.int32(0),
         name = cms.string('leptonRatio_0'),
         taggingVarName = cms.string('leptonRatio')
-    ), 
+    ),
     cms.PSet(
         default = cms.double(-1),
         idx = cms.int32(1),

     constSiPar = cms.double(0.02),
     deltasi_index_regemfac = cms.int32(3),
     layerNoseWeights = cms.vdouble(
-        0.0, 39.500245, 39.756638, 39.756638, 39.756638, 
+        0.0, 39.500245, 39.756638, 39.756638, 39.756638,
         39.756638, 66.020266, 92.283895, 92.283895
     ),

[cmsbuild]

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-9111ae/14884/summary.html
COMMIT: 821ee25
CMSSW: CMSSW_12_0_X_2021-05-04-2300/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/33634/14884/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

• No significant changes to the logs found
• Reco comparison results: 8 differences found in the comparisons
• DQMHistoTests: Total files compared: 37
• DQMHistoTests: Total histograms compared: 2662646
• DQMHistoTests: Total failures: 12
• DQMHistoTests: Total nulls: 1
• DQMHistoTests: Total successes: 2662611
• DQMHistoTests: Total skipped: 22
• DQMHistoTests: Total Missing objects: 0
• DQMHistoSizes: Histogram memory added: -0.004 KiB( 36 files compared)
• DQMHistoSizes: changed ( 312.0 ): -0.004 KiB MessageLogger/Warnings
• Checked 155 log files, 37 edm output root files, 37 DQM output files
• TriggerResults: no differences found

[makortel]

+1

[cmsbuild]

This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will now be reviewed by the release team before it's merged. @silviodonato, @dpiparo, @qliphy (and backports should be raised in the release meeting by the corresponding L2)

[Sam-Harper]

thanks Marino!

[qliphy]

+1