athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2022-04-12T09:40:36+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/51356JetMatcherAlg - add protection in case no JFEX L1 jet container is available ...2022-04-12T09:40:36+02:00Peter SherwoodJetMatcherAlg - add protection in case no JFEX L1 jet container is available (ATR-25147) JetMatcherAlg add protection in case no JFEX L1 jet container is available.
@Sawyer @schaarsc @ayana @cantel @peter
Tagging ATR-25147 JetMatcherAlg add protection in case no JFEX L1 jet container is available.
@Sawyer @schaarsc @ayana @cantel @peter
Tagging ATR-25147Peter SherwoodPeter Sherwoodhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/49916Disable CaloMuonLikelihoodTool2022-02-10T12:30:13+01:00Emma Catherine GoddenDisable CaloMuonLikelihoodToolDisabling old CaloMuonLikelihood tool in the configuration. [ATLASRECTS-6786](https://its.cern.ch/jira/browse/ATLASRECTS-6786).
This means the CaloLRLikelihood variable is no longer set in [MuonCreatorTool.cxx](https://gitlab.cern.ch/at...Disabling old CaloMuonLikelihood tool in the configuration. [ATLASRECTS-6786](https://its.cern.ch/jira/browse/ATLASRECTS-6786).
This means the CaloLRLikelihood variable is no longer set in [MuonCreatorTool.cxx](https://gitlab.cern.ch/atlas/athena/-/merge_requests/49916/diffs#6d2fc1339eb0922cd081313503966caa70d9e1dd_708_707), so updated the AuxContainer introducing [MuonAuxContainer_v6](https://gitlab.cern.ch/atlas/athena/-/merge_requests/49916/diffs#diff-content-7155acdd6568c63ec546720199cf1c6a6eccfd8e). The changes wrt to _v5 is the removal of the CaloLRLikelihood variable ( [this line](https://gitlab.cern.ch/atlas/athena/-/merge_requests/49916/diffs?diff_id=1443663#c8a0cb87305d4166647f3b4b055c047a7f0c78d6_170_170) )https://gitlab.cern.ch/atlas/athena/-/merge_requests/45053Dressing large-R jet collections with ghost-associated VR track-jets2021-10-25T15:10:47+02:00Giuseppe CalleaDressing large-R jet collections with ghost-associated VR track-jetsThe aim of this MR is to add the links of ghost associated VR track-jets to large-R jet collections (here only for LCTopo). Having these links is crucial for the Hbb analyses, but other groups might be interested in them.
In the past, w...The aim of this MR is to add the links of ghost associated VR track-jets to large-R jet collections (here only for LCTopo). Having these links is crucial for the Hbb analyses, but other groups might be interested in them.
In the past, we noticed that including them will lead to a negligible size increase.
To do this, we are following the examples from r21.2, where some derivation formats add the links in this way:
https://gitlab.cern.ch/atlas/athena/-/blob/21.2/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D1.py#L244
using `addVRJets`, which is defined here:
https://gitlab.cern.ch/atlas/athena/-/blob/21.2/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/HbbCommon.py#L217
For this reason, `DerivationFrameworkFlavourTag.HbbCommon` has to be imported.
Please let us know if this is not the right place where to put these links. We might open another MR but for r21.2 with the same purpose.
Many thanks for your help.
Tagging @angianni, @ckato, @jcatmore, @lheinric, @alisterhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/44720Make selection read handles systematics aware2021-06-29T00:43:13+02:00Jon BurrMake selection read handles systematics awareThis should allow us to have selections with systematic variations and read them as part of the selection accessors.
As part of this I had to shift the SysDecorationHandle to use a standalone messaging namespace (`ANA_MESSAGE_HEADER`+`A...This should allow us to have selections with systematic variations and read them as part of the selection accessors.
As part of this I had to shift the SysDecorationHandle to use a standalone messaging namespace (`ANA_MESSAGE_HEADER`+`ANA_MESSAGE_SOURCE`) rather than using `AsgMessagingForward`. It would be possible to do this with the older class, but would make a lot of the calls around the selection read handle a lot uglier.
I also forgot to turn my code formatter off so there are quite a lot of changes which are only formatting. On balance I prefer to keep these but if makes the review too hard I can also try and revert the changes which are pure formatting.
Note that this only changes the read handle class, not any of the places that use it - they also need to be updated to pass in the correct systematic and to call `preExecute` where necessary. If it's preferred I can also do that in this MR.
Tagging @krumnack and @tadej for info.https://gitlab.cern.ch/atlas/athena/-/merge_requests/44663Set MuonErrorOptimizer to null by default, so as not to retrieve an unconfigu...2021-06-24T17:03:37+02:00Edward MoyseSet MuonErrorOptimizer to null by default, so as not to retrieve an unconfigured tool.Should fix ATLASRECTS-6433
Tested locally that this fixes the issue with an unconfigured tool being loaded, by making the tool fail if not explicitly configured (see a followup MR).Should fix ATLASRECTS-6433
Tested locally that this fixes the issue with an unconfigured tool being loaded, by making the tool fail if not explicitly configured (see a followup MR).https://gitlab.cern.ch/atlas/athena/-/merge_requests/43205Connect egamma emulator and monitoring2021-05-29T05:44:35+02:00Joao Victor Da Fonseca PintoConnect egamma emulator and monitoringThis MR just connect the e/g emulator into the e/g offline monitoring. The e/g emulator today is turn-off (emulator=False into the egamma python offline mon code).
- tidy up matching tool and include necessary features to emulate;
- cha...This MR just connect the e/g emulator into the e/g offline monitoring. The e/g emulator today is turn-off (emulator=False into the egamma python offline mon code).
- tidy up matching tool and include necessary features to emulate;
- change keys (harmonisation);
- include steps into the emulator;
Ping: @mverissi, @eegidiopJoao Victor Da Fonseca PintoJoao Victor Da Fonseca Pintohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43076[ATR-22994] Allow ConfigFlags.Trigger to be imported in AthAnalysis. Requires...2021-06-17T16:42:33+02:00Tim Martin[ATR-22994] Allow ConfigFlags.Trigger to be imported in AthAnalysis. Requires three additional packages in AthAnalysis.Bring three (python) packages into AthAnalysis.
These are required to import the `ConfigFlags.Trigger`
With this (and the complimentary MR !43072), the Component Accumulator based `TrigDecisionToolConfig.py` can be used in AthAnalysis....Bring three (python) packages into AthAnalysis.
These are required to import the `ConfigFlags.Trigger`
With this (and the complimentary MR !43072), the Component Accumulator based `TrigDecisionToolConfig.py` can be used in AthAnalysis.
cc @fwinkl: I had to exclude the `--extend-extensions` CMake here, it isn't recognised in AthAnalysis.
Adding expert review labels as adds packages to the build.https://gitlab.cern.ch/atlas/athena/-/merge_requests/42504[ATR-23206] Add additional warning about empty chain groups2021-07-09T13:08:03+02:00Tim Martin[ATR-23206] Add additional warning about empty chain groupsSmall MR to print a WARNING if trigger decision information is asked of a ChainGroup of zero L1 items and/or HLT chains.Small MR to print a WARNING if trigger decision information is asked of a ChainGroup of zero L1 items and/or HLT chains.https://gitlab.cern.ch/atlas/athena/-/merge_requests/42139WIP:Looser InDetVKalVxInJetTool2021-04-07T12:40:57+02:00Vadim KostyukhinWIP:Looser InDetVKalVxInJetTool1) Change default jobO CutBVrtScore 0.015->0.005 to increase efficiency for the price of bigger fake rate
2) Correct N2Tpair calculation AFT-549
3) Remove wrong cut on radial error and correct Sig3D cut, non-working previously
4) Code cl...1) Change default jobO CutBVrtScore 0.015->0.005 to increase efficiency for the price of bigger fake rate
2) Correct N2Tpair calculation AFT-549
3) Remove wrong cut on radial error and correct Sig3D cut, non-working previously
4) Code cleaning - commented lines and tabs
5) A bit more information in debugging ntupleshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/42027Use FSNOSEED for jet chains2021-06-08T12:29:42+02:00Tomasz BoldUse FSNOSEED for jet chainsThis MR changes L1 seeding for jet chains from L1J to FSNOSEED.
However the counts change significantly:
```
chainComp INFO HLT_j85_pf_ftf_L1J20:
chainComp INFO stepCounts:
chainComp INFO 0: 5 -> 20
chainComp INF...This MR changes L1 seeding for jet chains from L1J to FSNOSEED.
However the counts change significantly:
```
chainComp INFO HLT_j85_pf_ftf_L1J20:
chainComp INFO stepCounts:
chainComp INFO 0: 5 -> 20
chainComp INFO stepFeatures:
chainComp INFO 0: 5 -> 20
```
That may sound wrong, however it is in agreement with the counts of:
HLT_noalg_L1J20
(and similarly for other threshold).
I believe the reason is that FSNOSEED seeding takes into account only CPT items whereas for HLTNav_L1J and even the "forceEnableAllChains" is not realy activating them.
Now, what do we want?
Tagging @hrussell @khoo @tamartinhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/41748PlainAccessor.h: Accept duplicate VarHandles2021-03-19T14:29:41+01:00Walter LamplPlainAccessor.h: Accept duplicate VarHandlesThis MR comments out three lines of code that break a few jobs as described in ATLASRECTS-6121 and ATEAM-720.
I'd really like @goetz to comment before this gets merged!This MR comments out three lines of code that break a few jobs as described in ATLASRECTS-6121 and ATEAM-720.
I'd really like @goetz to comment before this gets merged!https://gitlab.cern.ch/atlas/athena/-/merge_requests/40146Properly name thinned MC LAr digits2021-02-12T16:41:44+01:00Tadej Novaktadej.novak@cern.chProperly name thinned MC LAr digitsProperly name thinned MC LAr digits to `LArDigitContainer_MC_Thinned`. @wlampl, is that OK?Properly name thinned MC LAr digits to `LArDigitContainer_MC_Thinned`. @wlampl, is that OK?https://gitlab.cern.ch/atlas/athena/-/merge_requests/39796Add nopost.sh to 21.2 for standalone unit testing2021-11-26T21:15:26+01:00Maximilian Emanuel Goblirsch-KolbAdd nopost.sh to 21.2 for standalone unit testingThis MR adds the `nopost.sh` post-script found in the `master` branch (https://gitlab.cern.ch/atlas/athena/-/blob/master/AtlasTest/TestTools/share/nopost.sh) to 21.2, in order to allow standalone unit tests without a ref file for package...This MR adds the `nopost.sh` post-script found in the `master` branch (https://gitlab.cern.ch/atlas/athena/-/blob/master/AtlasTest/TestTools/share/nopost.sh) to 21.2, in order to allow standalone unit tests without a ref file for packages built against the 21.2-series analysis releases.
See https://twiki.cern.ch/twiki/bin/view/AtlasComputing/SoftwareDevelopmentWorkBookCMakeInAtlas#atlas_add_test for documentation and intended use.https://gitlab.cern.ch/atlas/athena/-/merge_requests/39421Adding IFFTruthClassifier output to EventSaverFlatNtuple2021-01-04T21:45:47+01:00Fabio CardilloAdding IFFTruthClassifier output to EventSaverFlatNtupleAdding output of new IFF [TruthClassicationTool](https://gitlab.cern.ch/atlas/athena/-/tree/21.2/PhysicsAnalysis/AnalysisCommon/TruthClassification) (available since AnalysisBase [21.2.143](https://twiki.cern.ch/twiki/bin/view/AtlasProte...Adding output of new IFF [TruthClassicationTool](https://gitlab.cern.ch/atlas/athena/-/tree/21.2/PhysicsAnalysis/AnalysisCommon/TruthClassification) (available since AnalysisBase [21.2.143](https://twiki.cern.ch/twiki/bin/view/AtlasProtected/AnalysisBaseReleaseNotes21_2#21_2_143_built_on_2020_10_07)) to `EventSaverFlatNtuple` output. The IFF lepton-categories are stored as int-type vectors for electrons and muons (similar to the origin and type branches). The meaning of the categories can be found [here](https://gitlab.cern.ch/ATLAS-IFF/IFFTruthClassifier/-/blob/master/README.md).
Tagging top-reco conveners @spalazzo and @tdadohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/38848InDetRecExample: Fix for cosmic configuration.2020-12-09T21:50:21+01:00Scott SnyderInDetRecExample: Fix for cosmic configuration.The cosmic version of SiSpacePointsSeedMaker doesn't have all the properties
that the regular version does. Condition setting these properties
on whether cosmics are configured.
Fixes crash with q220.The cosmic version of SiSpacePointsSeedMaker doesn't have all the properties
that the regular version does. Condition setting these properties
on whether cosmics are configured.
Fixes crash with q220.https://gitlab.cern.ch/atlas/athena/-/merge_requests/37915MuonTrackExtrapolationTool changed for the TrackingGeometrySvc to CondAlg mig...2021-01-24T16:33:38+01:00Angelos TsiamisMuonTrackExtrapolationTool changed for the TrackingGeometrySvc to CondAlg migration.Applied changes according to https://gitlab.cern.ch/rlangenb/athena/-/merge_requests/2/diffs for MuonTrackExtrapolationTool.
TrackingGeometrySvc to CondAlg migration (ATLASRECTS-5694)Applied changes according to https://gitlab.cern.ch/rlangenb/athena/-/merge_requests/2/diffs for MuonTrackExtrapolationTool.
TrackingGeometrySvc to CondAlg migration (ATLASRECTS-5694)https://gitlab.cern.ch/atlas/athena/-/merge_requests/37531add option to limit nprocs in build2021-02-22T18:34:15+01:00Charles Leggettadd option to limit nprocs in buildAdd option `-P NPROC` to Projects/Athena/build.sh to set the number of concurrent make/ninja processes when building a releaseAdd option `-P NPROC` to Projects/Athena/build.sh to set the number of concurrent make/ninja processes when building a releasehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/37189Fix diff-root ignore parsing2020-10-14T14:06:22+02:00Tadej Novaktadej.novak@cern.chFix diff-root ignore parsingFix `diff-root` ignore parsing after !36654 was merged. This re-enables more granular exclusion like:
```
xAOD::EventAuxInfo_v2_EventInfoAux.detectorMask0
xAOD::EventAuxInfo_v2_EventInfoAux.detectorMask1
xAOD::EventAuxInfo_v2_EventInfoAu...Fix `diff-root` ignore parsing after !36654 was merged. This re-enables more granular exclusion like:
```
xAOD::EventAuxInfo_v2_EventInfoAux.detectorMask0
xAOD::EventAuxInfo_v2_EventInfoAux.detectorMask1
xAOD::EventAuxInfo_v2_EventInfoAux.detectorMask2
xAOD::EventAuxInfo_v2_EventInfoAux.detectorMask3
```
Tagging @amete if you have a better idea how to properly match sub-leafs.https://gitlab.cern.ch/atlas/athena/-/merge_requests/34615dqm_algorithms CMake Cleanup, master branch (2020.07.10.)2021-01-04T15:37:38+01:00Attila Krasznahorkaydqm_algorithms CMake Cleanup, master branch (2020.07.10.)I noticed [dqm_algorithms](DataQuality/dqm_algorithms) as a surprising entry in my [build time spreadsheets](https://docs.google.com/spreadsheets/d/1phkOu3uky68DpGk61d_xgd9F6o3WaoBx9qfcqFQKRnc/edit?usp=sharing), and had a closer look. Si...I noticed [dqm_algorithms](DataQuality/dqm_algorithms) as a surprising entry in my [build time spreadsheets](https://docs.google.com/spreadsheets/d/1phkOu3uky68DpGk61d_xgd9F6o3WaoBx9qfcqFQKRnc/edit?usp=sharing), and had a closer look. Since I really didn't like its CMake configuration, I decided to clean it up a bit.
First off, the package builds 3 shared libraries. `dqm_algorithms`, `dqm_tools` and `dqm_summaries`. The source file layout in the package is a little weird, but I decided that the original intention of the writer must have been to make `dqm_tools` depend on only externals, and then `dqm_algorithms` and `dqm_summaries` to depend on `dqm_tools`. (Beside the same externals.) So I re-shuffled the sources between the libraries like that, and updated the link relationships between them to behave this way.
The package also builds 2 dictionaries, separately for symbols defined in `dqm_tools` and `dqm_algorithms`. I simplified the build setup of these to have only these library dependencies.
Finally, and I was quite surprised about this, neither of the executables of the package directly use any of the above mentioned 3 libraries directly. They only use them at runtime. So I simplified the build setup of the executables as well.
I also removed the setup of the aliases for the executables, as I could not find any reference to the "`.exe` names" in the repository. @ponyisi, do you guys ever refer to these executables as `dqm_print_algorithms.exe` or `dqm_print_summarymakers.exe`? You would have seen a warning about doing that since some time, so I guess not. But let me know if I made a mistake with this.
Unfortunately all this update does not make the build of the package faster in any noticeable way. (The package takes long to build because it has a **lot** of source files.) But at least it makes it a bit more "parallel"...Peter OnyisiPeter Onyisihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/32919xAODCore Dictionary Updates, master branch (2020.05.15.)2020-05-22T17:28:45+02:00Attila KrasznahorkayxAODCore Dictionary Updates, master branch (2020.05.15.)Similar to !32914, this MR continues sampling updates from !32081 into digestible chunks.
In order to organise the dictionary generation of the xAOD packages a little better, this MR introduces some new functionality in [xAODCore](Event...Similar to !32914, this MR continues sampling updates from !32081 into digestible chunks.
In order to organise the dictionary generation of the xAOD packages a little better, this MR introduces some new functionality in [xAODCore](Event/xAOD/xAODCore).
- A new header, `xAODCore/tools/DictHelpers.h`, which provides some convenience macros for instantiating (smart pointer) types that we typically want to generate dictionaries for;
- A new CMake module, `xAODUtilitiesConfig.cmake`, which provides the `atlas_add_xaod_smart_pointer_dicts(...)` helper function for generating the XML lines corresponding to the types that the helper functions from `xAODCore/tools/DictHelpers.h` instantiated.
The idea here was to avoid the mindless repetitions of lines in the `<Foo>Dict.h` headers and `selection.xml` files across the packages. With the help of these macros and the CMake function the xAOD packages can express in a much more compact way which types they want to generate smart pointer dictionaries for.
The concept for this is not new at all. The [atlas_add_dictionary(...)](https://twiki.cern.ch/twiki/bin/view/AtlasComputing/SoftwareDevelopmentWorkBookCMakeInAtlas#atlas_add_dictionary) function can actually auto-generate type declarations for the dictionary that it wants to generate, through its many optional arguments, already. I was at first considering extending that function inside [atlas/atlasexternals](https://gitlab.cern.ch/atlas/atlasexternals) for this functionality at first, but then decided that it would be more elegant to have this implemented in [xAODCore](Event/xAOD/xAODCore). A bit similar to how [AthenaPoolUtilitiesTestConfig.cmake](Database/AthenaPOOL/AthenaPoolUtilities/cmake/AthenaPoolUtilitiesTestConfig.cmake) is used. (Just like for [AthenaPoolUtilitiesTestConfig.cmake](Database/AthenaPOOL/AthenaPoolUtilities/cmake/AthenaPoolUtilitiesTestConfig.cmake), I had to teach the project configurations how to find this module.)
With this functionality in place I also updated a number of "simpler" packages as part of this MR, to make use of this code. These are all packages that didn't declare any STL-only dictionaries, or any other dictionary that in !32081 I decided to migrate somewhere else. The list doesn't even include all the "simple" packages like that, as I wanted to keep this MR small enough to be reviewable. Once this MR is merged, I'll open separate MRs with the remaining updates that I developed in !32081.
Pinging @ssnyder, @fwinkl and @krumnack for information purpuses.