Nils Erik Krumnack authored 4 years ago and Atlas Nightlybuild committed 4 years ago

Fix LHAPDF reweighting in AnalysisTop

See merge request atlas/athena!38269

(cherry picked from commit ea0007cf3efa7c01637e91932afd6904e35ac308)

0c65e4b6 Adjust order of execution of event saver in top-xaod.

 - Missing override keywords.

AthenaOutputStream writes into ThinningInfo the set of variables to be
vetoed on output.  Only dynamic variables should be selected/vetoed
this way, so we were only actually selecting dynamic variables, marking
the rest as vetoed.  The code in copyAuxStoreThinned would then see
that variables were not dynamic and ignore the veto information for them.

However, that turns out to be incorrect for the case where we write
all variables as dynamic (as used during derivation).  So here properly
apply the selection rules for all variables, even static ones.

In copyAuxStoreThinned, we can veto variables copied to the output
based in ThinningInfo.  But this should only be done for dynamic variables,
as we always want the full static store to be written.

We were doing this by testing whether a variable was dynamic in the source
store.  However, this fails in the case where the source store is a static
store object and the destination store is a generic AuxContainerBase object.
(This typically happens during derivation when we want to write
all variables as dynamic.)

Fix by also considering a variable to be dynamic if it doesn't exist
in the destination store before we do the copy.

The detection of the first call to the incident listener was not working
correctly. The code relied on the value of `m_first`, which was being
modified during the execution of the function. So code executed after
toggling `m_first` would see the wrong value. Use the local variable
`first` consistently.

Fix compilation failure with using fromStorable into a const pointer
(only showed up in debug builds).

Can't have a defaulted move ctor for HistogramFiller because it has
a std::mutex member (which has a deleted move ctor).

The locking within CondSvc::isValidID is heavily contended in jobs with
many threads (32-64).  Rework so that we don't need to use locking.

Rather than doing a SG lookup each time isValidID is called, we instead
build a map from SG key to CondCont instances at the end of initialization.
(This is called from CondInputLoader::start).  We can then look up the
key directly in this map rather then querying SG.  Since this map
is modified only during START, we don't need any locking.

Only the RootUtilsPyROOT library should depend on the pyroot libraries
(ROOTTPython and cppyy).  In particular, the RootUtils library should not
depend on these libraries.

Things were failing in the clang build because RootUtils was linking
against cppyy but _not_ against python, so things downstream were failing
to find python symbols.

(In principle this is wrong for the gcc build as well; not entirely
sure why it was working there.)

1. Dropped the ReloadProxies incident. This incident was triggering condition callbacks
in hybrid workers just after fork, which was immediately resulting in crash.

2. Enabled hybrid MP+MT mode in Job Transforms

Frank Winklmeier authored 4 years ago and Edward Moyse committed 4 years ago

Gaudi v35 drops the backwards compatiblity imports of `GaudiSvcConf`.
Import the services from their actual location.

This is necessary for Pile-up Digitization configuration. The LoopMgr
variable defaults to `AthenaEventLoopMgr`, so the change should be
transparent to existing clients.

- adds quite a lot of extra debug output
- and some more checks, such as checking the types being compared (can be different if configuration is different)
- handle the bug that you cannot create a private tool if a public tool with the same name exists
- skip if the property value is none

CachedValue::isValid() should be optimized for the case where the value
is already valid.  In that case, we were doing two comparisons, which
likely resulted in forward branches.  Adjust so that we need only
make one comparison in this case, and use ATH_LIKELY to make it
less likely that we need to branch in this case.

Add missing test reference file.

Attila Krasznahorkay authored 6 years ago and Tadej Novak committed 4 years ago

This is to be able to simplify user analysis job configurations a bit. I chose the
'ANALYSIS' name instead of something like 'HISTOGRAMS', as I intend to re-use the
same name for writing user ntuples as well.


Former-commit-id: 36ebb9de67abf9aa893084023825f6b17703687f

Remove obsolete StoreGate.h.

Remove usage of `six` and tidy dictionary loops and comprehensions.

Hello,

This MR is simply migrating the "ExtrapolatedStauTrackParticles" and "CombinedStauTrackParticles" containers from the tau category to the muon category.
"Staus" is currently under muons, so I assume that's a fair thing to do, these collections are not produced by tau reconstruction.
Unfortunately these are small collections, so we do not transfer much disk footprint :-)

Cheers,
Bertrand

    
Remove reference to obsolete header StoreGate.h.

Move reporting of failure to find an event time to an out-of-line function,
to make it easier to break on in the debugger.

    
Remove reference to obsolete header StoreGate.h.