athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-01-16T03:08:17+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/39690Fix merge conflicts/reference for 394202021-01-16T03:08:17+01:00Stewart Martin-HaughFix merge conflicts/reference for 39420!39420 with an extra commit to fix references.!39420 with an extra commit to fix references.https://gitlab.cern.ch/atlas/athena/-/merge_requests/39724Run Run3 reconstruction in ART multi-threaded2021-01-16T03:06:53+01:00Nicolas KoehlerRun Run3 reconstruction in ART multi-threadedHi,
now, that we are able to run multi-threaded muon reconstruction without irreprodubibilities, let's also test it for Run3.
Best, NicoHi,
now, that we are able to run multi-threaded muon reconstruction without irreprodubibilities, let's also test it for Run3.
Best, Nicohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39277Write xAOD::FileMetaData early to support event service2021-01-16T03:05:14+01:00Frank Berghausfrank.berghaus@cern.chWrite xAOD::FileMetaData early to support event serviceTag: @mnowak @tsulaia
In the previous design, the FileMetaDataCreatorTool wrote the FileMetaData object to the MetaDataStore (via the MetaDataSvc) in preFinalize. But in event service a given range of events may be written to file befo...Tag: @mnowak @tsulaia
In the previous design, the FileMetaDataCreatorTool wrote the FileMetaData object to the MetaDataStore (via the MetaDataSvc) in preFinalize. But in event service a given range of events may be written to file before then. This causes a failure. To support event stream the tool now writes the output FileMetaData object as early as possible.https://gitlab.cern.ch/atlas/athena/-/merge_requests/39691InDetAlignGenAlgs+VrtSecInclusive+JetMonitoring+TrigBjetHypo: Fix clang warni...2021-01-16T03:04:10+01:00Scott SnyderInDetAlignGenAlgs+VrtSecInclusive+JetMonitoring+TrigBjetHypo: Fix clang warnings.Don't use references in a range-for if the object must be copied.Don't use references in a range-for if the object must be copied.https://gitlab.cern.ch/atlas/athena/-/merge_requests/37533updates for gaudi v34r12021-01-15T15:49:55+01:00Charles Leggettupdates for gaudi v34r1 * nlohmann dependency
* autoretrieval of AlgTools by Services, check for data deps
* IDataHandleHolder::renounceInput
* Python type support for DataHandles (this supersedes !36864 which contains many more details on the implemen... * nlohmann dependency
* autoretrieval of AlgTools by Services, check for data deps
* IDataHandleHolder::renounceInput
* Python type support for DataHandles (this supersedes !36864 which contains many more details on the implementation)
Note to RC: There are many commits, but please **do not squash**.https://gitlab.cern.ch/atlas/athena/-/merge_requests/38280Upper limit for cell time cut application propagated back from master2021-01-15T14:42:51+01:00Margherita SpallaUpper limit for cell time cut application propagated back from masterA cell time cut has been added to cluster making stage:!36860. We then added an option for restricting the time cut to seed cells with E/sigma smaller than a given threshold.
In order to meet the last feature freeze, this option was add...A cell time cut has been added to cluster making stage:!36860. We then added an option for restricting the time cut to seed cells with E/sigma smaller than a given threshold.
In order to meet the last feature freeze, this option was added into the master branch first: !37522. With this MR we are propagating it back to r21: it is needed to finalise the testing and for easier comparison with previous results in r21.
All options are switched off by default and can be turned on at preExec.https://gitlab.cern.ch/atlas/athena/-/merge_requests/39656hepmc3 nightly fixes 12012021 part 12021-01-15T03:05:04+01:00Andrii Verbytskyihepmc3 nightly fixes 12012021 part 1In this MR:
- Migration of TruthTrajectoryBuilder.cxx to HepMC3
- Small cleanup in some other files: use std:: explicitly, remove comments, fix formatingIn this MR:
- Migration of TruthTrajectoryBuilder.cxx to HepMC3
- Small cleanup in some other files: use std:: explicitly, remove comments, fix formatinghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39670AODSelect: Delete obsolete package2021-01-15T03:02:58+01:00Frank WinklmeierAODSelect: Delete obsolete packageThe `AODSelect` package is no longer used (it was meant to be a common sequence to do object calibrations and calculations, to be included by groups and/or derivations, but was never used). Remove the package and associated flags.The `AODSelect` package is no longer used (it was meant to be a common sequence to do object calibrations and calculations, to be included by groups and/or derivations, but was never used). Remove the package and associated flags.https://gitlab.cern.ch/atlas/athena/-/merge_requests/37144Remove unused xAOD::FileMetaData clients2021-01-14T03:04:51+01:00Frank Berghausfrank.berghaus@cern.chRemove unused xAOD::FileMetaData clientsUnused `xAOD::FileMetaData` includes were removed from:
- [x] PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrectionTool
- [x] PhysicsAnalysis/TauID/TauAnalysisTools/TauSelectionTool
- [x] Reconstruction/Jet/JetM...Unused `xAOD::FileMetaData` includes were removed from:
- [x] PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrectionTool
- [x] PhysicsAnalysis/TauID/TauAnalysisTools/TauSelectionTool
- [x] Reconstruction/Jet/JetMomentTools/JetForwardJvtToolBDT
Unnecessary links to the `xAODMetaData` library were removed from:
- [x] PhysicsAnalysis/ElectronPhotonID/IsolationCorrections
- [x] Reconstruction/Jet/JetMomentTools
Other `xAOD::FileMetaData` clients were left unchanged:
- Event/xAOD/xAODBPhys/BPhysMetaDataHelper
- PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/AsgCutBookkeeperAlg
- PhysicsAnalysis/AnalysisCommon/PMGTools/PMGTruthWeightTool
- PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestAlg4
- PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/AsgElectronEfficiencyCorrectionTool
- PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/EgammaCalibrationAndSmearingTool
Needed to find `IOVDbDataModel` for `AthAnalysisBaseComps` to link successfully in my local tests, so keeping it here.https://gitlab.cern.ch/atlas/athena/-/merge_requests/39650JetHypo: Add a condition Inverter2021-01-14T03:04:43+01:00Peter SherwoodJetHypo: Add a condition InverterConditionInverter inverts the result of a Condition Predicate.
Possible use: eta range or phi range veto. Something similar was needed in Run 2
to handle partial detector failure.
@jbossios @valentem @peterConditionInverter inverts the result of a Condition Predicate.
Possible use: eta range or phi range veto. Something similar was needed in Run 2
to handle partial detector failure.
@jbossios @valentem @peterPeter SherwoodPeter Sherwoodhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39647Fix name of default HLT PFlow jet collection in offline jet trigger monitoring2021-01-14T03:03:35+01:00Jonathan BossioFix name of default HLT PFlow jet collection in offline jet trigger monitoringAlso removing the monitoring of `HLT_AntiKt4EMPFlowJets_subjesIS_ftf` which we currently do not reconstruct.
FYI @jgeisen @rcoelhob @valentemAlso removing the monitoring of `HLT_AntiKt4EMPFlowJets_subjesIS_ftf` which we currently do not reconstruct.
FYI @jgeisen @rcoelhob @valentemhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39640use new version of jets reconstruction tools, some fixes to LogicalExpression...2021-01-14T03:03:23+01:00Ewelina Maria Lobodzinskause new version of jets reconstruction tools, some fixes to LogicalExpressionFilteruse new version of jets reconstruction tools,
some fixes to LogicalExpressionFilter to make it working after removal of PyCintex etc.use new version of jets reconstruction tools,
some fixes to LogicalExpressionFilter to make it working after removal of PyCintex etc.https://gitlab.cern.ch/atlas/athena/-/merge_requests/38748Initial migration of BPHY Derivations to master2021-01-13T11:12:48+01:00Adam Edward BartonInitial migration of BPHY Derivations to masterI copy the DerivationFrameworkBPhys package from 21.2 and do a lot of migration to AthenaMT. Some of the simpler derivations will now run. Some code is disabled until further work can be done.
Notable changes:
- ThinningSvc migration
- ...I copy the DerivationFrameworkBPhys package from 21.2 and do a lot of migration to AthenaMT. Some of the simpler derivations will now run. Some code is disabled until further work can be done.
Notable changes:
- ThinningSvc migration
- Removal of unused classes
- Reco_diMuTrk Reco_diMuTrkTrk and Reco_MuMu are now combined into Reco_Vertex
- Variable datahandle and decoration migrations (incomplete)
- Python3 changes
cc @wwalko
cc @jcatmore (if interested)https://gitlab.cern.ch/atlas/athena/-/merge_requests/39603fix once-per-job leak in LArHVCorrectionMonTool.cxx2021-01-13T03:04:15+01:00Walter Lamplfix once-per-job leak in LArHVCorrectionMonTool.cxxSame as !39601 for LArHVCorrectionMonToolSame as !39601 for LArHVCorrectionMonToolhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39614Correct a Small Typo in Monitoring Titles2021-01-13T03:03:38+01:00Chris MilkeCorrect a Small Typo in Monitoring TitlesI left the 'm' off of "charm" in a number of plot titles in my last MR. This merely corrects that and capitalizes a few other letters.
This commit was tested using the "runTrigART.py -m -j20" test, and the "ctest -j4" test, and success...I left the 'm' off of "charm" in a number of plot titles in my last MR. This merely corrects that and capitalizes a few other letters.
This commit was tested using the "runTrigART.py -m -j20" test, and the "ctest -j4" test, and successfully passed both.https://gitlab.cern.ch/atlas/athena/-/merge_requests/39513fix all compiler warnings for AnalysisBase on latest MacOS2021-01-13T03:03:02+01:00Nils Erik Krumnackfix all compiler warnings for AnalysisBase on latest MacOSNew compiler, new set of warnings...
The main theme here is that clang now checks for range-based for loops
whether it introduces unneeded temporaries, i.e. if the user asks for
a reference for the loop variable, but the iterator doesn'...New compiler, new set of warnings...
The main theme here is that clang now checks for range-based for loops
whether it introduces unneeded temporaries, i.e. if the user asks for
a reference for the loop variable, but the iterator doesn't return a
reference or a reference of a different type, or conversely if the
user asked for `const auto`, but could have been `const auto&`.
In practice that usually hits us as:
```
for (const auto& jet : jetContainer)
```
which should be:
```
for (const auto *jet : jetContainer)
```
Also a couple of places like this (which miss the `const` qualifier on
the first template parameter):
```
std::map<std::string,std::string> stringMap;
for (const std::pair<std::string,std::string>& stringPair : stringMap)
```
For the most part I just replaced the loop variable type with what
seemed correct. In a few places I put explicit comments as to why I
chose the type.
Also a fair number of warnings for unused member variables in various
packages. Since I am not an expert on any of these packages and this
can point to an actual bug, I commented out all unused variables and
added a comment for actual experts to check and remove.
I removed a couple of checks for `this != nullptr` which were
originally introduced to check whether the user called a member
function via a null pointer. However those checks are `assert`-based,
so with cmake they won't be included when the user calls them from a
release, making this check mostly useless.
There some other warnings I fixed in the process that should hopefully
be self-explanatory.https://gitlab.cern.ch/atlas/athena/-/merge_requests/39605Fix crash in fJVT tool2021-01-13T03:02:15+01:00William Keaton BalunasFix crash in fJVT tool@ademaria reported an issue with the fJVT tool apparently trying to access an aux element with an empty key. It looks like this was due to a mistake in the migration of the tool to R22, where the optional OR decoration key property was a...@ademaria reported an issue with the fJVT tool apparently trying to access an aux element with an empty key. It looks like this was due to a mistake in the migration of the tool to R22, where the optional OR decoration key property was assumed to be present, resulting in an error if it wasn't configured by the user.
This MR makes that property correctly optional. A similar variable which is declared in the BDT version of the tool but never actually used is also removed.https://gitlab.cern.ch/atlas/athena/-/merge_requests/39566Adding IPT to ITk SV material rejection2021-01-12T03:06:25+01:00Thomas StreblerAdding IPT to ITk SV material rejectionThis MR adds the IPT in the ITk material veto applied to secondary vertices for FTAG algorithms.
FYI @nstyles @khanov @nekumariThis MR adds the IPT in the ITk material veto applied to secondary vertices for FTAG algorithms.
FYI @nstyles @khanov @nekumarihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39565Validation framework now does not make FE specific plots when called for PFO.2021-01-12T03:04:42+01:00Matthew Thomas AnthonyValidation framework now does not make FE specific plots when called for PFO.cc @mhodgkin
When drawing the validation plots for PFOs, some FE specific plots were drawn by mistake (initialised, but thankfully not filled, as this would be segfault bait), which got picked up on the monitoring display.
I've now imp...cc @mhodgkin
When drawing the validation plots for PFOs, some FE specific plots were drawn by mistake (initialised, but thankfully not filled, as this would be segfault bait), which got picked up on the monitoring display.
I've now implemented a quick fix to remove them (since it was an incorrect initialisation).
I will implement a better solution in a later MR (constructor overloading looks best option).
Thanks
Matt A.https://gitlab.cern.ch/atlas/athena/-/merge_requests/39579Cleanup and a bit of migration to HepMC32021-01-12T03:04:37+01:00Andrii VerbytskyiCleanup and a bit of migration to HepMC3In this MR:
- remove stray comments
- use std:: namespace explicitly
- Use HepMC::barcode free function
- replace comparison of pointers to `0` with `!` operator or with comparison to `nullptr`In this MR:
- remove stray comments
- use std:: namespace explicitly
- Use HepMC::barcode free function
- replace comparison of pointers to `0` with `!` operator or with comparison to `nullptr`