Adjust clang-format after CMSSW_11_0_X_2019-06-21-1100

[fabiocos]

PR description:

Manual adjustments of comments after clang-format cleaning up to CMSSW_11_0_X_2019-06-21-1100.
In some cases the proposal by clang has been left untouched, as the fixed version looks to me more ugly.

PR validation:

Code compiles.

[cmsbuild]

The code-checks are being triggered in jenkins.

[cmsbuild]

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-27303/10525

• This PR adds an extra 92KB to repository

[cmsbuild]

A new Pull Request was created by @fabiocos (Fabio Cossutti) for master.

It involves the following packages:

CalibTracker/SiPixelQuality
CommonTools/RecoAlgos
CondCore/ESSources
CondFormats/SiPixelObjects
DQMServices/Core
DataFormats/EgammaCandidates
Geometry/CSCGeometryBuilder
Geometry/CommonTopologies
Geometry/TrackerNumberingBuilder
RecoEgamma/ElectronIdentification
RecoEgamma/PhotonIdentification
Validation/SiOuterTrackerV

@perrotta, @andrius-k, @Dr15Jones, @schneiml, @kmaeshima, @cvuosalo, @civanch, @tlampen, @christopheralanwest, @ianna, @mdhildreth, @cmsbuild, @franzoni, @jfernan2, @fioriNTU, @slava77, @ggovi, @pohsun, @tocheng can you please review it and eventually sign? Thanks.
@rappoccio, @jainshilpi, @abbiendi, @varuns23, @seemasharmafnal, @venturia, @makortel, @jhgoh, @lgray, @jdolen, @ebrondol, @ptcox, @Sam-Harper, @barvic, @rovere, @VinInn, @gkasieczka, @tocheng, @mmusich, @clelange, @ahinzmann, @dkotlins this is something you requested to watch as well.
@davidlange6, @slava77, @fabiocos you are the release manager for this.

cms-bot commands are listed here

[fabiocos]

please test

[cmsbuild]

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/1095/console Started: 2019/06/21 14:04

[fabiocos]

this PR is overlapping with #27297:

Testing PR #  27303  for branch  master
File  CommonTools/RecoAlgos/interface/CosmicTrackingParticleSelector.h  modified in PRs #  ['27303', '27297']
File  CommonTools/RecoAlgos/interface/RecoTrackSelectorBase.h  modified in PRs #  ['27303', '27297']
File  RecoEgamma/ElectronIdentification/interface/EBEECutValues.h  modified in PRs #  ['27303', '27297']
File  RecoEgamma/ElectronIdentification/test/VIDUsageExample.cc  modified in PRs #  ['27303', '27297']
File  RecoEgamma/PhotonIdentification/src/PhotonMIPHaloTagger.cc  modified in PRs #  ['27303', '27297']

I will merge that one first, and update this accordingly

[cmsbuild]

+1
Tested at: b7ab59b
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-d30adc/1095/summary.html

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:

• HCAL: making ped.width ADC2fC ped.-aware #27235 @abdoulline: HCAL: making ped.width ADC2fC ped.-aware
• Sim G4 Geometry from dd4hep Tracked Flag #27295 @ianna: Sim G4 Geometry from dd4hep Tracked Flag

You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-d30adc/1095/git-log-recent-commits
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-d30adc/1095/git-merge-result

[cmsbuild]

Comparison job queued.

[cmsbuild]

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-d30adc/1095/summary.html

Comparison Summary:

• No significant changes to the logs found
• Reco comparison results: 5912 differences found in the comparisons
• DQMHistoTests: Total files compared: 33
• DQMHistoTests: Total histograms compared: 3254586
• DQMHistoTests: Total failures: 6663
• DQMHistoTests: Total nulls: 4
• DQMHistoTests: Total successes: 3247585
• DQMHistoTests: Total skipped: 334
• DQMHistoTests: Total Missing objects: 0
• DQMHistoSizes: Histogram memory added: -0.016 KiB( 32 files compared)
• DQMHistoSizes: changed ( 136.85 ): -0.012 KiB JetMET/SUSYDQM
• DQMHistoSizes: changed ( 4.53 ): -0.004 KiB JetMET/SUSYDQM
• Checked 137 log files, 14 edm output root files, 33 DQM output files

[fabiocos]

please test

DQM changes are related to #27235, let's repeat the test for a clean comparison

[cmsbuild]

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/1124/console Started: 2019/06/23 15:35

[cmsbuild]

+1
Tested at: b7ab59b
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-d30adc/1124/summary.html

[cmsbuild]

Comparison job queued.

[cmsbuild]

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-d30adc/1124/summary.html

Comparison Summary:

• No significant changes to the logs found
• Reco comparison results: 0 differences found in the comparisons
• DQMHistoTests: Total files compared: 33
• DQMHistoTests: Total histograms compared: 3254598
• DQMHistoTests: Total failures: 1
• DQMHistoTests: Total nulls: 0
• DQMHistoTests: Total successes: 3254263
• DQMHistoTests: Total skipped: 334
• DQMHistoTests: Total Missing objects: 0
• DQMHistoSizes: Histogram memory added: 0.0 KiB( 32 files compared)
• Checked 137 log files, 14 edm output root files, 33 DQM output files

[perrotta]

+1

• Technical, and fine for reco, in case you want to merge it now that Running code-format for reconstruction #27297 is also merged

[jfernan2]

+1

[fabiocos]

@ggovi @cvuosalo @christopheralanwest @tocheng the updates are merely technical and formal, I will integrate this PR in next IB, please have a look

[cvuosalo]

+1

[fabiocos]

+1

[fabiocos]

merge

[christopheralanwest]

+1