athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-13T16:16:30+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/68328TauAnalysisTools: Use data handles in BuildTruthTaus2024-03-13T16:16:30+01:00Bertrand Martin Dit LatourTauAnalysisTools: Use data handles in BuildTruthTausHello,
The main goal of this MR is to replace direct access from evtStore with read/write handles, to allow derivations to run in MT (ATLASG-2528). This is located in `BuildTruthTaus`. I dropped a few deprecated functionalities, in part...Hello,
The main goal of this MR is to replace direct access from evtStore with read/write handles, to allow derivations to run in MT (ATLASG-2528). This is located in `BuildTruthTaus`. I dropped a few deprecated functionalities, in particular `WriteTruthTaus=0` which was building truth taus and keeping them in memory without registering them to SG. I also changed the behaviour of truth tau building. Before, if `TruthTaus` were not present in the input file, `BuildTruthTaus` would trigger truth tau building from `TruthParticles`. Now, `BuildTruthTaus` will always run truth tau building, unless it is put in "truth matching mode" by the TauTruthMatchingTool, in which case it will read the existing `TruthTaus` and apply truth matching to reconstructed TauJets.
This is a first step, the BuildTruthTaus+TauTruthMatchingTool design is still somewhat unfriendly and should be further improved.
The MR was tested on 1000 TRUTH3 events and 500 PHYS events, it doesn't change the output.
Cheers,
Bertrandhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/66751Move SUSYTools to new set of Jvt-related tools2024-03-06T15:21:02+01:00Michael HolzbockMove SUSYTools to new set of Jvt-related toolsMake SUSYTools move away from the JetJvtEfficiency tools and move to the new set of dedicated tools for selection and SF retrieval.
Needs to be merged after !66687
Tagging @mhank and @mrimoldi.Make SUSYTools move away from the JetJvtEfficiency tools and move to the new set of dedicated tools for selection and SF retrieval.
Needs to be merged after !66687
Tagging @mhank and @mrimoldi.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69212SUSYTool - Change default systematic strategy for flavor tagging2024-02-28T19:36:33+01:00Michael HolzbockSUSYTool - Change default systematic strategy for flavor taggingPropagate the adjustment which is done for main in !69079 also to 21.2
For reference: a first attempt of this was done in !69078 but aborted as the CI tests failed due to outdated reference files. These have been already updated so the...Propagate the adjustment which is done for main in !69079 also to 21.2
For reference: a first attempt of this was done in !69078 but aborted as the CI tests failed due to outdated reference files. These have been already updated so the CI should work now.
Tagging @mhank .https://gitlab.cern.ch/atlas/athena/-/merge_requests/69079AFT-706: Move to SF eigen for b-tagging systematic2024-02-27T18:23:31+01:00Dan GuestAFT-706: Move to SF eigen for b-tagging systematicWe should probably move to more sensible defaults for susytools. The default tagger here doesn't even exist in newer derivations, so that needs to change. Also we shouldn't default to "Envelope" systematic variations for flavor tagging. ...We should probably move to more sensible defaults for susytools. The default tagger here doesn't even exist in newer derivations, so that needs to change. Also we shouldn't default to "Envelope" systematic variations for flavor tagging. Marking this as a draft to see if @fdibello, @bmoser, @vvecchio, @bdong, or @ligang have any comments.
This is the `main` counterpart to !69078 (which targets 21.0). I'm not sure if changing 21.2 now is worth it, but hopefully changing this in `main` is less controversial.https://gitlab.cern.ch/atlas/athena/-/merge_requests/67940SUSYTools: Add support for 2023 MET trigger2024-02-16T20:32:59+01:00Michael Donald HankSUSYTools: Add support for 2023 MET triggerAdd support for 2023 in SUSYTools `IsMETTrigPassed` function.
Tagging @miholzbo .Add support for 2023 in SUSYTools `IsMETTrigPassed` function.
Tagging @miholzbo .https://gitlab.cern.ch/atlas/athena/-/merge_requests/64846ATLJETMET-1642 Replace JetJvtEfficiency2024-02-16T09:47:23+01:00Jon BurrATLJETMET-1642 Replace JetJvtEfficiencyThe `JetJvtEfficiency` is rather overloaded and does too many different things at once. The idea here is to strip it apart into its individual pieces (JVT selection and JVT scale factor calculations). As the interface includes too much t...The `JetJvtEfficiency` is rather overloaded and does too many different things at once. The idea here is to strip it apart into its individual pieces (JVT selection and JVT scale factor calculations). As the interface includes too much this means adding in a new `IJvtEfficiencyTool`.
Here, the `JetJvtEfficiency` uses the new tools internally, but should otherwise be largely unchanged. This hopefully means that this can be an unobtrusive change and other frameworks can switch to using the new tools without an immediate break. I'm marking this as draft as, even with this intention there are a lot of changes here and I haven't run the tests yet.
_____
First a quick summary of the changes
- Add a new `IJvtEfficiencyTool` interface class
- Implement JVT, fJVT and NNJVT into their own selection and efficiency tools. Some code is shared between shared `JvtSelectionToolBase` and `JvtEfficiencyToolBase` classes.
- Add a helper class `NNJvtBinning` to make it easier to read the NNJvt binnings in and out
- Made the output RpT and NNJvt selections optional in the `JetVertexNNTagger`
_____
A few notes
- It would be better to not calculate the NNJvt selection in `JetVertexNNTagger`
- Might even be good to calculate RpT in a separate jet moment tool which preceds the `JetVertexNNTagger`. This would simplify that tool a fair bit as well (and make it easier for it to obey the `IJetUpdateJvt` interface).
- What is the purpose of the `isJvtPU` decorator used in the `JetJvtEfficiency` tool? It doesn't seem to be used anywhere
- I've returned -1 rather than +1 when a scale factor is out of range. This is more in line with how other SF tools behave but I can imagine that we'd need to be careful about this if there are tools/algorithms which ignore the `CorrectionCode` returned
- I implemented the three algorithms as different pairs of tools, rather than one central tool for selections and one for efficiencies. I'm not wedded to this approach but I *do* think it is cleaner as it means that there is no coupling between the JVT algorithms and, for example, when we come to remove support for Jvt it merely means removing that tool, rather than editing some larger object.
___
A few further TODO items after this MR
- We need to deprecate `JetJvtEfficiency`. A good starting point would be to remove it from the main athena repo
- The CP analysis algorithms should be updated too. I'm not sure if keeping the `JvtEfficiencyAlg` available as a deprecated legacy option might be better than replacing it entirely
Tagging @khoo, @mswiatlo, @miholzbo and @akong as people who had expressed an interest before.https://gitlab.cern.ch/atlas/athena/-/merge_requests/68636SUSYTools: more support for mc23c and mc23d2024-02-08T09:12:28+01:00Michael Donald HankSUSYTools: more support for mc23c and mc23dMinor fix to allow mc23c and mc23d pile-up reweighting to work in SUSYTools if metadata extraction fails.
Tagging @miholzbo .Minor fix to allow mc23c and mc23d pile-up reweighting to work in SUSYTools if metadata extraction fails.
Tagging @miholzbo .https://gitlab.cern.ch/atlas/athena/-/merge_requests/67929Updated fast sim property for ElectronPhotonFourMomentumCorrection2024-01-26T14:34:31+01:00Thomas StreblerUpdated fast sim property for ElectronPhotonFourMomentumCorrectionUpdated property name from `useAFII` to `useFastSim` to reflect the CP alg configurations + drop metadata check in C++ in favour of python-based configuration
ping @kristin @ludovica @psommer @fnechans @christos @gunalUpdated property name from `useAFII` to `useFastSim` to reflect the CP alg configurations + drop metadata check in C++ in favour of python-based configuration
ping @kristin @ludovica @psommer @fnechans @christos @gunalhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68006SUSYTools: add support for MC23d2024-01-07T02:01:42+01:00Bertrand Martin Dit LatourSUSYTools: add support for MC23dHello,
This MR is adding support for MC23d:
* rtag: r15224
* common PRW file: mc23d.450000.physlite.prw.v1.root, implemented in !68001
Cheers,
BertrandHello,
This MR is adding support for MC23d:
* rtag: r15224
* common PRW file: mc23d.450000.physlite.prw.v1.root, implemented in !68001
Cheers,
Bertrandhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/56084MuonMomentumCorrections - Remove depricated tool MuonCalibrationPeriodTool2023-12-22T12:01:14+01:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chMuonMomentumCorrections - Remove depricated tool MuonCalibrationPeriodToolJohannes Junggeburthjohannes.josef.junggeburth@cern.chJohannes Junggeburthjohannes.josef.junggeburth@cern.chhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67712SUSYTools: fix default for mc-mc maps2023-12-14T18:59:35+01:00Michael Donald HankSUSYTools: fix default for mc-mc mapsChange the default MCshowerID for SUSYTools FTAG MC-MC maps from "601229" to "default. "Default" still uses "601229", but the latest CDI files include the maps under "default".
Tagging @miholzbo .Change the default MCshowerID for SUSYTools FTAG MC-MC maps from "601229" to "default. "Default" still uses "601229", but the latest CDI files include the maps under "default".
Tagging @miholzbo .https://gitlab.cern.ch/atlas/athena/-/merge_requests/67206SUSYTools - Fix use of accessor in fJvt SF retrieval2023-11-20T08:58:39+01:00Michael HolzbockSUSYTools - Fix use of accessor in fJvt SF retrievalWhen moving to the new suite of Jvt-related tools, a typo was introduced to that the wrong decoration in the retrieval of the fJvt SFs is accessed. This is fixed with this MR.
Tagging @mhankWhen moving to the new suite of Jvt-related tools, a typo was introduced to that the wrong decoration in the retrieval of the fJvt SFs is accessed. This is fixed with this MR.
Tagging @mhankhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67040SUSYTools - Update treatAsYear() function2023-11-13T14:13:24+01:00Michael HolzbockSUSYTools - Update treatAsYear() functionQuick fix to follow-up on outdated `treatAsYear()` function in SUSYTools reported by @martindl in ATLSUSYBGF-688.
Tagging @mhank.Quick fix to follow-up on outdated `treatAsYear()` function in SUSYTools reported by @martindl in ATLSUSYBGF-688.
Tagging @mhank.https://gitlab.cern.ch/atlas/athena/-/merge_requests/66915SUSYTools - Updating default b-tagging calibration files and adjust handling ...2023-11-08T17:12:01+01:00Michael HolzbockSUSYTools - Updating default b-tagging calibration files and adjust handling of configuration checkThe naming of of the b-tagging calibration files for the GN2v00 tagger was recently changed, so this MR updates them in SUSYTools and also reworks a check if an adequate calibration files was supplied.
Tagging @mrimoldi and @mhankThe naming of of the b-tagging calibration files for the GN2v00 tagger was recently changed, so this MR updates them in SUSYTools and also reworks a check if an adequate calibration files was supplied.
Tagging @mrimoldi and @mhankhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/66772SUSYTools - fix retrieving of GN2 weights for new WPs2023-10-29T03:42:12+01:00Michael HolzbockSUSYTools - fix retrieving of GN2 weights for new WPsAdjustment to fix the readout of the b-tagging scores for the new GN2 WPs.
Tagging @fsili who spotted this as well as @mhank & @mrimoldi for the SUSY background forum.Adjustment to fix the readout of the b-tagging scores for the new GN2 WPs.
Tagging @fsili who spotted this as well as @mhank & @mrimoldi for the SUSY background forum.https://gitlab.cern.ch/atlas/athena/-/merge_requests/65930SUSYTools - Update CDI btagging2023-10-06T16:38:16+02:00Marco RimoldiSUSYTools - Update CDI btaggingMarco RimoldiMarco Rimoldihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/65855SUSYTools: Fix tests in the Athena build.2023-10-06T16:37:42+02:00Scott SnyderSUSYTools: Fix tests in the Athena build.Fix test failures in the Athena build.Fix test failures in the Athena build.https://gitlab.cern.ch/atlas/athena/-/merge_requests/65765SUSYTools - Update references2023-10-06T16:36:35+02:00Marco RimoldiSUSYTools - Update referencesFollow-up of https://gitlab.cern.ch/atlas/athena/-/merge_requests/65647Follow-up of https://gitlab.cern.ch/atlas/athena/-/merge_requests/65647Marco RimoldiMarco Rimoldihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/65647SUSYTools - Fix test CI AB2023-10-06T16:36:26+02:00Marco RimoldiSUSYTools - Fix test CI ABFix SUSYTools CI after https://gitlab.cern.ch/atlas/athena/-/merge_requests/65556
\cc @miholzbo @mhankFix SUSYTools CI after https://gitlab.cern.ch/atlas/athena/-/merge_requests/65556
\cc @miholzbo @mhankMarco RimoldiMarco Rimoldihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/65600SUSYTools: Fix placement of using directive.2023-10-06T16:36:22+02:00Scott SnyderSUSYTools: Fix placement of using directive.A using directive should come after all #include directives.
Fixes compilation error in the Athena build.A using directive should come after all #include directives.
Fixes compilation error in the Athena build.