athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-28T11:16:53+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/70152Draft: barcode -> ID migration for HGTD/InDet/MuonDigitization (2nd attempt)2024-03-28T11:16:53+01:00John Derek ChapmanDraft: barcode -> ID migration for HGTD/InDet/MuonDigitization (2nd attempt)The first attempt at this !69655 caused issues in the case that pile-up background HITS with intact truth information and using a barcode-based persistent were read into a pile-up digitization job. In this case there was no way for the i...The first attempt at this !69655 caused issues in the case that pile-up background HITS with intact truth information and using a barcode-based persistent were read into a pile-up digitization job. In this case there was no way for the initial HepMcParticleLink member variables of the transient hit classes generated from the persistent classes to know whether they should be linking to an event other than the first event in the McEventCollection (The hard-scatter GenEvent is always first in the McEventCollection). This meant that calls to `HepMcParticleLink::id()` would return zero as the links often appear to be invalid.
This second version of the migration is less aggressive as it allows the possibility of barcode-based inputs. It avoids the issue seen in ATLSWUPGR-242 according to my local tests, but I will avoid marking the merge request as ready until we have a CI test to catch such an issue.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70146Draft: Improve consistency of InDetSimEventTPCnv behaviour.2024-03-27T09:46:05+01:00John Derek ChapmanDraft: Improve consistency of InDetSimEventTPCnv behaviour.In recent updates to HepMcParticleLink, it was observed that the behaviour of `TRT_HitCollectionCnv_p4` and `SiHitCollectionCnv_p3`
differed from the behaviour of TP converter classes using `HepMcParticleLinkCnv_p2` directly.
This merge...In recent updates to HepMcParticleLink, it was observed that the behaviour of `TRT_HitCollectionCnv_p4` and `SiHitCollectionCnv_p3`
differed from the behaviour of TP converter classes using `HepMcParticleLinkCnv_p2` directly.
This merge request attempts to make the behaviour of `SiHitCollectionCnv_p3/4`and `TRT_HitCollectionCnv_p4/5`
consistent with `HepMcParticleLinkCnv_p2/3`.
Relates to ATLASSIM-6999.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70142Draft: HF classification added to PHYSLITE2024-03-26T22:26:43+01:00Abhishek SharmaDraft: HF classification added to PHYSLITEI'm adding the heavy flavour classification to PHYSLITE, backing up off work done for [PHYS](https://its.cern.ch/jira/browse/ATLASG-2374). The addition necessitated moving the extra variables list to the bottom of the script to allow for...I'm adding the heavy flavour classification to PHYSLITE, backing up off work done for [PHYS](https://its.cern.ch/jira/browse/ATLASG-2374). The addition necessitated moving the extra variables list to the bottom of the script to allow for easy adding of the variables HF_Classification and HF_SimpleClassification.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70137[ATR-29000] Enable supercell output for Run 4 MC-MC overlay2024-03-27T10:52:15+01:00Tim Martin[ATR-29000] Enable supercell output for Run 4 MC-MC overlayFollows on from !68314
Applies the same change (`== Run 3` -> `>= Run 3`) also to the Overlay workflow.
cc @damazio, @pavolFollows on from !68314
Applies the same change (`== Run 3` -> `>= Run 3`) also to the Overlay workflow.
cc @damazio, @pavolhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70136Draft: Add possiblity to use Geant4 transport instead of ATLAS tracking tools...2024-03-27T18:52:44+01:00Joshua Falco Beirerjoshua.beirer@cern.chDraft: Add possiblity to use Geant4 transport instead of ATLAS tracking tools in FCS in G4https://gitlab.cern.ch/atlas/athena/-/merge_requests/701201) added all-event diagnostic histograms 2) deleted obsolete initializing file2024-03-27T10:59:48+01:00Yuhan Guo1) added all-event diagnostic histograms 2) deleted obsolete initializing file(cherry picked from commit 65b93be7fafcf0a250934ebd9876f0b1dbdb0191)
@steinber @bcole(cherry picked from commit 65b93be7fafcf0a250934ebd9876f0b1dbdb0191)
@steinber @bcolehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70119Draft: Improvements to truth vertex labelling2024-03-26T11:59:04+01:00Nikita Ivvan PondDraft: Improvements to truth vertex labellingThis MR will (eventually) aim to overhaul vertex labelling in flavour tagging. The idea is to start from a PV, iterate through the truth decays, and associated to features measured in the detector, rather than starting with tracks and wo...This MR will (eventually) aim to overhaul vertex labelling in flavour tagging. The idea is to start from a PV, iterate through the truth decays, and associated to features measured in the detector, rather than starting with tracks and working up. The hope is this will allow us to have vertex properties for a broader range of vertex types.
cc @svanstrohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70110Draft: Template clustering alg2024-03-26T10:24:24+01:00Carlo Varnicarlo.varni@cern.chDraft: Template clustering algTemplate Clusterization alg on a bool (`useCache`) and then use `if constexpr` in the code
Also, move it to the `src/details` folderTemplate Clusterization alg on a bool (`useCache`) and then use `if constexpr` in the code
Also, move it to the `src/details` folderhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70106Draft: ActsGeometryContext - Non const access2024-03-27T08:20:11+01:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chDraft: ActsGeometryContext - Non const accesshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70093Draft: Smkgeneration 24.0.302024-03-25T14:44:50+01:00John Patrick Mc GowanDraft: Smkgeneration 24.0.30Avoid duplicate streamsAvoid duplicate streamshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70072Create HIGG1D3 for Higgs->yy + eta_c->4pi2024-03-25T11:16:45+01:00Xin ChenCreate HIGG1D3 for Higgs->yy + eta_c->4piCreating a new derivation format HIGG1D3 for Higgs->yy + eta_c->4pi search. Borrowing the good stuff from HIGG1D1 about Higgs->yy and adding the facility class EtacTo4TracksVertex in BPhys for eta_c. The new format's python file lives in...Creating a new derivation format HIGG1D3 for Higgs->yy + eta_c->4pi search. Borrowing the good stuff from HIGG1D1 about Higgs->yy and adding the facility class EtacTo4TracksVertex in BPhys for eta_c. The new format's python file lives in DerivationFrameworkHiggs.Xin ChenXin Chenhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70067Draft: add option to patch bug in micromegas simulation when deriving muon tr...2024-03-22T18:00:27+01:00Valerio IppolitoDraft: add option to patch bug in micromegas simulation when deriving muon trigger SFsThis MR is meant to address, at the level of muon trigger SF retrieval, the bug in the micromegas simulation discussed in [ATR-28607](https://its.cern.ch/jira/browse/ATR-28607).
A configuration option (which by default is set to `false`...This MR is meant to address, at the level of muon trigger SF retrieval, the bug in the micromegas simulation discussed in [ATR-28607](https://its.cern.ch/jira/browse/ATR-28607).
A configuration option (which by default is set to `false`) is added to the `MuonTriggerScaleFactors` tool. Whenever this option is activated, if an event is a MC event and if the MC run number (as emulated from the pileup reweighting tool) is a 2022 or 2023 run number then, instead of accessing the scale factors prepared for the corresponding periods of data taking - for example period `F` - the code accesses special maps prepared for period `FX`.
This implies that efficiency maps in the 2022 and 2023 files are duplicated for each period, and that the periods ending with `X` contain the efficiency map corresponding to the case in which the micromegas simulation bug is present.
The underlying approximation is that the check performed by the function `MuonTriggerScaleFactors::hasMMbug()` is accurate enough to discriminate the set of events which have no micromegas hits, and those which do.
Tagging @yoyamagu, and the muon trigger SF team (@ffabbri, @gwmyers, @syan and @nkyriaco). The MR is still in draft mode, as I am just exploring the technical feasibility of this solution - we still need to agree this is the best way to address the bug.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70056Draft: Extend unit tests for HepMcParticleLink and SiHitCollectionCnv_pX.2024-03-25T18:35:35+01:00John Derek ChapmanDraft: Extend unit tests for HepMcParticleLink and SiHitCollectionCnv_pX.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70054Draft: FTAG: update source label for study on effect of secondaries on flavou...2024-03-27T11:12:07+01:00Nils Benedikt KrengelDraft: FTAG: update source label for study on effect of secondaries on flavour taggingThis MR makes the following changes:
- It adds separate functions to check whether a particle is from a K-short decay or Lambda Decay in the InDetTrackTruthOriginDefs.h (before only both could be checked at the same time with `isV0Decay`...This MR makes the following changes:
- It adds separate functions to check whether a particle is from a K-short decay or Lambda Decay in the InDetTrackTruthOriginDefs.h (before only both could be checked at the same time with `isV0Decay`)
- Added categories of hadronic interaction and other decay to `ftagTruthSourceLabel`
- Based the implementation of `ftagTruthSourceLabel` now on the tools provided by InDetTrackTruthOriginDefs.h and not using the truth particle directly anymore (similar to implementation of `ftagTruthOriginLabel`)
- Removed the truth source accessor in the track truth decorator ([the ftag dumper](https://gitlab.cern.ch/atlas-flavor-tagging-tools/training-dataset-dumper/-/blob/main/FTagDumper/python/dumper.py?ref_type=heads#L195) will need some attention)Nils Benedikt KrengelNils Benedikt Krengelhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70041Draft: TriggerEDMRun3: AODCOMM removal Round 2 (ATR-28561, ATR-28781), Unuse...2024-03-25T12:18:34+01:00Claire AntelDraft: TriggerEDMRun3: AODCOMM removal Round 2 (ATR-28561, ATR-28781), Unused/empty AOD removal (ATR-29047)`TriggerEDMRun3`:
- Remove `HLT_TopoCaloClustersFS` from AOD
- Relabel UTT containers AODCOMM->AODFULL: `HLT_dEdxTrk`, `HLT_DisTrkCand`
- Relabel EGamma Fast obj containers AODCOMM->AODFULL: `HLT_FastPhotons`, `HLT_FastElectrons`, `HL...`TriggerEDMRun3`:
- Remove `HLT_TopoCaloClustersFS` from AOD
- Relabel UTT containers AODCOMM->AODFULL: `HLT_dEdxTrk`, `HLT_DisTrkCand`
- Relabel EGamma Fast obj containers AODCOMM->AODFULL: `HLT_FastPhotons`, `HLT_FastElectrons`, `HLT_FastElectrons_LRT`
- Removing never used Jet/BJet/BPhys containers from all but BS: `HLT_AntiKt4EMTopo/PFlowJets_subresjesgscIS_ftf_BTaggingSecVtx`, `HLT_AntiKt4EMTopo/PFlowJets_subresjesgscIS_ftf_BTaggingJFVtx`, `HLT_DiElecPrecision`, `HLT_NoMuonDiElecPrecision`, several jet containers.
`TrigAnalysisTest`:
- adjust ART Run3DQ tests to use `Trigger.AODEDMSet='ESD'`: `test_trigAna_RDOtoRun3DQ_v1Dev_build.py`, `test_trigAna_RDOtoRun3DQ_v1Dev_grid.py`
This is so that they don't break after removing HLT containers from AOD that are being monitored (At TIER0, do DQ step in RAWtoALL, thus remains unaffected).https://gitlab.cern.ch/atlas/athena/-/merge_requests/70020Draft: Simplify pixel clusterization & calibration configuration2024-03-23T08:12:53+01:00Louis-Guillaume Gagnonlouis.guillaume.gagnon@cern.chDraft: Simplify pixel clusterization & calibration configurationA proposal to simplify the mess of Position/Error strategy flags on the ACTS-ITk side.A proposal to simplify the mess of Position/Error strategy flags on the ACTS-ITk side.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69999Draft: Revise ISFTruthIncident unit test2024-03-26T14:08:15+01:00John Derek ChapmanDraft: Revise ISFTruthIncident unit testRevise the ISFTruthIncident unit test, so that it takes place with an `McEventCollection` present in StoreGate.
In this initial version the McEventCollection is a dummy one, but it could be improved to include the parent particle of the...Revise the ISFTruthIncident unit test, so that it takes place with an `McEventCollection` present in StoreGate.
In this initial version the McEventCollection is a dummy one, but it could be improved to include the parent particle of the TruthIncident.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69983Draft: work on new EventLoop configuration mechanism2024-03-21T08:35:56+01:00Nils Erik KrumnackDraft: work on new EventLoop configuration mechanismThe main goal here is to allow running part of the configuration on the
worker node. Since this is already a breaking change to some extent I
figured I do a bit more of a rework at the same time. However,
hopefully in the grand scheme ...The main goal here is to allow running part of the configuration on the
worker node. Since this is already a breaking change to some extent I
figured I do a bit more of a rework at the same time. However,
hopefully in the grand scheme users can still do a very straightforward
translation.
For now please only look at `FullCPAlgorithmsTest_elconfig.py` which has
some comments etc. The remaining files are mostly here so that I can
test that this at least runs and works.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69978Draft: Decoupling of Trigger analysis and SF application in configuration2024-03-28T19:32:37+01:00Philipp RinckeDraft: Decoupling of Trigger analysis and SF application in configurationTrigger analysis configurations are currently coupling the trigger selection and the trigger scale factor computation.
While the trigger scale factor computation requires calibrated objects and can only be run after the whole object cal...Trigger analysis configurations are currently coupling the trigger selection and the trigger scale factor computation.
While the trigger scale factor computation requires calibrated objects and can only be run after the whole object calibration sequence, the trigger selection should be applied as early as possible to avoid wasting CPU on the object calibration for events failing the trigger.
This MR implements a decoupling of those algorithms in two separate configs.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69957save only ditaus with 2 subjets candidates2024-03-28T15:45:48+01:00Antonio De Mariasave only ditaus with 2 subjets candidatesThis MR is meant to remove the 1 subject + 1 electron/muon selection to save a ditau object, keeping only ditaus with >= 1 subjet. The collimated 1 electron/muon + 1 tau is already covered by the Tau Ele OLR and Tau Muon OLR collections....This MR is meant to remove the 1 subject + 1 electron/muon selection to save a ditau object, keeping only ditaus with >= 1 subjet. The collimated 1 electron/muon + 1 tau is already covered by the Tau Ele OLR and Tau Muon OLR collections.
Tagging @martindl and @ntamir