fix DBG IBs warnings about EDM_ML_DEBUG redefined

[smuzaffar]

In DBG IBs ( build with -g -O3 -DEDM_ML_DEBUG flags) there many warnings about redefinition of EDM_ML_DEBUG. This PR proposes to either remove the definition from code or protect it by first checking if it is already set.

[cmsbuild]

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-34180/23391

• This PR adds an extra 76KB to repository

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

  • File DetectorDescription/DDCMS/plugins/dd4hep/DDDefinitions2Objects.cc modified in PR(s): [DD4hep] start on geometry XML payload producer #33548, [DD4hep] Tool for creation of DD4hep geometry DB payloads and for migration validation #34111

[cmsbuild]

A new Pull Request was created by @smuzaffar (Malik Shahzad Muzaffar) for master.

It involves the following packages:

Calibration/HcalCalibAlgos
DetectorDescription/DDCMS
FWCore/MessageService
Geometry/HcalAlgo
Geometry/HcalCommonData
Geometry/HcalTestBeamData
SimG4CMS/CherenkovAnalysis
SimG4CMS/ShowerLibraryProducer
Validation/Geometry

@smuzaffar, @civanch, @Dr15Jones, @malbouis, @kmaeshima, @cvuosalo, @makortel, @andrius-k, @mdhildreth, @ianna, @cmsbuild, @yuanchao, @jfernan2, @ahmad3213, @tlampen, @ErnestaP, @pohsun, @rvenditti, @francescobrivio can you please review it and eventually sign? Thanks.
@vargasa, @makortel, @cvuosalo, @wddgit, @fabiocos, @apsallid, @tocheng, @lecriste, @ebrondol, @rishabhCMS, @rovere, @mmusich, @slomeo, @rbartek 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

[smuzaffar]

please test

[cmsbuild]

-1

Failed Tests: UnitTests
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-36e41f/16102/summary.html
COMMIT: 50803b2
CMSSW: CMSSW_12_0_X_2021-06-18-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/34180/16102/install.sh to create a dev area with all the needed externals and cmssw changes.

Unit Tests

I found errors in the following unit tests:

---> test unitTestsGroup_d had ERRORS
---> test standAloneWithMessageLoggerRunner had ERRORS

Comparison Summary

Summary:

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

[smuzaffar]

please test

[cmsbuild]

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-34180/23396

• This PR adds an extra 20KB to repository

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

  • File DetectorDescription/DDCMS/plugins/dd4hep/DDDefinitions2Objects.cc modified in PR(s): [DD4hep] start on geometry XML payload producer #33548, [DD4hep] Tool for creation of DD4hep geometry DB payloads and for migration validation #34111

[cmsbuild]

Pull request #34180 was updated. @smuzaffar, @civanch, @Dr15Jones, @malbouis, @kmaeshima, @cvuosalo, @makortel, @andrius-k, @mdhildreth, @ianna, @yuanchao, @jfernan2, @ahmad3213, @tlampen, @ErnestaP, @pohsun, @rvenditti, @francescobrivio can you please check and sign again.

[cmsbuild]

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-36e41f/16109/summary.html
COMMIT: 3e39408
CMSSW: CMSSW_12_0_X_2021-06-18-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/34180/16109/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: 4 differences found in the comparisons
• DQMHistoTests: Total files compared: 38
• DQMHistoTests: Total histograms compared: 2785631
• DQMHistoTests: Total failures: 7
• DQMHistoTests: Total nulls: 0
• DQMHistoTests: Total successes: 2785602
• DQMHistoTests: Total skipped: 22
• DQMHistoTests: Total Missing objects: 0
• DQMHistoSizes: Histogram memory added: 0.0 KiB( 37 files compared)
• Checked 160 log files, 37 edm output root files, 38 DQM output files
• TriggerResults: no differences found

[civanch]

+1

[jfernan2]

+1

[yuanchao]

+1

• fixed EDM_ML_DEBUG redefined
• unit tests passed

[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)

[qliphy]

+1