athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-28T13:34:35+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/69513Use config flags in analysis config2024-03-28T13:34:35+01:00Tadej Novaktadej.novak@cern.chUse config flags in analysis configMake config flags the main way to steer analysis config. This will help people working on analysis and Athena to feel at home and prevent accumulation of arguments of the `ConfigAccumulator`.
The naming is not fixed, I will probably als...Make config flags the main way to steer analysis config. This will help people working on analysis and Athena to feel at home and prevent accumulation of arguments of the `ConfigAccumulator`.
The naming is not fixed, I will probably also convert more items to flags. This is mainly to start the discussion and freeze the API as soon asp possible. I will probably then break this into multiple MRs.
Also some core flags should be renamed (see https://its.cern.ch/jira/browse/ATEAM-964).
Tagging @krumnack, @jolamber, @gwatts, @ekourlit for core AMG. Also tagging interested parties @ravinab, @omajersk, @tstreble, @khoo, @jchapman.https://gitlab.cern.ch/atlas/athena/-/merge_requests/3061721.2 Add resolution categories2020-02-28T11:15:59+01:00Magnar Kopangen Bugge21.2 Add resolution categoriesThis merge request adds a function to the MuonSelectorTool that allows categorization of muons according to their resolution as observed in MC samples with realistic detector misalignments. This will be used in an update of the MuonCalib...This merge request adds a function to the MuonSelectorTool that allows categorization of muons according to their resolution as observed in MC samples with realistic detector misalignments. This will be used in an update of the MuonCalibrationAndSmearingTool to allow more realistic smearing to be applied to muons that fail the high-pT working point and also to the 2-station muons currently accepted in the high-pT working point.https://gitlab.cern.ch/atlas/athena/-/merge_requests/27033Add OriginalAodCounts2020-03-09T15:37:20+01:00Dan GuestAdd OriginalAodCountsThere are quite a few rather cryptic copypasta recipes to calculate the number of original AOD events, all spread across various frameworks. It would make more sense to have this centralized in some way, since in general what analysts wa...There are quite a few rather cryptic copypasta recipes to calculate the number of original AOD events, all spread across various frameworks. It would make more sense to have this centralized in some way, since in general what analysts want is just something that gives the sum of events and event weights.
For reference:
- [link to similar code in `AnalysisTop`][1]
- [link to similar code in `xAH`][2]
- [link to similar code in `CxAOD`][3]
- [link to similar code in `XAMPP`][4]
- [link to similar code in `AsgAnalysisAlgorithms`][5]
I'm sure it's similar for `MxAOD`, `PxAOD`, `SUSYTools`, or any of the other frameworks in wide use. What none of these implementations provide is a framework-independent way to access the CutBookkeepers metadata.
[1]: https://gitlab.cern.ch/atlas/athena/blob/ba85524ce66b370e048cb57188119cbf5a7da343/PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/util/top-xaod.cxx#L395-443
[2]: https://github.com/UCATLAS/xAODAnaHelpers/blob/c95e847f56a7b42cea647f2cefade19fea623a2b/Root/BasicEventSelection.cxx#L191-L295
[3]: https://gitlab.cern.ch/CxAODFramework/CxAODMaker/blob/2f97fc97a4cf6f7845d43a46e365ed6c25c6ea71/Root/AnalysisBase.cxx#L350-432
[4]: https://gitlab.cern.ch/atlas-mpp-xampp/XAMPPbase/blob/40e7d1a6d7086b0c9e8f6370a79208e2bd1ecd14/XAMPPbase/Root/MetaDataTree.cxx#L372-411
[5]: https://gitlab.cern.ch/atlas/athena/blob/21.2/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/AsgCutBookkeeperAlg.cxxhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/26870AT: Decorate Large-R jets with TAccept information from BoostedJetTaggers2019-10-02T03:02:20+02:00Oliver MajerskyAT: Decorate Large-R jets with TAccept information from BoostedJetTaggersThis concerns retrieving result of boosted jet tagging algorithms in AnalysisTop.
By default, specified taggers in config file result in a branch added in output NTuples with binary 0/1 tagger decision for each jet.
This MR adds decora...This concerns retrieving result of boosted jet tagging algorithms in AnalysisTop.
By default, specified taggers in config file result in a branch added in output NTuples with binary 0/1 tagger decision for each jet.
This MR adds decoration with the TAccept object converted to bitmap (more in this [twiki](https://twiki.cern.ch/twiki/bin/viewauth/AtlasProtected/BoostedJetTaggingRecommendation2017) that contains more granular information about the tagger decision, such that users have the ability to retrieve this information in their custom event savers.
Resolves ANALYSISTO-868Oliver MajerskyOliver Majerskyhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/26616new egamma leakage corrections2019-09-19T03:02:48+02:00Baptiste Ravinabaptiste.ravina@cern.chnew egamma leakage corrections[Improved egamma isolation corrections](https://twiki.cern.ch/twiki/bin/view/AtlasProtected/IsolationLeakageCorrections#Improved_Isolation_Corrections) are set up, but the needed variables are only available in the derivations starting w...[Improved egamma isolation corrections](https://twiki.cern.ch/twiki/bin/view/AtlasProtected/IsolationLeakageCorrections#Improved_Isolation_Corrections) are set up, but the needed variables are only available in the derivations starting with p3947/p3948 (21.2.71.0).
I plan on keeping this MR as WIP until such TOPQ1 DAODs are available for testing, @tdado & @mvanadia.https://gitlab.cern.ch/atlas/athena/-/merge_requests/2004422.0-refactor-IOVDbSvc-22019-01-15T15:44:55+01:00Shaun Roe22.0-refactor-IOVDbSvc-2Refactoring IOVDbSvc; work continued after repository change to open source.
Pre-change patch file applied to the new repository (so.. many changes in one commit).
Adding new Cool functions and delegating file metadata reading to a new c...Refactoring IOVDbSvc; work continued after repository change to open source.
Pre-change patch file applied to the new repository (so.. many changes in one commit).
Adding new Cool functions and delegating file metadata reading to a new classhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70140distinguish two steps with different name in muComb (ATR-29040)2024-03-28T10:35:24+01:00Francesca Pastoredistinguish two steps with different name in muComb (ATR-29040)https://gitlab.cern.ch/atlas/athena/-/merge_requests/69686athena.py: remove athena-specific history and readline setup2024-03-12T09:36:46+01:00Frank Winklmeierathena.py: remove athena-specific history and readline setupRemove the code that customizes the athena command history and readline settings for interactive mode and just re-use what the user has setup for usual python prompts. This is another step in unifying the legacy/CA experience of athena.Remove the code that customizes the athena command history and readline settings for interactive mode and just re-use what the user has setup for usual python prompts. This is another step in unifying the legacy/CA experience of athena.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69396Update ThinCAWrapper.sh - also allow scripts to be located in the joboption...2024-03-04T10:07:36+01:00Will ButtingerUpdate ThinCAWrapper.sh - also allow scripts to be located in the joboption...Update ThinCAWrapper.sh - also allow scripts to be located in the joboption path instead of the python path.Update ThinCAWrapper.sh - also allow scripts to be located in the joboption path instead of the python path.https://gitlab.cern.ch/atlas/athena/-/merge_requests/66212Fix possible deadlock between AddressRemappingSvc and SGImplSvc.2023-10-11T03:59:28+02:00Goetz GayckenFix possible deadlock between AddressRemappingSvc and SGImplSvc.A deadlock may occur between the SGImplSvc and the AddressRemappingSvc. One of such situations may arise if VarHandleBase::typeless_dataPointer calls AddressRemappingSvc::updateAddress without passing through SGImplSvc and
and a differe...A deadlock may occur between the SGImplSvc and the AddressRemappingSvc. One of such situations may arise if VarHandleBase::typeless_dataPointer calls AddressRemappingSvc::updateAddress without passing through SGImplSvc and
and a different thread calls VarHandleBase::record_impl which calls SGImplSvc::record_impl which calls AddressRemappingSvc::updateAddress. So, two threads may try to lock the same two locks but in different order, which may lead to a deadlock.https://gitlab.cern.ch/atlas/athena/-/merge_requests/65094AtlasCITest - Switch on CA in cosmic test2023-08-28T12:21:10+02:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chAtlasCITest - Switch on CA in cosmic testWe're running most of the stuff in CA anyway
Tagging: @tadej, @nstyles, @jcatmore, @jmaurer, @wlamplWe're running most of the stuff in CA anyway
Tagging: @tadej, @nstyles, @jcatmore, @jmaurer, @wlamplhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/63554Add asserts for static analyzers2023-06-10T01:14:06+02:00Adam Edward BartonAdd asserts for static analyzersStatic analyzers think these can be null and misidentify errors, so adding asserts to show nulls aren't possible.Static analyzers think these can be null and misidentify errors, so adding asserts to show nulls aren't possible.https://gitlab.cern.ch/atlas/athena/-/merge_requests/58327refactor HTT flag to use ActivePass2022-11-25T10:38:19+01:00Katarzyna Suchrefactor HTT flag to use ActivePassThis MR changes `HTTConfigFlags` in order to dynamically load flags (e.g. "Hough" flags) and refactors `HTTLogicalHistProcessAlg` to use `cloneAndReplace`This MR changes `HTTConfigFlags` in order to dynamically load flags (e.g. "Hough" flags) and refactors `HTTLogicalHistProcessAlg` to use `cloneAndReplace`https://gitlab.cern.ch/atlas/athena/-/merge_requests/57583The get methods of the ROBDataProviderSvc can be made const2022-10-17T20:13:24+02:00Christos Anastopouloschristos.anastopoulos@cern.chThe get methods of the ROBDataProviderSvc can be made constThe get methods of the ROBDataProviderSvc can be made const
This seems possible here.
We seem to have ``tbb::concurent_map`` and also a ``lock`` for the hlt implementation,
when doing kind of a lazy init from ``getRobData`` via the int...The get methods of the ROBDataProviderSvc can be made const
This seems possible here.
We seem to have ``tbb::concurent_map`` and also a ``lock`` for the hlt implementation,
when doing kind of a lazy init from ``getRobData`` via the internal ``eventCache_addRobData``
ping @tadejhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/57333Adding 'icalonocut' WP to Photon Isolation hypo + Adding 'icalonocut' Photon+...2022-10-12T16:02:07+02:00Marco MontellaAdding 'icalonocut' WP to Photon Isolation hypo + Adding 'icalonocut' Photon+Jets TLA chainsAs discussed in: [ATR-26421](https://its.cern.ch/jira/browse/ATR-26421)
This MR adds the 'icalonocut' passthrough working points for the Photon isolation in the relevant TrigEgammaHypo, TrigEgammaMonitoring and TrigEgammaMatchingTool pa...As discussed in: [ATR-26421](https://its.cern.ch/jira/browse/ATR-26421)
This MR adds the 'icalonocut' passthrough working points for the Photon isolation in the relevant TrigEgammaHypo, TrigEgammaMonitoring and TrigEgammaMatchingTool packages.
Furthermore, the corresponding isolation variables are added to the TLA EDM in order for them to be saved to the TLA stream, and three new TLA chains with explicit isolation calculation, differing by the photon threshold.https://gitlab.cern.ch/atlas/athena/-/merge_requests/53440CxxUtils+AthenaCommon+AthenaServices: Add checked_tcmalloc.2022-05-20T09:31:30+02:00Scott SnyderCxxUtils+AthenaCommon+AthenaServices: Add checked_tcmalloc.Build a version of tcmalloc with extra error checking.
The code is taken from gperftools 2.8.1, modified for extra checking
and for building as part of CxxUtils.
It is built into a separate shared library, so won't have any effect
unless...Build a version of tcmalloc with extra error checking.
The code is taken from gperftools 2.8.1, modified for extra checking
and for building as part of CxxUtils.
It is built into a separate shared library, so won't have any effect
unless that library is explicitly loaded.
Only tested for linux/gcc/x86_64, so for now only build for that platform.
To assist in catching errors like double-frees and overwrites.
Adds a --checked-tcmalloc flag to Athena.
Have CoreDumpSvc handle SIGABRT as well.https://gitlab.cern.ch/atlas/athena/-/merge_requests/51469Fortran Warning Fixes, master branch (2022.03.22.)2022-03-22T21:43:56+01:00Attila KrasznahorkayFortran Warning Fixes, master branch (2022.03.22.)Made sure that all `DO`-loops would end in a `CONTINUE` statement, and that nested `DO`-loops would not share the same `CONTINUE` statement. Which apparently are both removed as a possibility from Fortran 2018.
Note that there are a num...Made sure that all `DO`-loops would end in a `CONTINUE` statement, and that nested `DO`-loops would not share the same `CONTINUE` statement. Which apparently are both removed as a possibility from Fortran 2018.
Note that there are a number of places in the code that used to look like the following:
```fortran
DO 10 I=1,10
DO 10 J=1,10
...
IF (<SOMETHING>) GOTO 10
...
10 CONTINUE
```
I have no idea how this should be fixed. :frowning: Should it be
```fortran
DO 10 I=1,10
DO 20 J=1,10
...
IF (<SOMETHING>) GOTO 10
...
20 CONTINUE
10 CONTINUE
```
or
```fortran
DO 10 I=1,10
DO 20 J=1,10
...
IF (<SOMETHING>) GOTO 20
...
20 CONTINUE
10 CONTINUE
```
??? I went with the latter one in this MR. But somebody more versed in Fortran should really speak up... :thinking: @ssnyder, are you sure about this part? (After some tests, as shown in the MR's discussion, the latter one turned out to be the correct solution.)
This is meant as a replacement for !51454, fixing/addressing AGENE-2140 and ATLINFR-4464.
Pinging @fwinkl as well, just for good measure. :stuck_out_tongue:https://gitlab.cern.ch/atlas/athena/-/merge_requests/51454Hijing_i: Fix fortran compilation warnings.2022-03-22T18:44:24+01:00Scott SnyderHijing_i: Fix fortran compilation warnings.Fix warnings related to deprecated do-loop constructions.
Fixes AGENE-2140 and relates to ATLINFR-4464.Fix warnings related to deprecated do-loop constructions.
Fixes AGENE-2140 and relates to ATLINFR-4464.https://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/50541RungeKuttaPropagator - Introduce limit on back & forth extrapolations on the ...2022-03-02T10:22:04+01:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chRungeKuttaPropagator - Introduce limit on back & forth extrapolations on the same surfaceCloses ATLASRECTS-6829
Tagging: @sroe, @goblirsc,@christos for ~"review-pending-expert"Closes ATLASRECTS-6829
Tagging: @sroe, @goblirsc,@christos for ~"review-pending-expert"