athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2023-07-17T15:42:57+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/64265Switch EMPFlow to all variables for JETM12023-07-17T15:42:57+02:00Maximilian J Swiatlowskimswiatlo@cern.chSwitch EMPFlow to all variables for JETM1Switching JETM1 to use all variables for PFlowJets, for cleaning recommendations.
This adds <5% size to JETM1 in data. Size change in MC should be negligible, as the NoPtCut container is already included with all variables in MC.Switching JETM1 to use all variables for PFlowJets, for cleaning recommendations.
This adds <5% size to JETM1 in data. Size change in MC should be negligible, as the NoPtCut container is already included with all variables in MC.https://gitlab.cern.ch/atlas/athena/-/merge_requests/64256Removing muon quality variable from PHYSLITE2023-07-25T09:26:15+02:00Zach MarshallRemoving muon quality variable from PHYSLITEFollowing the discussion in https://its.cern.ch/jira/browse/ATLASG-2544
, it seems that muon quality as written directly is not something that
should be used for analysis. If that's the case, then I (personally)
find it more clear to rem...Following the discussion in https://its.cern.ch/jira/browse/ATLASG-2544
, it seems that muon quality as written directly is not something that
should be used for analysis. If that's the case, then I (personally)
find it more clear to remove the variable to make it obvious that it
cannot be used.
Just offering an option here to make clear that this is a
(straightforward) technical option.
This shouldn't get merged without some comment from @mvanadia ,
@hrussell , @gwatts , @egramsta (or some combination of them), but not
marking as draft so that the CI goes ahead and runs.
This is a duplicate of !63787 but pointing at the main branch.https://gitlab.cern.ch/atlas/athena/-/merge_requests/64249DerivationFrameworkJetEtMiss package: updating the skimming on the JETM5 deri...2023-07-17T15:41:52+02:00Daniel Camarero MunozDerivationFrameworkJetEtMiss package: updating the skimming on the JETM5 derivation code, including the default ZeroBias trigger for Run-3**Summary:** updating the JETM5 derivation code, including the default ZeroBias trigger for Run-3 (HLT_noalg_L1ZB). After the change, we have a logical OR for the default ZeroBias triggers for Run-2 and Run-3 data-taking periods, so that...**Summary:** updating the JETM5 derivation code, including the default ZeroBias trigger for Run-3 (HLT_noalg_L1ZB). After the change, we have a logical OR for the default ZeroBias triggers for Run-2 and Run-3 data-taking periods, so that the code works for both.
**Validation:** I have validated this by running over 2022 (run 431914) and 2017 (run 325713) data.
- Before the fix no events in 2022 data were passing the JETM5 skimming since the Run-2 ZeroBias trigger defined (HLT_noalg_zb_L1ZB) was not part of the RUn-3 trigger menu. Now this works.
- I tested with 2017 just to check that the logical OR works fine.
Tagging @mdiamant, @cdelitzs, @camacho, @mleblanc, and @markovit for their information.https://gitlab.cern.ch/atlas/athena/-/merge_requests/64241Use TagInfoMgr to set Truth metadata2023-07-15T01:19:31+02:00Maciej Pawel SzymanskiUse TagInfoMgr to set Truth metadataUsing `TagInfoMgr` directly instead of `CondAttrListCollection` has the advantage of getting the extra tag value pairs, passed e.g. in `postExec`.
/cc @tadejUsing `TagInfoMgr` directly instead of `CondAttrListCollection` has the advantage of getting the extra tag value pairs, passed e.g. in `postExec`.
/cc @tadejhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/64198Fix close by correction for LLP12023-07-17T15:43:15+02:00Sagar AddepalliFix close by correction for LLP1Hello,
This MR makes some simple fixes to implement closeByCorrection of lepton isolation variables in DAOD_LLP1 and for LRT leptons in general. The changes were already merged in !63381, but there was a small typo which I now fix. I ha...Hello,
This MR makes some simple fixes to implement closeByCorrection of lepton isolation variables in DAOD_LLP1 and for LRT leptons in general. The changes were already merged in !63381, but there was a small typo which I now fix. I have also moved the writing of variables to the CP content files instead of within LLP1 itself.
Tagging @schaffer as the original author of the tools, @goblirsc to check the code, @jojungge for LRT muons, @longjon for LRT electrons, @gfrattar as an LLP1 user.
Cheers,
SagarSagar AddepalliSagar Addepallihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/64181Derivations: Add LRT tracks to BPHY52023-07-17T15:43:01+02:00Adam Edward BartonDerivations: Add LRT tracks to BPHY5Add LRT track support to BPHY5. Requires "relinking" various track links back to the original collections. Not been able to find a better way.
cc @wwalkoAdd LRT track support to BPHY5. Requires "relinking" various track links back to the original collections. Not been able to find a better way.
cc @wwalkohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/64175Add GN2Xv01 tagger to PHYS2023-07-08T12:17:16+02:00Jackson BarrAdd GN2Xv01 tagger to PHYSAdding GN2Xv01 to PHYS (and FTAG) derivations @coccaro @arelycgAdding GN2Xv01 to PHYS (and FTAG) derivations @coccaro @arelycghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/64158Update track filter alg to handle standard tracks2023-08-30T13:32:41+02:00Jackson Carl BurzynskiUpdate track filter alg to handle standard tracksThis MR adds the `InDetTrackTruthFilterTool` to the `TrackSystematicsAlg` to enable the "track-killing" used by displaced vertex searches on standard tracks. The `TrackSystematicsAlg` is also then scheduled in the LLP1 derivation to writ...This MR adds the `InDetTrackTruthFilterTool` to the `TrackSystematicsAlg` to enable the "track-killing" used by displaced vertex searches on standard tracks. The `TrackSystematicsAlg` is also then scheduled in the LLP1 derivation to write out a modified VSI container run on the systematically varied track container.
Note that this only modifies the LLP1 output for MC.https://gitlab.cern.ch/atlas/athena/-/merge_requests/64063BPHY24 Trigger Update2023-07-04T09:42:00+02:00Andrew Donald GentryBPHY24 Trigger UpdateAdding bBmumuxv2 and some bJpsimumutriggers from 2015/2016 menusAdding bBmumuxv2 and some bJpsimumutriggers from 2015/2016 menusPeter OnyisiATLAS RobotAndrew Donald GentryPeter Onyisihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/64013Drop the PdtPdg.h2023-07-07T17:00:44+02:00Andrii VerbytskyiDrop the PdtPdg.hDrop the PdtPdg.h and use the particle names from TruthUtils instead.
This is a part of efforts to consolidate all the MC- related functions and definition in TruthUtils.
Tag @jchapman @ewelina @pclarkDrop the PdtPdg.h and use the particle names from TruthUtils instead.
This is a part of efforts to consolidate all the MC- related functions and definition in TruthUtils.
Tag @jchapman @ewelina @pclarkhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/64011Move the isBSM function into TruthUtils2023-06-30T16:58:42+02:00Andrii VerbytskyiMove the isBSM function into TruthUtilsMove the isBSM function into TruthUtils
@jchapmanMove the isBSM function into TruthUtils
@jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/64010Use predicates instead of explicit checks of the status codes.2023-07-05T18:24:39+02:00Andrii VerbytskyiUse predicates instead of explicit checks of the status codes.In this MR:
- Use predicates instead of explicit checks of the status codes.
- Move the isStatus1BSMParticle function to TruthUtilsIn this MR:
- Use predicates instead of explicit checks of the status codes.
- Move the isStatus1BSMParticle function to TruthUtilshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/63981Clean up unused vertex collections in JetBTaggingAlg2023-06-30T16:58:42+02:00Thomas StreblerClean up unused vertex collections in JetBTaggingAlgWhile investigating the impact of ACTS on FTAG secondary vertexing, I noticed that the secondary vertex collections were retrieved in the `JetBTaggingAlg` but not used. They are instead used in the [BTagLightSecVertexing](https://gitlab....While investigating the impact of ACTS on FTAG secondary vertexing, I noticed that the secondary vertex collections were retrieved in the `JetBTaggingAlg` but not used. They are instead used in the [BTagLightSecVertexing](https://gitlab.cern.ch/atlas/athena/-/blob/23.0/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/BTagging/BTagLightSecVertexing.h) tool. They are consequently removed from the `JetBTaggingAlg`. Run 3 derivation outputs have been checked to be unchanged.
FYI @ligang @bdonghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/63974Minor name fix for error message in JetBTaggingAlg2023-06-29T17:13:11+02:00Thomas StreblerMinor name fix for error message in JetBTaggingAlgSelf-explanatorySelf-explanatoryhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/63955Fix Trig8 crash (protect against ValueError)2023-06-27T17:18:54+02:00Jonathan LongFix Trig8 crash (protect against ValueError)This protects against an exception thrown if the trigger name to veto is already not in the list. Presumably from an updated menu.
cc: @calpigia this fixes the crash you forwarded to meThis protects against an exception thrown if the trigger name to veto is already not in the list. Presumably from an updated menu.
cc: @calpigia this fixes the crash you forwarded to mehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/63945Merge two versions of MagicNumbers.h2023-06-29T17:13:11+02:00Andrii VerbytskyiMerge two versions of MagicNumbers.hBecause the TruthUtils is a header-only package now, it is possible to use the MagicNumbers.h from that package only.
Practically the MR amounts to
- `#include "AtlasHepMC/MagicNumbers.h"` -> `#include "TruthUtils/MagicNumbers.h"`
- Min...Because the TruthUtils is a header-only package now, it is possible to use the MagicNumbers.h from that package only.
Practically the MR amounts to
- `#include "AtlasHepMC/MagicNumbers.h"` -> `#include "TruthUtils/MagicNumbers.h"`
- Minor changes in TruthUtils/MagicNumbers.h
- Adding TruthUtils as dependency to some packages
@jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/63903EGamma derivation: use cell weight to compute energy per layer2023-06-27T17:18:55+02:00Jean-Baptiste De Vivie De RegieEGamma derivation: use cell weight to compute energy per layerThe EM energy per layer and gain computed in derivation was missing the cell weight. (It was OK in rel 21.2.) This has been added back.
To have a bit more information, also the ratio (energy with weight)/(energy without weight) is added ...The EM energy per layer and gain computed in derivation was missing the cell weight. (It was OK in rel 21.2.) This has been added back.
To have a bit more information, also the ratio (energy with weight)/(energy without weight) is added as a decoration.
tagging @gunal @christos @gmarchiohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/63894pip8 and flake fixes for python scripts in DerivationFrameworkEGamma2023-06-23T21:42:29+02:00Giovanni Marchioripip8 and flake fixes for python scripts in DerivationFrameworkEGammaThis MR does not change functionality of the code - it is only about formatting so that the code passes the pre-commit checks (no trailing whitespaces/lines at EOF, PIP8 formatting as provided by black).This MR does not change functionality of the code - it is only about formatting so that the code passes the pre-commit checks (no trailing whitespaces/lines at EOF, PIP8 formatting as provided by black).https://gitlab.cern.ch/atlas/athena/-/merge_requests/63877DerivationFrameworkL1Calo: add objects for phase 1 topo simple cone studies2023-06-23T21:42:29+02:00Moritz HespingDerivationFrameworkL1Calo: add objects for phase 1 topo simple cone studiesAdd the containers `L1_Phase1L1TopoRAWData` and `AntiKt10LCTopoJets` to the L1CALO1 and L1CALO2 DAODs. These are needed for the validation of the Phase 1 L1Topo Simple Cone algorithm.
I have tested these changes by running the derivatio...Add the containers `L1_Phase1L1TopoRAWData` and `AntiKt10LCTopoJets` to the L1CALO1 and L1CALO2 DAODs. These are needed for the validation of the Phase 1 L1Topo Simple Cone algorithm.
I have tested these changes by running the derivation locally using the script provided in the [L1CaloRunDAOD package](https://gitlab.cern.ch/atlas-l1calo/offlinesw/L1CaloRunDaod).https://gitlab.cern.ch/atlas/athena/-/merge_requests/63823Updating (more) derivation ARTs in 23.02023-06-20T18:30:17+02:00Cristiano AlpigianiUpdating (more) derivation ARTs in 23.0Not sure how, but I forgot to add some tests in !63744. This MR adds the missing ones. Like for !63744 **no need to sweep it to master**.
Tagging @boeriuNot sure how, but I forgot to add some tests in !63744. This MR adds the missing ones. Like for !63744 **no need to sweep it to master**.
Tagging @boeriu