athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2023-04-19T19:25:17+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/62440Fix legacy configuration of MuonIdHelperSvc2023-04-19T19:25:17+02:00John Derek ChapmanFix legacy configuration of MuonIdHelperSvcThe legacy configuration of `MuonIdHelperSvc` needed to be updated in a few places after !62133.
The main place we see the issue is in RDO merging (used in presampling workflows). See ATLASSIM-6522, ATLASSIM-6533
Tagging @jojungge, @tad...The legacy configuration of `MuonIdHelperSvc` needed to be updated in a few places after !62133.
The main place we see the issue is in RDO merging (used in presampling workflows). See ATLASSIM-6522, ATLASSIM-6533
Tagging @jojungge, @tadej, @tlari, @mbandier, @jmaurer, @strichtehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61450Pileup mc23a2023-03-13T21:43:30+01:00Tommaso LariPileup mc23aUpdating the mc23a profile, correcting the bug in the data preparation script that resulted in 9% lower mu in the previous iteration.
The maximum number of pileup events is also updated (61.5 => 67.5) in the Campaigns package. While doi...Updating the mc23a profile, correcting the bug in the data preparation script that resulted in 9% lower mu in the previous iteration.
The maximum number of pileup events is also updated (61.5 => 67.5) in the Campaigns package. While doing this, I realized that it was set incorrectly (too low) for the mc23c campaign in the legacy file, so that is updated also to match the (correct) CA number.https://gitlab.cern.ch/atlas/athena/-/merge_requests/61130Externals Update, master branch (2023.03.01)2023-03-02T21:42:31+01:00Marilena BandieramonteExternals Update, master branch (2023.03.01)Update externals version to 2.0.151.
This should fix: ATLASSIM-6403Update externals version to 2.0.151.
This should fix: ATLASSIM-6403https://gitlab.cern.ch/atlas/athena/-/merge_requests/60999SiHitCollectionCnv_p3(_p2) Protect against values stored std::vector<unsigned...2023-02-24T17:45:46+01:00John Derek ChapmanSiHitCollectionCnv_p3(_p2) Protect against values stored std::vector<unsigned short> exceeding USHRT_MAXThis was a "fun" one.
As part of the compression of `SiHitCollection` properties which are shared between successive `SiHit` objects are only recorded once in the persistent format. Other vectors in the persistent format keep track of ...This was a "fun" one.
As part of the compression of `SiHitCollection` properties which are shared between successive `SiHit` objects are only recorded once in the persistent format. Other vectors in the persistent format keep track of how many `SiHit` instances share the current value. These vectors are `std::vector<unsigned short>`. There was an implicit assumption that we would never get more than `USHRT_MAX` consecutive `SiHit` objects with a matching property. The logic in `SiHitCollectionCnv_p2/p3` has been unchanged for a long time, but the samples requested in ATLMCPROD-10454 managed to break it. The fix is to check if the number of consecutive `SiHit` objects with a matching property has reached `USHRT_MAX` and behave as if the value of the property has changed in that case. NB `TRT_HitCollectionCnv_p3/p4` already have this protection, so no changes are required there.
This fixes ATLASSIM-6398, needed by ATLMCPROD-10454 - a new 22.0.X release will be required unfortunately. Tagging @jmaurer and @strichte.https://gitlab.cern.ch/atlas/athena/-/merge_requests/60916PileUpUtils: fix run and lumi profile generation2023-02-22T15:42:30+01:00Tadej Novaktadej.novak@cern.chPileUpUtils: fix run and lumi profile generationFix run and lumi profile generation where mu values may be the same by accident (as in case with flat profiles). The step number should override the mu so that it is used as the sorting criterium (we use the same code as for standard pil...Fix run and lumi profile generation where mu values may be the same by accident (as in case with flat profiles). The step number should override the mu so that it is used as the sorting criterium (we use the same code as for standard pile-up jobs). Also sort the resulting profile by step.
Sorry, I also fixed some whitespace inconsistencies when reading the code in detail to spot the issues.
/cc @jchapman @tlari @mbandierhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60898Configuration for MC23c campaign2023-02-22T21:43:57+01:00Tommaso LariConfiguration for MC23c campaignI cloned all MC23a configurations (hopefully I catched all) to MC23c equivalents, changed the run number to the MC23c one, and included a flat pileup profile, to be replaced by the actual MC23c profile when available. However, simulation...I cloned all MC23a configurations (hopefully I catched all) to MC23c equivalents, changed the run number to the MC23c one, and included a flat pileup profile, to be replaced by the actual MC23c profile when available. However, simulation will not need that, so we don't need to wait for the actual
profile (in preparation).
Still a draft, waiting for @tadej to comment. The CI should be fine as they will not run the mc23c workflow, but I will run a test job to check it does not crash.
Tommasohttps://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/60537Split MC23 multiple IoV simulation into a separate MC23a one2023-02-09T21:44:41+01:00Tadej Novaktadej.novak@cern.chSplit MC23 multiple IoV simulation into a separate MC23a oneSplit MC23 multiple IoV simulation into a separate MC23a one. MC23c to be added later.
/cc @jchapman @tlari @mbandierSplit MC23 multiple IoV simulation into a separate MC23a one. MC23c to be added later.
/cc @jchapman @tlari @mbandierhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60527Fix digi metadata parsing2023-02-09T21:44:18+01:00Tadej Novaktadej.novak@cern.chFix digi metadata parsingFix digi metadata parsing when CA-based outputs are used in legacy config.
Not sure how this hasn't been spotted in PhysVal :shrug:
/cc @jchapman @martindl @tlari @mbandierFix digi metadata parsing when CA-based outputs are used in legacy config.
Not sure how this hasn't been spotted in PhysVal :shrug:
/cc @jchapman @martindl @tlari @mbandierhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60524adding flat pileup profiles2023-02-10T21:43:35+01:00Tommaso Lariadding flat pileup profilesAdding two pileup profile files, with a flat mu profile (except for a bit more in the last bin because of the need to have the integer population sum to the mc21/mc23a pileup fractions) between 25-75 and 50-75 respectively. They can hope...Adding two pileup profile files, with a flat mu profile (except for a bit more in the last bin because of the need to have the integer population sum to the mc21/mc23a pileup fractions) between 25-75 and 50-75 respectively. They can hopefully be picked up with a postInclude (need to test that) for MC requests that need a flat pileup profile. They will be ignored by all standard workflows, so the CI won't be affected.
Tagging @tadej and @mbandierhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60387Detect simulation flags when writing metadata more reliably2023-02-06T21:42:21+01:00Tadej Novaktadej.novak@cern.chDetect simulation flags when writing metadata more reliablyNeeds to check the start of the flag string.
Fixes ATLASSIM-6369.
/cc @tdado @jchapman @tlari @mbandierNeeds to check the start of the flag string.
Fixes ATLASSIM-6369.
/cc @tdado @jchapman @tlari @mbandierhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60321TruthSvc logic and debugging updates (ATLASSIM-6361)2023-02-06T21:42:08+01:00John Derek ChapmanTruthSvc logic and debugging updates (ATLASSIM-6361)Fix for two bugs in the `TruthSvc`:
1. Attempt to access the `GenEventBarcodes` attribute using the wrong key (`"GenEventBarcodes"` rather than `"barcodes"`). This fixes the crash reported in ATLASSIM-6361.
2. Fix logic for how to update...Fix for two bugs in the `TruthSvc`:
1. Attempt to access the `GenEventBarcodes` attribute using the wrong key (`"GenEventBarcodes"` rather than `"barcodes"`). This fixes the crash reported in ATLASSIM-6361.
2. Fix logic for how to update the `GenEvent` in the case that a particle with a pre-defined decay (i.e. a quasi-stable particle) undergoes an additional non-destructive interaction prior to being decayed. (This was spotted while debugging issue (1).) Unit tests updated for change in call pattern.
These changes will alter the simulation output in principle, but only in the case that the event contains a particle with a pre-defined decay which undergoes an additional non-destructive interaction prior to being decayed. This is quite rare in most samples, so I would not be surprised if the CI tests see no change in output.
Compilation tested for HepMC2 and HepMC3 builds.
Tagging @averbyts, @martindlhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60265Updated frozen showers library for MC232023-02-03T09:44:52+01:00Tommaso LariUpdated frozen showers library for MC23A bug was uncovered by physics validation checks on the first version of the frozen showers library which has been merged in !58896.
@ahrynevi has promptly provided new library files which are fixing the mismodeling at large eta (> 4.5)...A bug was uncovered by physics validation checks on the first version of the frozen showers library which has been merged in !58896.
@ahrynevi has promptly provided new library files which are fixing the mismodeling at large eta (> 4.5) as illustrated in the attached
plot (the current version is the red points, the new one is the green points, the panel is the ratio to G4).
[energyVSeta_11_100.0.pdf](/uploads/1fab4e2a7b095605a8693557847c5ad1/energyVSeta_11_100.0.pdf)
Since the current version in master is not good, and since we would like to start MC23 simulation very soon, I am proposing to change
the default version in master without waiting for the next physics validation results. I am also marking the MR as urgent. We have discussed
this strategy at the physics validation coordination meeting today.
This will change the output of Run 2, Run 3, and Run 4 simulation and will require an update of the reference files.
cheers,
Tommasohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60096Fix sTGC pad staggering (fuzziness)2023-02-06T10:47:50+01:00Alexandre LaurierFix sTGC pad staggering (fuzziness)sTGC pad staggering was incorrect for confirm wedges: yielded updates to the geometry XML and now requires a new geometry tag.
Fixed a sign error in MuonPadDesign regarding pad staggering.
Largest impact of this MR is the updated confi...sTGC pad staggering was incorrect for confirm wedges: yielded updates to the geometry XML and now requires a new geometry tag.
Fixed a sign error in MuonPadDesign regarding pad staggering.
Largest impact of this MR is the updated confirm wedge pad staggering which closes a 2-4mm gap in track reconstruction between pads.
Hoping for urgent merge prior to end-of January reprocessing.
The actual update of the geometry from the new XML file is discussed in ATLASSIM-6268
@chchau @estelhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/59944Adding some fast barcodes2023-01-25T21:42:10+01:00Andrii VerbytskyiAdding some fast barcodes Adding some fast barcodes developed by @ssnyder in the cases when the events are created from scratch.
TAg @jchapman , @mgignac Adding some fast barcodes developed by @ssnyder in the cases when the events are created from scratch.
TAg @jchapman , @mgignachttps://gitlab.cern.ch/atlas/athena/-/merge_requests/59859Properly configure SiHitIdHelper for ITk+HGTD dictionary2023-01-17T21:42:06+01:00Thomas StreblerProperly configure SiHitIdHelper for ITk+HGTD dictionarySelf-explanatory. Marked as ~urgent to target 23.0.14
FYI @nstyles @jmasik @dshopeSelf-explanatory. Marked as ~urgent to target 23.0.14
FYI @nstyles @jmasik @dshopehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/59858Extend ITkPixel LogicalVolumeNames for RUN4-01-01-002023-01-17T21:42:43+01:00Thomas StreblerExtend ITkPixel LogicalVolumeNames for RUN4-01-01-00Needed to address issue related to new LogicalVolumes introduced with ATLAS-P2-RUN4-01-01-00 (see https://its.cern.ch/jira/browse/ATLSWUPGR-178)
Compatible with both ATLAS-P2-RUN4-01-00-00 and ATLAS-P2-RUN4-01-01-00 tags, with warnings
...Needed to address issue related to new LogicalVolumes introduced with ATLAS-P2-RUN4-01-01-00 (see https://its.cern.ch/jira/browse/ATLSWUPGR-178)
Compatible with both ATLAS-P2-RUN4-01-00-00 and ATLAS-P2-RUN4-01-01-00 tags, with warnings
```
ToolSvc.Sensiti...WARNING Volume ITkPixel::InnerQuadMod_Sensor not found in G4LogicalVolumeStore.
ToolSvc.Sensiti...WARNING Volume ITkPixel::OuterQuadMod_Sensor not found in G4LogicalVolumeStore.
```
Set up as a hot fix to enter 23.0.14. Will be updated in a subsequent MR following discussions at the Upgrade Software meeting.
FYI @nstyles @sroe @jmasik @dshopehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/59575include ttbar HT and HF sliced samples DSIDs in the HIGG4D5 and HIGG8D1 formats2023-01-09T18:43:15+01:00Mahsana Haleeminclude ttbar HT and HF sliced samples DSIDs in the HIGG4D5 and HIGG8D1 formatsThis MR effects only athena/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG8D1.py and athena/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG4D5.py. The modification will allow adding TopHa...This MR effects only athena/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG8D1.py and athena/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG4D5.py. The modification will allow adding TopHadronOriginFlag decoration in ttbar HF- and HT- filter sliced samples.ATLAS RobotATLAS Robothttps://gitlab.cern.ch/atlas/athena/-/merge_requests/59424FastCaloSim: Switched to the retrieval of the Calo DD manager from Cond Store...2022-12-18T21:43:18+01:00Vakhtang TsulaiaFastCaloSim: Switched to the retrieval of the Calo DD manager from Cond Store in unit testsPart of the ongoing migration of all clients of the Calo DD manager.
Used here the same technique as the one used in !59422 (thanks @christos)
Closes ATLASRECTS-7438Part of the ongoing migration of all clients of the Calo DD manager.
Used here the same technique as the one used in !59422 (thanks @christos)
Closes ATLASRECTS-7438https://gitlab.cern.ch/atlas/athena/-/merge_requests/59349Add AMI tag support to CA-based skeletons2022-12-16T21:43:44+01:00Tadej Novaktadej.novak@cern.chAdd AMI tag support to CA-based skeletonsAdd AMI tag support to CA-based skeletons. Also recover `INDS` (panda) validation.
Note that I also enabled using `--AMIConfig` as there's no reason why this one should not be used if `--AMITag` is not set.
/cc @nstyles @jcatmore @jcha...Add AMI tag support to CA-based skeletons. Also recover `INDS` (panda) validation.
Note that I also enabled using `--AMIConfig` as there's no reason why this one should not be used if `--AMITag` is not set.
/cc @nstyles @jcatmore @jchapman @zmarshal @christos @mhodgkin