Updating CaloRinger containers and egamma CaloRinger flags

This MR (continuing the closed MR !64441 (closed) - porting the implementation to main) is to update the CaloRinger containers, putting:

'xAOD::RingSetContainer#PhotonRingSets', 'xAOD::RingSetAuxContainer#PhotonRingSetsAux.', 'xAOD::CaloRingsContainer#PhotonCaloRings', 'xAOD::CaloRingsAuxContainer#PhotonCaloRingsAux.'

as default (instead your conterpart for electrons that we have today). In this MR we have the inclusion of new set of egamma keys for CaloRinger, to be able to select the type of ringer features that we might want in the AOD output, using ConfigFlags.

pinging: @christos , @turra , @jlieberm,@damazio, @laforge and @jodafons to comment and check the implementation. Discussion in the JIRA ticket ATLASRECTS-7666 .

added CaloRinger Egamma Reconstruction main labels

assigned to @eegidiop

mentioned in merge request !64441 (closed)

This merge request affects 3 packages:

• Reconstruction/RecoAlgs/CaloRingerAlgs
• Reconstruction/RecoTools/CaloRingerTools
• Reconstruction/egamma/egammaConfig

Affected files list will not be printed in this case

Adding @goetz as watcher

added review-pending-level-1 label

added Run2-DataReco-output-changed Run2-MCReco-output-changed Run3-DataReco-output-changed Run3-MCReco-output-changed labels

CI Result FAILURE (hash 78cd9efd)

	Athena
externals
cmake
make
tests

Full details available on this CI monitor view. Check the JIRA CI status board for known problems
Athena: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 77796]

Dear @eegidiop there is a number of CI tests failing. Can you have a look at them?

Setting review-user-action-required

Cheers, Steffen (L1)

added review-user-action-required label and removed review-pending-level-1 label

INFO       Py:diff-root        ERROR the following variables exist only in the old file !
INFO       Py:diff-root        ERROR  - [DataVector<xAOD::CaloRings_v1>_ElectronCaloRings]
INFO       Py:diff-root        ERROR  - [DataVector<xAOD::RingSet_v1>_ElectronRingSets]
INFO       Py:diff-root        ERROR  - [xAOD::CaloRingsAuxContainer_v1_ElectronCaloRingsAux.]
INFO       Py:diff-root        ERROR  - [xAOD::ElectronAuxContainer_v3_ElectronsAuxDyn.caloRingsLinks]
INFO       Py:diff-root        ERROR  - [xAOD::RingSetAuxContainer_v1_ElectronRingSetsAux.]
INFO       Py:diff-root        ERROR the following variables exist only in the new file !
INFO       Py:diff-root        ERROR  - [DataVector<xAOD::CaloRings_v1>_PhotonCaloRings]
INFO       Py:diff-root        ERROR  - [DataVector<xAOD::RingSet_v1>_PhotonRingSets]
INFO       Py:diff-root        ERROR  - [xAOD::CaloRingsAuxContainer_v1_PhotonCaloRingsAux.]
INFO       Py:diff-root        ERROR  - [xAOD::PhotonAuxContainer_v3_PhotonsAuxDyn.caloRingsLinks]
INFO       Py:diff-root        ERROR  - [xAOD::RingSetAuxContainer_v1_PhotonRingSetsAux.]
INFO       Py:diff-root         INFO comparing [2086] leaves over entries...

I guess these the expected removals/additions?

added 1122 commits

• 78cd9efd...8bd7cc0b - 1119 commits from branch atlas:main
• 709691e7 - Updating CaloRinger containers and CaloRinger flags
• dc99ab93 - Fix CaloRingerFlags
• 1859eb92 - Including CaloRinger flags domain to configure CaloRingerAlgs

Compare with previous version

marked this merge request as draft

marked this merge request as ready

This merge request affects 4 packages:

• Control/AthenaConfiguration
• Reconstruction/RecoAlgs/CaloRingerAlgs
• Reconstruction/RecoTools/CaloRingerTools
• Reconstruction/egamma/egammaConfig

Affected files list will not be printed in this case

Adding @goetz ,@gemmeren ,@ssnyder ,@maszyman as watchers

added Core analysis-review-required full-unit-tests review-pending-level-1 labels and removed review-user-action-required label

This doesn't seem to affect analysis directly, so approving for analysis release purposes.

Nils [Analysis RC]

added analysis-review-approved label and removed analysis-review-required label

CI Result FAILURE (hash 1859eb92)

	Athena	AthSimulation	AthGeneration	AnalysisBase	AthAnalysis
externals
cmake
make
tests

Full details available on this CI monitor view. Check the JIRA CI status board for known problems
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 79110]

Hi

So you need to update these

ERROR    The output 'q442_AOD_content.txt' (>) differs from the reference 'q442_AOD_content.ref' (<):

113,116d112
< ElectronCaloRings
< ElectronCaloRingsAux.
< ElectronRingSets
< ElectronRingSetsAux.
130d125
< ElectronsAuxDyn.caloRingsLinks
960a956,959
> PhotonCaloRings
> PhotonCaloRingsAux.
> PhotonRingSets
> PhotonRingSetsAux.
968a968
> PhotonsAuxDyn.caloRingsLinks

RROR    The output 'q445_AOD_content.txt' (>) differs from the reference 'q445_AOD_content.ref' (<):

103,106d102
< ElectronCaloRings
< ElectronCaloRingsAux.
< ElectronRingSets
< ElectronRingSetsAux.
120d115
< ElectronsAuxDyn.caloRingsLinks
1972a1318,1321
> PhotonCaloRings
> PhotonCaloRingsAux.
> PhotonRingSets
> PhotonRingSetsAux.
1980a1330
> PhotonsAuxDyn.caloRingsLinks

etc

The RC will prb then update the root file references.

At large this MR adds/removes collections that should be relatively small in terms of AOD size. @eegidiop do you have a number?

In anycase let me ping @jdandoy , @jchapman , @jcatmore .

I do not see an issue myself but the ref update will need to happen and might take a couple of day depending on the RC queue.