Partial revert of #47079: do not use ifValue switches in fillDescriptions affecting confDB parsing

[mmusich]

PR description:

Title says it all, addresses the (messy) discussion at #47079 (comment) (some partial explanation is given in this comment).
The removal of some top-level parameter depending on value/existence of other top-level parameters affects negatively the ConfDB parsing of a given release. A ConfDb template has an exact set of top-level parameters, so if instances need to be made with different top-level parameters that will not work.
This PR partially reverts #47079 by not making top level parameters requirement depend on the existence of others.

PR validation:

• addOnTests.py runs fine.
• hltPhase2UpgradeIntegrationTests runs fine.

If this PR is a backport please specify the original PR and why you need to backport that PR. If this PR will be backported please specify to which release cycle the backport is meant for:

N/A

[mmusich]

type bug-fix

[cmsbuild]

cms-bot internal usage

[mmusich]

urgent

• @cms-sw/orp-l2 we'll need this PR to avoid breaking the confDB parsing of CMSSW_15_0_0_pre2

[cmsbuild]

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-47110/43312

• There are other open Pull requests which might conflict with changes you have proposed:
  • File HLTrigger/Configuration/python/customizeHLTforCMSSW.py modified in PR(s): CA Extension to strips #47090, add fillDescriptions to several plugins used at HLT (4/N) #47107
  • File RecoLocalCalo/HcalRecProducers/src/HFPhase1Reconstructor.cc modified in PR(s): [RFC] descriptions.addDefault -> descriptions.addWithDefaultLabel #44372

[mmusich]

@cmsbuild, please test

[cmsbuild]

A new Pull Request was created by @mmusich for master.

It involves the following packages:

• Calibration/HcalAlCaRecoProducers (alca)
• HLTrigger/Configuration (hlt)
• RecoLocalCalo/HcalRecProducers (reconstruction)

@Martin-Grunewald, @atpathak, @consuegs, @jfernan2, @mandrenguyen, @mmusich, @perrotta can you please review it and eventually sign? Thanks.
@Martin-Grunewald, @SohamBhattacharya, @VourMa, @abdoulline, @apsallid, @bsunanda, @denizsun, @mariadalfonso, @missirol, @mmusich, @rovere, @rsreds, @salimcerci, @tocheng, @youyingli, @yuanchao this is something you requested to watch as well.
@antoniovilela, @mandrenguyen, @rappoccio, @sextonkennedy you are the release manager for this.

cms-bot commands are listed here

[cmsbuild]

+1

Size: This PR adds an extra 52KB to repository
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-a1c00e/43781/summary.html
COMMIT: e214fa7
CMSSW: CMSSW_15_0_X_2025-01-15-1100/el8_amd64_gcc12
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/47110/43781/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: 0 differences found in the comparisons
• DQMHistoTests: Total files compared: 49
• DQMHistoTests: Total histograms compared: 3819085
• DQMHistoTests: Total failures: 0
• DQMHistoTests: Total nulls: 0
• DQMHistoTests: Total successes: 3819065
• DQMHistoTests: Total skipped: 20
• DQMHistoTests: Total Missing objects: 0
• DQMHistoSizes: Histogram memory added: 0.0 KiB( 48 files compared)
• Checked 214 log files, 184 edm output root files, 49 DQM output files
• TriggerResults: no differences found

[perrotta]

+alca

[mandrenguyen]

@cms-sw/hlt-l2 @cms-sw/reconstruction-l2 I'd like to get this merged for the 11AM IB, if possible

[mmusich]

@Martin-Grunewald please take a look and sign if you agree with the changes, to avoid me undoing it yet another time.

[Martin-Grunewald]

For me it looks good as it reverts all the conditional customisations. Thanks for addressing this quickly!

[Martin-Grunewald]

+1

[jfernan2]

+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. @sextonkennedy, @mandrenguyen, @rappoccio, @antoniovilela (and backports should be raised in the release meeting by the corresponding L2)

[mandrenguyen]

+1