athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2023-03-29T09:42:43+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/61888Fix compilation warning in xAODBTaggingEfficiency2023-03-29T09:42:43+02:00Thomas StreblerFix compilation warning in xAODBTaggingEfficiencyFix
```
WARNING duplicated property name 'JetAuthor', see https://its.cern.ch/jira/browse/GAUDI-1023
```
Already fixed in ~masterFix
```
WARNING duplicated property name 'JetAuthor', see https://its.cern.ch/jira/browse/GAUDI-1023
```
Already fixed in ~masterhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61878[ATLSWUPGR-187] Update TriggerSlimmingHelper to ignore files with no trigger ...2023-03-28T22:14:47+02:00Tim Martin[ATLSWUPGR-187] Update TriggerSlimmingHelper to ignore files with no trigger payloadSmall fix on top of !61716 to deal explicitly with the case of no trigger payload in the POOL file.
Spotted in Upgrade ART test
cc @jmasikSmall fix on top of !61716 to deal explicitly with the case of no trigger payload in the POOL file.
Spotted in Upgrade ART test
cc @jmasikhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61857JETM8: include track probabilities from InDetTrackParticles container2023-03-29T09:42:41+02:00Kevin Thomas GreifJETM8: include track probabilities from InDetTrackParticles containerThis MR adds the `truthMatchProbability` information for tracks matched to charged PFOs to JETM8. This value is needed to run track systematic tools on charged PFOs, as part of studying the effect of track systematics on constituent base...This MR adds the `truthMatchProbability` information for tracks matched to charged PFOs to JETM8. This value is needed to run track systematic tools on charged PFOs, as part of studying the effect of track systematics on constituent based top tagger performance.
This is a small change to JETM8. The file size of JETM8 containing 200 events increased from 27,250 to 27,437 kB after the change. This is a 0.6% increase in size.Kevin Thomas GreifKevin Thomas Greifhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61600Adding BPHY24 ART tests2023-03-16T21:44:25+01:00Wolfgang WalkowiakAdding BPHY24 ART testsThis merge request adds ART tests for BPHY24.
@abartonThis merge request adds ART tests for BPHY24.
@abartonhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61524Fix maxPVrefit2023-04-11T15:42:37+02:00Hao PangFix maxPVrefitFix maxPVrefit to 10 to reduce backgoundsFix maxPVrefit to 10 to reduce backgoundsHao PangHao Panghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61468Fix ApplyPsi1MassConstraint in BPHY232023-03-15T15:44:48+01:00Xin ChenFix ApplyPsi1MassConstraint in BPHY23Fixed three places with wrong configurations related to ApplyPsi1MassConstraint in BPHY23.pyFixed three places with wrong configurations related to ApplyPsi1MassConstraint in BPHY23.pyhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61193LLP1 modifications for Emerging Jets Run-3 analysis2023-03-22T09:42:45+01:00Guillaume Lucas AlbouyLLP1 modifications for Emerging Jets Run-3 analysisWe propose here modifications to the LLP1 derivation configuration for compatibility with the Emerging Jets Run-3 analysis ([ANA-EXOT-2022-31](https://atlas-glance.cern.ch/atlas/analysis/analyses/details.php?id=8998)) as discussed during...We propose here modifications to the LLP1 derivation configuration for compatibility with the Emerging Jets Run-3 analysis ([ANA-EXOT-2022-31](https://atlas-glance.cern.ch/atlas/analysis/analyses/details.php?id=8998)) as discussed during an internal [meeting](https://indico.cern.ch/event/1259285/#2-proposal-for-an-llp1-derivat).
The modifications are :
- addition of reconstructed (truth) reclustered jets from AntiKt4EMTopoJets (AntiKt4TruthJets)
- computation and addition of substructure variables (22 vars) to RC jets through a custom tool
- addition of tracks associated to RC jets (thinning)
- addition of the Emerging Jets and large-R jet trigger
Leading to ~ +6.6% in event size regarding the nominal LLP1 config (on mc20 ttbar sample).
![figure-14](/uploads/9660bc1b34bc7a806746819e819ce2ba/figure-14.png)
~~Discussion and validation with AMG is still needed, so will keep this MR as Draft in the mean time.~~
Modifications validated during the DAOD+AMG [meeting](https://indico.cern.ch/event/1264717/#6-llp1-modifications-for-emerg) of 15/03/2023, undrafting MR.Guillaume Lucas AlbouyGuillaume Lucas Albouyhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60975Fix setup for HION9 ART tests2023-02-24T09:44:33+01:00Klaudia MajFix setup for HION9 ART testsThe 21.2 HION9 ART tests for data and MC are broken because of missing R=0.3 and R=0.5 HI jet collections. This is fixed by adjusting the ART preExecs to include these collections.The 21.2 HION9 ART tests for data and MC are broken because of missing R=0.3 and R=0.5 HI jet collections. This is fixed by adjusting the ART preExecs to include these collections.https://gitlab.cern.ch/atlas/athena/-/merge_requests/60799HION13 SegmentTag muon bugfix2023-02-20T15:46:09+01:00Hao PangHION13 SegmentTag muon bugfixAdd SmartCollections in BPHY13SlimmingHelper
to solve the crach in MC framework running.Add SmartCollections in BPHY13SlimmingHelper
to solve the crach in MC framework running.https://gitlab.cern.ch/atlas/athena/-/merge_requests/60594Modified HION9 to include jets of various radii2023-02-23T09:11:44+01:00Anabel RomeroModified HION9 to include jets of various radiiModified HION9 to include jets of various radii (R=0.2, 0.3, 0.4, 0.5, 0.6, 0.8, 1.0). Modified the pT cuts to be 50 GeV for the larger radii (R=0.8, 1.0) and 20 GeV for the other radii.Modified HION9 to include jets of various radii (R=0.2, 0.3, 0.4, 0.5, 0.6, 0.8, 1.0). Modified the pT cuts to be 50 GeV for the larger radii (R=0.8, 1.0) and 20 GeV for the other radii.https://gitlab.cern.ch/atlas/athena/-/merge_requests/60593enabled b-jets triggers in HIGG4D5 slimming2023-03-10T14:27:35+01:00Mahsana Haleemenabled b-jets triggers in HIGG4D5 slimmingThis affects only the HIGG4D5 derivation. The b-jets trigger features are enabled in slimming to allow scale factors calculations properly.This affects only the HIGG4D5 derivation. The b-jets trigger features are enabled in slimming to allow scale factors calculations properly.ATLAS RobotATLAS Robothttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60569Edits to B Physics DerivationFramework and addition of BPHY24 for R(K-short) ...2023-03-07T21:44:40+01:00Andrew Donald GentryEdits to B Physics DerivationFramework and addition of BPHY24 for R(K-short) AnalysisAdded BPHY24 Derivation, used for R(K-short) analysis. Made several edits to DerivationFrameworkBPhys tools:
1) Edits to JPsiPlusV0Cascade tool to include JPsi to ee
2) Edits to VertexTrackIsolation tool to subtract electron tracks (GSF...Added BPHY24 Derivation, used for R(K-short) analysis. Made several edits to DerivationFrameworkBPhys tools:
1) Edits to JPsiPlusV0Cascade tool to include JPsi to ee
2) Edits to VertexTrackIsolation tool to subtract electron tracks (GSFTrackParticles) from cones
3) Edits to VertexTrackIsolation tool to account for tracks from neutral particlesPeter OnyisiAndrew Donald GentryPeter Onyisihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60535Fix in handling charged FEs in UFO energy per layer calculation2023-02-10T09:47:07+01:00Chris Malena DelitzschFix in handling charged FEs in UFO energy per layer calculationThis MR is a follow-up of !60135 which caused some crashes in the ART tests for JETM1 and JETM2 where the energy-per-layer variables are calculated for small-R UFO CSSK jets.
The crash occurs when the underlying object of a combined UF...This MR is a follow-up of !60135 which caused some crashes in the ART tests for JETM1 and JETM2 where the energy-per-layer variables are calculated for small-R UFO CSSK jets.
The crash occurs when the underlying object of a combined UFO is a charged FE rather than a neutral FE. These charged FEs do not have the energy-per-layer information stored and therefore the code crashed. Instead, it is now checked if the `otherObject` is a charged FE and its energy is added to the total energy.
In addition, small content changes are implemented for JETM2.
I'm marking this as urgent as I understood from @calpigia that a new release is imminent.https://gitlab.cern.ch/atlas/athena/-/merge_requests/60397Fix a small typo and update mass bound in python2023-02-07T21:45:05+01:00Xin ChenFix a small typo and update mass bound in pythonFixed a small typo in PsiPlusPsiCascade.cxx and updated the X particle mass upper limit in BPHY23.py. Affect BPhys derivations only.Fixed a small typo in PsiPlusPsiCascade.cxx and updated the X particle mass upper limit in BPHY23.py. Affect BPhys derivations only.https://gitlab.cern.ch/atlas/athena/-/merge_requests/60325Additional triggers to STDM72023-02-04T09:45:41+01:00Evgeny SoldatovAdditional triggers to STDM7This merge request adds to STDM7 13 muon triggers (11 - requested by SM group, 2 - requested by HI group).This merge request adds to STDM7 13 muon triggers (11 - requested by SM group, 2 - requested by HI group).https://gitlab.cern.ch/atlas/athena/-/merge_requests/60135Changes to energy-per-layer calculations for PFlow and UFO jets2023-02-09T14:07:16+01:00Chris Malena DelitzschChanges to energy-per-layer calculations for PFlow and UFO jetsUpdating the description to match the latest status and take into account the feedback that was received on this MR and in meetings.
Thanks to the trigger experts, an issue was discovered for EMFrac (and in general for the energy-per-la...Updating the description to match the latest status and take into account the feedback that was received on this MR and in meetings.
Thanks to the trigger experts, an issue was discovered for EMFrac (and in general for the energy-per-layer calculations) for EMPFlow jets. The changes were introduced by !56971 when including the energy-per-layer information for UFO jets. UFO and PFlow jets use the same code to calculate the variables. The impact of the change in the aforementioned MR on EMFrac for PFlow jets is shown in the below figure:
![EMFrac](/uploads/23a61fb6f288d23df70b68593d950b02/EMFrac.png)
After discussing this with the jet experts, e.g. in the Jet Definitions meeting ([agenda](https://indico.cern.ch/event/1237537/)) it was decided that we restore the behaviour for PFlow jets as the recommendations were derived with the blue distribution. This means that we also restore the behaviour in R22.
The difference between the red and the blue distributions is that for the blue distribution, the jet constituents (i.e. the FEs) are used directly to calculate the total energy and to retrieve the energy-per-layer. In the red distribution, the underlying cluster corresponding to the FE is used, i.e. the energies are extracted before the energy subtraction!
In addition, new variables (corresponding to the red distribution) will be calculated at the derivation level that are expected to have superior performance compared to those used for the blue distribution. This has to be confirmed. This approach was not used in R21 as the links to the clusters were broken and therefore the underlying cluster could not be retrieved. The new variables will be used to derive new recommendations using small-R UFO jets. These new variables will be only calculated for the moment in JETMX derivations until it's clear that they should be used for future recommendations.
This MR violates frozen Tier-0 policy as
(1) EMFrac, HECFrac, PSFrac, FracSamplingMax, FracSamplingMaxIndex and EnergyPerSampling change significantly (all triggered by changes to EnergyPerSampling) and
(2) the trigger count will change because the change in the energy-per-layer calculation affects the GSC calibration of jets and therefore the events passing jet trigger requirements. The reference files will be updated accordingly once the CI ran.
Summarizing here quickly the logic for the restored EMFrac:
PFlow jets (constituents are charged and neutral FEs):
- The energy of charged FEs is added to the total energy
- The energy of neutral FEs is added to the total energy and the energy-per-layeris extracted only for neutral FEs
For the new variables (with `CaloBased` in the name), for each FE, the underlying cluster is extracted and its energy is added to the total energy and its energy-per-layer used to calculate variables such as EMFrac. Double-counting is avoided by checking if the cluster has been used already in the calculation.
Tagging some experts: @mhodgkin @mswiatlo @schaarsc @mleblanc @camacho @jroloff @mspalla @haweber
Tagging also @calpigia for his informationhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60062HIGG1D1 Derivation : Add missing variables2023-01-26T15:44:26+01:00Alkaid ChengHIGG1D1 Derivation : Add missing variablesThis merge request added a missing variable in the HIGG1D1 derivation format for Rel22,specifically for data derivation. It is an urgent fix needed by the HGam analysis group for early run3 coupling analysis targeting morion.
Tagging Hg...This merge request added a missing variable in the HIGG1D1 derivation format for Rel22,specifically for data derivation. It is an urgent fix needed by the HGam analysis group for early run3 coupling analysis targeting morion.
Tagging Hgam conveners @yanght, @ancuetog and software contact @ahabouelhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/59940BPHY13 and BPHY23 Updates (derivations only)2023-01-21T09:43:56+01:00Xin ChenBPHY13 and BPHY23 Updates (derivations only)Updated the BPHY13.py to enable reading of MuonSegments in the DAOD output files. Updated JpsiPlusPsiCascade.*, PsiPlusPsiCascade.* and BPHY23.py to deal with large number of candidates per event.Updated the BPHY13.py to enable reading of MuonSegments in the DAOD output files. Updated JpsiPlusPsiCascade.*, PsiPlusPsiCascade.* and BPHY23.py to deal with large number of candidates per event.https://gitlab.cern.ch/atlas/athena/-/merge_requests/59760Adding support for Hybrid Truth Tagging with GNN2023-01-31T10:42:12+01:00Nilotpal KakatiAdding support for Hybrid Truth Tagging with GNN- Added the additional option of Hybrid Truth Tagging with GNN
- Hybrid Truth tagging = Direct tag the given flavor of jets and Truth tag the rest of the jets in the event.
- It first gets the efficiencies of all the jets the usual way, ...- Added the additional option of Hybrid Truth Tagging with GNN
- Hybrid Truth tagging = Direct tag the given flavor of jets and Truth tag the rest of the jets in the event.
- It first gets the efficiencies of all the jets the usual way, and if we are in the Hybrid tagging mode, it will replace the efficiencies of the jets for the given flavor with the Direct Tagging scores.
- The rest of the computation remains same.
tagging @eschopf @hanar @yama @fdibellohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/59756DerivationFrameworkPHYS: fix tau thinning in PHYSLITE and add DeepSet tau ID ...2023-01-12T15:43:00+01:00Bertrand Martin Dit LatourDerivationFrameworkPHYS: fix tau thinning in PHYSLITE and add DeepSet tau ID to PHYSLITE outputHello,
This MR fixes a problem with tau thinning in PHYSLITE caused by !59677 : the TauTrackParticleThinning was dropped from the list of thinning tools supported in PhysCommonThinningConfig and replaced with an all-in-one tau thinning ...Hello,
This MR fixes a problem with tau thinning in PHYSLITE caused by !59677 : the TauTrackParticleThinning was dropped from the list of thinning tools supported in PhysCommonThinningConfig and replaced with an all-in-one tau thinning tool; this was propagated to the PHYS configuration but not to PHYSLITE.
This MR drops the TauTrackParticleThinning from PHYSLITE and only keeps the new TauThinningTool.
It fixes all the PHYSLITE ART tests that are failing today.
Besides, I have added the new Deep Set tau ID to the PHYSLITE output, that's 2 floats (scores) and 4 chars (WPs).
The new tau ID was introduced in !59725 but the output was not kept in PHYSLITE.
For completeness, there is no tau thinning issue in PHYS->PHYSLITE, and the PHYSLITE output seems to be the same (for what concerns taus) when running AOD->PHYSLITE and AOD->PHYS->PHYSLITE.
Unrelated to this MR, I also checked that the multiple tau MRs from yesterday didn't introduce differences in other objects for the PHYS format (I compared today's nightly with yesterday's nightly). I had to ignore tau branches and InDetTrackParticles for this check, as these are affected by tau thinning.
Adding the urgent label. Tagging @calpigia and @jcatmore .
Cheers,
Bertrand