athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-24T21:36:47+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/68315Fixing recursion issue in TruthDecayCollectionMaker2024-03-24T21:36:47+01:00Zach MarshallFixing recursion issue in TruthDecayCollectionMakerUnder certain circumstances, some decays will be created with loops in
the particle records in the decays of BSM particles. It's a bit unusual,
but when that happens there can be an infinite recursion induced in the
truth decay collectio...Under certain circumstances, some decays will be created with loops in
the particle records in the decays of BSM particles. It's a bit unusual,
but when that happens there can be an infinite recursion induced in the
truth decay collection maker, because the unique ID (previously:
barcode) isn't set until after the decay vertex and outgoing particles
are added to the record. That means if for some reason we have a vertex
that loops back on itself, the particle could be added recursively and
infinitely... until we get a stack overflow and crash (thanks to @amete
for the tip there). Reported by @labruce . Should be fixed with this MR.https://gitlab.cern.ch/atlas/athena/-/merge_requests/68306PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY6.py: A...2024-01-24T12:04:01+01:00Nathan Dale YoungPhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY6.py: Adding r-tag into list of SUSY6 for newly available samplesThis MR adds the r-tags of new signal samples into the list of DAOD_RPVLL samples which toggles filtering to keep the derivation sizes smaller. These samples are for the SUSY disappearing track group which relies on special reconstructio...This MR adds the r-tags of new signal samples into the list of DAOD_RPVLL samples which toggles filtering to keep the derivation sizes smaller. These samples are for the SUSY disappearing track group which relies on special reconstruction techniques.
The added r-tags are based on samples produced here: [https://its.cern.ch/jira/browse/ATLMCPROD-10493](https://its.cern.ch/jira/browse/ATLMCPROD-10493)
and here: [https://its.cern.ch/jira/browse/ATLMCPROD-10713](https://its.cern.ch/jira/browse/ATLMCPROD-10713)https://gitlab.cern.ch/atlas/athena/-/merge_requests/68278(AFT-701) add FTAG42024-03-14T10:41:31+01:00Ligang Xia(AFT-701) add FTAG4- split PHYSCfg into PHYSCoreCfg and PHYSCfg for convenient usage in CP groups
- FTAG4: add 1-lepton skim on top of PHYS
- This MR should not affect PHYS output absolutely.
```
Py:diff-root INFO old: [phys_v0/DAOD_PHYS.test.roo...- split PHYSCfg into PHYSCoreCfg and PHYSCfg for convenient usage in CP groups
- FTAG4: add 1-lepton skim on top of PHYS
- This MR should not affect PHYS output absolutely.
```
Py:diff-root INFO old: [phys_v0/DAOD_PHYS.test.root]
Py:diff-root INFO new: [phys_v1/DAOD_PHYS.test.root]
Py:diff-root INFO branches of interest: set()
Py:diff-root INFO ignore leaves: ('Token', 'index_ref', '(.*)_timings\\.(.*)', '(.*)_mems\\.(.*)', '(.*)TrigCostContainer(.*)')
Py:diff-root INFO enforce leaves: ('BCID',)
Py:diff-root INFO leaves prefix:
Py:diff-root INFO hacks: ('m_athenabarcode', 'm_token')
Py:diff-root INFO entries: -1
Py:diff-root INFO mode: detailed
Py:diff-root INFO error mode: bailout
Py:diff-root INFO order trees: False
Py:diff-root INFO exact branches: False
Py:diff-root INFO comparing over [10] entries...
Py:diff-root INFO comparing [1537] leaves over entries...
Py:diff-root INFO Found [35080] identical leaves
Py:diff-root INFO Found [0] different leaves
Py:diff-root INFO all good.
```https://gitlab.cern.ch/atlas/athena/-/merge_requests/68267Introduced ResidualPullCalculator CA config2024-01-23T09:35:00+01:00Thomas StreblerIntroduced ResidualPullCalculator CA configIntroduced ResidualPullCalculator CA config taking into account potential disabled detectors, both for InDet and Muon configs.
Also fix a bug in `MuidMuonRecovery` about duplicated property name https://gitlab.cern.ch/atlas/athena/-/blo...Introduced ResidualPullCalculator CA config taking into account potential disabled detectors, both for InDet and Muon configs.
Also fix a bug in `MuidMuonRecovery` about duplicated property name https://gitlab.cern.ch/atlas/athena/-/blob/main/Reconstruction/MuonIdentification/MuidTrackBuilder/src/MuidMuonRecovery.h#L73
FYI @martis @ncalacehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68193Continuous handle multiple WPs2024-01-30T16:14:16+01:00Binbin DongContinuous handle multiple WPsLet the SelectionTool handle as many WPs as needed.
cc @fdibello, @dguest, @ligang, @wleinoneLet the SelectionTool handle as many WPs as needed.
cc @fdibello, @dguest, @ligang, @wleinonehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68172[ATR-28687] eFEX Tau algorithm switch and new EDM naming convention for L1 ta...2024-03-04T17:41:24+01:00David Reikher[ATR-28687] eFEX Tau algorithm switch and new EDM naming convention for L1 tau RoIsThe `L1_eTauRoI`/`L1_eTauBDTRoI` naming convention for tau RoIs produced by the heuristic/BDT algorithms, respectively was changed to `L1_eTauRoI/L1_eTauRoIAlt`. A switch was added to the configuration to select which algorithm is the ac...The `L1_eTauRoI`/`L1_eTauBDTRoI` naming convention for tau RoIs produced by the heuristic/BDT algorithms, respectively was changed to `L1_eTauRoI/L1_eTauRoIAlt`. A switch was added to the configuration to select which algorithm is the active one and which is the alternative.
The change was tested by running a derivation on a data file with either BDT or Heuristic set to active and verifying the algorithm version bit in the TOBs in subsequent analysis code running on the derivation.
Tagging @will @thompsonhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68169AFT-698: Add AntiKt4UFOCSSKJets to FTAG12024-01-17T13:39:09+01:00Ligang XiaAFT-698: Add AntiKt4UFOCSSKJets to FTAG1- Add AntiKt4UFOCSSKJets to FTAG1 (AFT-698)
- note: event size increase by 3% (252.0kb->259.8kb) from a ttbar sample
tag @bdong and @dguest- Add AntiKt4UFOCSSKJets to FTAG1 (AFT-698)
- note: event size increase by 3% (252.0kb->259.8kb) from a ttbar sample
tag @bdong and @dguesthttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68166Fix missing mcChannelNumber and add BTagging to EXOT152024-01-17T10:37:01+01:00Alexander BasanFix missing mcChannelNumber and add BTagging to EXOT15Application of GRL to data events caused mcChannelNumber to disappear. Fix this by checking the SkipTriggerRequirement as for the EXOT15MCThinningTool. Add AntiKt4EMTopoJets_BTagging201810 and BTagging_AntiKt4EMTopo_201810 containers to ...Application of GRL to data events caused mcChannelNumber to disappear. Fix this by checking the SkipTriggerRequirement as for the EXOT15MCThinningTool. Add AntiKt4EMTopoJets_BTagging201810 and BTagging_AntiKt4EMTopo_201810 containers to enable BTagging.
This is for a study to extend the CalRatio analysis to include tops in the final state. Currently being done in R21. Currently there’s no b-tagging information in EXOT15, and when adding it, we found a bug affecting mcChannel, introduced some releases ago.https://gitlab.cern.ch/atlas/athena/-/merge_requests/68159TrackParticle eta,phi for forward electron eta,phi2024-01-16T17:13:09+01:00Jean-Baptiste De Vivie De RegieTrackParticle eta,phi for forward electron eta,phiRun4 forward electron reco : when there is a track match, use the track eta,phi to define the electron eta,phi, instead of the cluster eta,phi. To do this, we just run the 4Mom builder *after* the electron track particle has been set. Th...Run4 forward electron reco : when there is a track match, use the track eta,phi to define the electron eta,phi, instead of the cluster eta,phi. To do this, we just run the 4Mom builder *after* the electron track particle has been set. This MR is just a simple reordering.
In FourMomBuilder, the relative energy resolution is used to build the covariance matrix. The corresponding parameterisation stops at |eta| = 2.4, but the code uses the last available bin when eta is out of the parameterisation range. So this matrix is not reliable for fwd electrons, at least for the time being.
tagging @llewitt and @christoshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68109Remove duplicated EventInfo variables in PHYSLITE.py2024-01-10T19:45:16+01:00Thomas StreblerRemove duplicated EventInfo variables in PHYSLITE.pyThe relevant variables are already added l.388The relevant variables are already added l.388https://gitlab.cern.ch/atlas/athena/-/merge_requests/68088JetTagTools clean up2024-01-09T20:55:13+01:00Thomas StreblerJetTagTools clean upFirst half of clean up of `JetTagTools` package:
- removing unused properties
- removing unnecessary import
- removing deprecated `JetVertexCharge` algorithm (it was not compiled any more anyway)First half of clean up of `JetTagTools` package:
- removing unused properties
- removing unnecessary import
- removing deprecated `JetVertexCharge` algorithm (it was not compiled any more anyway)https://gitlab.cern.ch/atlas/athena/-/merge_requests/68085Fix BPHY18TruthThinTool2024-01-09T19:32:56+01:00Kin Yip FungFix BPHY18TruthThinToolabs(..) is added for "TruthParticles.pdgId == 511" and "TruthParticles.pdgId == 513" in BPHY18TruthThinToolabs(..) is added for "TruthParticles.pdgId == 511" and "TruthParticles.pdgId == 513" in BPHY18TruthThinToolhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68080adding in to physlite an extra container with sihit electrons2024-01-11T22:03:33+01:00R D Schafferadding in to physlite an extra container with sihit electronsAs discussed at AMG meeting 8-12-2023, this MR is adding SiHit electrons to PhysLite to allow Higgs to four lepton to evaluate the electron background in PhysLite. This is the last missing feature for the H4l group before migrating to Ph...As discussed at AMG meeting 8-12-2023, this MR is adding SiHit electrons to PhysLite to allow Higgs to four lepton to evaluate the electron background in PhysLite. This is the last missing feature for the H4l group before migrating to PhysLite. SiHit electrons are written to a separate container. The increase in PhysLite size is minimized by suppressing the cluster and track, and replacing them with decorations for the required information. Care has been taken to avoid including the standard LooseLH electrons as well as any additional FSR electron close to muons - both of these pass the simple SiHit selection. As well, SiHit electrons are only kept for events with a pair of muons or electrons with the minimal selection. The increase on the ttbar sample is seen to be 1.6% - @elmsheus will need to adjust the size checks for the CI. Note that this size increase is about 1/2 of that expected without the requirement of a pair of leptons. Further reduction may eventually be obtained by adding in bit compression in a future step.R D SchafferR D Schafferhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68064remove some unused trigger collections from EGAM derivations2024-01-09T20:12:06+01:00Giovanni Marchioriremove some unused trigger collections from EGAM derivationsRemove some unused trigger collections from EGAM derivations (as per egamma trigger experts)Remove some unused trigger collections from EGAM derivations (as per egamma trigger experts)https://gitlab.cern.ch/atlas/athena/-/merge_requests/68034BPHY12 fix2024-01-07T01:14:31+01:00Kin Yip FungBPHY12 fix- Add "StreamName = streamName" to the thinning tools
- Add BPHY12_thinningTool_PV- Add "StreamName = streamName" to the thinning tools
- Add BPHY12_thinningTool_PVhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68033Add BPHY12 ART tests2024-01-05T20:49:36+01:00Adam Edward BartonAdd BPHY12 ART testsBPHY12 is used for production but doesn't have art test yet.
cc @wwalko @kfungBPHY12 is used for production but doesn't have art test yet.
cc @wwalko @kfunghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68025BTagging clean up2024-01-08T19:30:47+01:00Thomas StreblerBTagging clean upClean up of `BTagging` package:
- removing unused configurable properties
- remove unnecessary includesClean up of `BTagging` package:
- removing unused configurable properties
- remove unnecessary includeshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67985Set correct values for large-R truth label2024-01-09T16:57:30+01:00Chris Malena DelitzschSet correct values for large-R truth labelA bug was discovered for the large-R truth labels `R10TruthLabel_R21Precision` and `R10TruthLabel_R21Precision_2022v1` (not present in main). For these labels, the tool always defaulted back to the trimmed truth jets rather than the ungr...A bug was discovered for the large-R truth labels `R10TruthLabel_R21Precision` and `R10TruthLabel_R21Precision_2022v1` (not present in main). For these labels, the tool always defaulted back to the trimmed truth jets rather than the ungroomed truth jets `AntiKt10TruthJets` because the values were not set in the initialize function but earlier when setting up the tool which does not work. To be able to run the correct truth labelling, the splitting scale variables `Split12` and `Split23` have to be reconstructed for the `AntiKt10TruthJets` which is handled by the changes to JetCommon.
Happy holidays!
Tagging @fballi @camacho @dcamarer @mdiamant @jzahredd @rleshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67941adding DSID 411316 in HadronOrigin and HF Classifier2023-12-20T09:34:53+01:00Linghua Guoadding DSID 411316 in HadronOrigin and HF ClassifierAdding Powheig Herwig7 ttbar allhad DSID in the hard-coded list for Hadronorigin and HF Classification.Adding Powheig Herwig7 ttbar allhad DSID in the hard-coded list for Hadronorigin and HF Classification.https://gitlab.cern.ch/atlas/athena/-/merge_requests/67926DerivationFrameworkMCTruth: keep all daughters of TruthTausWithDecayParticles2023-12-19T16:00:45+01:00Bertrand Martin Dit LatourDerivationFrameworkMCTruth: keep all daughters of TruthTausWithDecayParticlesHello,
This MR changes the number of generations of daughter particles retained when building the TruthTausWithDecayParticles/TruthTausWithDecayVertices collections.
It was previously set to 1 but this can lead to pathological situation...Hello,
This MR changes the number of generations of daughter particles retained when building the TruthTausWithDecayParticles/TruthTausWithDecayVertices collections.
It was previously set to 1 but this can lead to pathological situations, e.g. when the truth tau decays to kaons: if we don't know what the kaon decays to, we cannot properly compute the truth visible tau momentum.
When set to -1, we retain all generations, and this seems to fix the problem.
A priori, we can now recompute the various decorations of TruthTaus using TruthTausWithDecayParticles/TruthTausWithDecayVertices, such as `pt/eta/phi/m_vis`, the number of neutral/charged pions, ...
We will need to rework a bit BuildTruthTaus to do this.
The only variables we don't seem to get is `polarizationPhi` and `polarizationTheta` decorations, they exist for TruthTaus but not TruthTausWithDecayParticles, however these seem to always be 0.
We'll still have to check we can rerun photon dressing for TruthTausWithDecayParticles.
Marking as urgent as we'd need this for the upcoming DAOD_PHYS production that is imminent (ATLASDPD-2017).
Tagging @ademaria and @lfiorini .
Cheers,
Bertrand