Skip to content

xAOD Dictionary Updates, master branch (2020.05.26.)

Attila Krasznahorkay requested to merge akraszna/athena:xAODDictUpdates-master-20200525 into master

After !33004 (merged) and !33096 (merged), this should be the final step in collecting everything from !32081 (closed) into the master branch.

This last step is pretty much the trickiest of the three. It moves dictionaries between libraries, while doing the same sort of updates that the previous 2 were doing. Highlights include:

  • Created the CaloGeoHelpersDict dictionary, to collect dictionaries that were previously split between CaloDetDescrDict, CaloEventDict and xAODCaloRingsDict;
    • At the same time I couldn't help myself, I had to clean up the CMake configuration of CaloDetDescr a bit...;
  • Created the xAODCoreSTLDict dictionary to collect all the "pure STL" dictionaries used by the xAOD EDM;
    • At the same time made some cleanup in the xAODCore package, as some of the naming in it was left over from CMT/RootCore times;
  • Updated the rest of the packages in the same way as in !33004 (merged) and !33096 (merged), moving the "pure STL" dictionaries out from all of them, into xAODCoreSTLDict;
  • Cleaned up a very confusing src/JetTrigAuxContainer_v2.cxx file from xAODJet. I don't even know from what time it was left in that place. 😕

Merge request reports