Skip to content

ROOT Hack Reversions, master branch (2020.07.27.)

Attila Krasznahorkay requested to merge akraszna/athena:ROOTHackReverts-master-20200727 into master

This MR undoes a couple of hacks that were added to work around ROOT issues.

  • With @ssnyder implementing a much better solution to ATR-21753 / ROOT-10940 in !35030 (merged) than I did with !34997 (merged), I reverted the changes to the trigger jobOptions. (Ping @fwinkl, @rbielski.)
    • I still wanted to keep the xAODMaker::ROOTHeaderLoaderSvc component in the repository though, it may still come in handy in the future.
  • While at it, I also undid the change that @wlampl added a while ago to work around ROOT-10663 with !31633 (merged). Since hacks like that should not persist for ever in our code... (With my editor cleaning up unnecessary spaces, it's a bit hard to see it. But I was removing the TClass::GetClass("DataLink_p2"); call in line 515 of RootTreeContainer.cpp.)

Merge request reports