Fix channel number in generation parameters

Tag: @ewelina @mnowak @tsulaia

In a previous patch we updated the run and MC channel numbers in event information and file metadata (!37564 (merged)). When using EVNT files with these corrections in simulations that do not have commit 447f6676. The reason being that the attributes for the generation parameters still live under the original MC channel number. This updates the channel number where the generation parameters may be found, if we are changing the run and MC channel numbers during EVNT-to-EVNT filtering.

Should these changes appear in places other than 21.6?

Should we also follow a similar procedure in derivation by adding another AODFix?

added 21.6 sweep:ignore labels

added Generators bugfix labels

Hi Frank,
Thanks for creating this MR - I was thinking along these lines as well. But I think you need to also modify m_iovMap and m_nameMap and probably remove the old entries from the 3 channel maps (in the fix channel method).
Cheers, Marcin

You are quite right, while not used here this should happen for consistency.

Thanks a lot @berghaus . Just to note that it would be nice to have the changes also in master.

Yes, for consistency, and also probably for the T/P conversion, which is quite complicated for IOV Containers and might get confused with different channels in these 3 maps.
And please verify with my metadata dump script that you don't get duplicated attributes in the output file, as I think the standard script does not detect that. /afs/cern.ch/user/m/mnowak/public/dump_md.py <file>
Some of the code I saw when working on this problem looks quite fragile and I am afraid it may break when it sees 2 channels instead of 1...

Thanks again - Marcin

added 1 commit

• 91326c05 - Also update the channel number for the IOV and Name mapping

Compare with previous version

Commit 91326c05 also updates the m_iovMap and m_nameMap as @mnowak pointed out. Tested locally with the recipie @ewelina provided. Inspected the content of the filtered evgen file with the script from Marcin and found no duplication of the /Generation/Parameters.

removed sweep:ignore label

added 1 deleted label

mentioned in merge request !39389 (merged)

Going to drop the 'Just doing some testing' and 'Revert "Just doing some testing"' to keep the merge conflicts when sweeping to master to one commit and one file.

added 3 commits

• 09040d9f - Add a method to modify CondAttrListCollection
• aa3e6759 - Update generation parameter channel number on EVNT-to-EVNT filtering
• 4330d2b4 - Also update the channel number for the IOV and Name mapping

Compare with previous version

With !39389 (merged) merged, I will now remove the WIP from this MR. I am not sure what is the proper way to handle the expected merge conflict with master.

unmarked as a Work In Progress

This merge request affects 2 packages:

• Database/AthenaPOOL/AthenaPoolUtilities
• Generators/EvgenProdTools

Affected files list will not be printed in this case

Adding @ssnyder ,@mnowak as watchers

added Database review-pending-level-1 labels

CI Result SUCCESS (hash 4330d2b4)

	AthGeneration
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view
AthGeneration: number of compilation errors 0, warnings 1
For experts only: Jenkins output [CI-MERGE-REQUEST 45375]

resolved all threads

I have checked warning and it is not related to this MR

added review-approved label and removed review-pending-level-1 label

mentioned in commit 2cad6fa5

merged

added sweep:done label

added sweep:failed label

Sweep summary
failed:

• master

mentioned in merge request !39434 (merged)

Proposed solution to the merge conflict in the sweep to master: !39434 (merged)

failed sweeps need to be resolved (to either sweep:ignore or sweep:done) [L2 MR shifter]

@abnag that was done in the MR mentioned above: !39434 (merged)

Handling this was new to me, so maybe I did not communicate this well? Is there a procedure to follow that I am not aware of?

If this needs to be ignored then add the sweep:ignore tag and remove the sweep:failed tag. Cheers [L2]

added sweep:ignore label and removed sweep:failed label

Done, thank you @abnag