athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2023-04-21T17:18:40+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/62199Use hasFlag rather than relying on catching `RuntimeError` s2023-04-21T17:18:40+02:00Jon BurrUse hasFlag rather than relying on catching `RuntimeError` sThere are a few places in the code that rely on catching the `RuntimeError` generated by trying to access a flag that does not exist. This is going to be replaced by an `AttributeError` more inline with python's rules.
In preparation, t...There are a few places in the code that rely on catching the `RuntimeError` generated by trying to access a flag that does not exist. This is going to be replaced by an `AttributeError` more inline with python's rules.
In preparation, this MR changes these calls to use the `hasFlag` method, which is clearer in any case.
FAO @fwinkl, @wlampl, @dguest, also @jmasik, @ksuch and @jchapman as the last people to touch the places I've changed (tagging John rather than Rupert as Rupert has left ATLAS).https://gitlab.cern.ch/atlas/athena/-/merge_requests/62055AF3: use IDCaloBoundary for extrapolation, improve CaloSurface list, suppress...2023-04-05T17:32:03+02:00Christopher YoungAF3: use IDCaloBoundary for extrapolation, improve CaloSurface list, suppress warningsWe want to use the IDCaloBoundary for the extrapolation of particles and only fall back to the CaloSurface when this doesn't work. Furthermore the CaloSurface should include the cases where the first calorimeter encountered is not in the...We want to use the IDCaloBoundary for the extrapolation of particles and only fall back to the CaloSurface when this doesn't work. Furthermore the CaloSurface should include the cases where the first calorimeter encountered is not in the previous list. Additionally we should further suppress the number of WARNINGS printed by adjusting the pT thresholds to give a WARNING in the CaloSurface determination.
This change should have minimal physics impact as seen by the matching between electrons and clusters here;
https://indico.cern.ch/event/1269259/https://gitlab.cern.ch/atlas/athena/-/merge_requests/61881ISF_ValidationMT: Switch AthenaMP simulation ART tests to use a single IoV2023-03-30T07:51:12+02:00John Derek ChapmanISF_ValidationMT: Switch AthenaMP simulation ART tests to use a single IoVAs discussed in ATLASSIM-6372 (master) and ATLASSIM-6449 (23.0), currently it is not possible to get reproducible output for multiple IoV simulation jobs when running in AthenaMP. As each worker gets its own copy of the list of IoV overr...As discussed in ATLASSIM-6372 (master) and ATLASSIM-6449 (23.0), currently it is not possible to get reproducible output for multiple IoV simulation jobs when running in AthenaMP. As each worker gets its own copy of the list of IoV overrides and it is not fixed which events will go to each worker. While this is being resolved all simulation ART jobs using AthenaMP are switched to use a single IoV.
Tagging @tsulaia.https://gitlab.cern.ch/atlas/athena/-/merge_requests/61319Optimize loops in TFCSPCAEnergyParametrization2023-03-08T15:42:26+01:00Adam Edward BartonOptimize loops in TFCSPCAEnergyParametrizationI add an ATH_RESTRICT as mentioned in previous MR. + Some other minor optimizations
@jchapmanI add an ATH_RESTRICT as mentioned in previous MR. + Some other minor optimizations
@jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60946Initial version of ATLFAST3F_ACTSMT Simulator2023-10-06T15:58:09+02:00John Derek ChapmanInitial version of ATLFAST3F_ACTSMT Simulator`ATLFAST3F_ACTSMT` uses Acts Fatras for the Inner Detector/ITk, FastCaloSimV2/FastCaloGAN (otherwise Geant4) in the Calorimeters and Geant4 in the Muon System.
It is based on `SimKernelMT` and is therefore intended to be compatible with ...`ATLFAST3F_ACTSMT` uses Acts Fatras for the Inner Detector/ITk, FastCaloSimV2/FastCaloGAN (otherwise Geant4) in the Calorimeters and Geant4 in the Muon System.
It is based on `SimKernelMT` and is therefore intended to be compatible with AthenaMT running. Further development is required to complete the interface between Acts Fatras and the ISF before it can be properly tested though.
Adding this now to allow Acts Fatras to be run without needing to also support FastCaloSim V1 (as used in ATLFASTII).
Tagging @rwang, @fatsai, @pagacova, @cyoung, @zhangr, @mbandier, @schaarsc, @tlarihttps://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/60817Add missing set, bitset and deque includes2023-03-06T08:46:46+01:00Johannes ElmsheuserAdd missing set, bitset and deque includesAdd missing includes for set, bitset and deque that trigger build failures in the latest dev4 nightlies.Add missing includes for set, bitset and deque that trigger build failures in the latest dev4 nightlies.https://gitlab.cern.ch/atlas/athena/-/merge_requests/60814Update McEventCollectionFilter.cxx -- use reference to particle link2023-02-17T15:42:30+01:00Andrii VerbytskyiUpdate McEventCollectionFilter.cxx -- use reference to particle linkUpdate McEventCollectionFilter.cxx -- use reference to particle link instead of a copy.
Tag @jchapmanUpdate McEventCollectionFilter.cxx -- use reference to particle link instead of a copy.
Tag @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60785AthenaConfiguration: Avoid printing AlgSequence by default in CA-based jobs2023-02-20T21:43:58+01:00Alaettin Serhan MeteAthenaConfiguration: Avoid printing AlgSequence by default in CA-based jobsThis should save about 600-700 lines in the log files in a standard RAWtoALL job.This should save about 600-700 lines in the log files in a standard RAWtoALL job.https://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/60349SleptonsConfig.py fix indentation bugs (ATLASSIM-6360)2023-02-06T21:43:40+01:00John Derek ChapmanSleptonsConfig.py fix indentation bugs (ATLASSIM-6360)Incorrect indentation on two lines in `SleptonsConfig.py` was causing the configuration to attempt to set properties of the `PhysicsListSvc` in digitization/overlay jobs when this component is not used and so had not been added to the `C...Incorrect indentation on two lines in `SleptonsConfig.py` was causing the configuration to attempt to set properties of the `PhysicsListSvc` in digitization/overlay jobs when this component is not used and so had not been added to the `ComponentAccumulator` instance. Should fix ATLASSIM-6360.
Tagging @longjon.https://gitlab.cern.ch/atlas/athena/-/merge_requests/60345Fix for running Sim_tf.py and Digi_tf.py in AthenaMP with legacy configuration2023-02-08T13:05:52+01:00John Derek ChapmanFix for running Sim_tf.py and Digi_tf.py in AthenaMP with legacy configurationThe changes in !60269 assume that `theApp._opts.evtMax` is always set in job transform jobs. This does not seem to be the case for legacy configuration `Sim_tf.py` and `Digi_tf.py` jobs at least. This merge request switches to using `the...The changes in !60269 assume that `theApp._opts.evtMax` is always set in job transform jobs. This does not seem to be the case for legacy configuration `Sim_tf.py` and `Digi_tf.py` jobs at least. This merge request switches to using `theApp.EvtMax` instead, which is set more reliably.
This should fix ATLASSIM-6367.
Tagging @maszyman, @tsulaia, @tadejhttps://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/60254Do not configure Tile muon receiver in Run1 (ATLASSIM-6353)2023-02-01T21:44:36+01:00Siarhei HarkushaDo not configure Tile muon receiver in Run1 (ATLASSIM-6353)Initialization of TileEMScale conditions ojbect
in TileMuonReceiverDecision algorithm has been fixed
to avoid it in Run1 geometries.
Old-style and ComponentAccumulator based configurations
have been updated to avoid configurations of Ti...Initialization of TileEMScale conditions ojbect
in TileMuonReceiverDecision algorithm has been fixed
to avoid it in Run1 geometries.
Old-style and ComponentAccumulator based configurations
have been updated to avoid configurations of Tile muon receiver
algorithms for Run1 geometries.https://gitlab.cern.ch/atlas/athena/-/merge_requests/60249AthenaPoolCnvSvc+OutputStreamAthenaPool: Configure PoolWriteCfg from within O...2023-02-01T21:43:15+01:00Alaettin Serhan MeteAthenaPoolCnvSvc+OutputStreamAthenaPool: Configure PoolWriteCfg from within OutputStreamConfigAs discussed in ATEAM-883, we now call `PoolWriteCfg` from within `OutputStreamConfig`. The former is now cached to avoid multiple calls.
cc: @gemmeren @tadejAs discussed in ATEAM-883, we now call `PoolWriteCfg` from within `OutputStreamConfig`. The former is now cached to avoid multiple calls.
cc: @gemmeren @tadejhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60159Improved speed of simulation2023-01-31T15:42:57+01:00Michele Faucci GiannelliImproved speed of simulationChanged the random number generation to use CLHEP, the object creation causing the slowness is now removed.Changed the random number generation to use CLHEP, the object creation causing the slowness is now removed.https://gitlab.cern.ch/atlas/athena/-/merge_requests/60150Use id for breaking potenial loops instead of barcode2023-01-27T21:42:16+01:00Andrii VerbytskyiUse id for breaking potenial loops instead of barcodeUse id for breaking potential loops instead of barcode
Tag @jchapman @christosUse id for breaking potential loops instead of barcode
Tag @jchapman @christoshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/60123Fix LayerMaterialProvider name in AtlasTrackingGeometrySvc configuration2023-01-27T15:43:57+01:00John Derek ChapmanFix LayerMaterialProvider name in AtlasTrackingGeometrySvc configurationMinor (only affects Fatras Simulation jobs)Minor (only affects Fatras Simulation jobs)https://gitlab.cern.ch/atlas/athena/-/merge_requests/59947Fixes for M21a Monopole Simulation (ATLASSIM-5960)2023-01-25T16:56:29+01:00John Derek ChapmanFixes for M21a Monopole Simulation (ATLASSIM-5960)Manual sweep of !59219 (and !58728) from ~master into ~"22.0".
These changes are required to allow Monopole Simulation to run without crashing.
This is required so that samples needed for Run3 trigger tuning can be produced before
the M...Manual sweep of !59219 (and !58728) from ~master into ~"22.0".
These changes are required to allow Monopole Simulation to run without crashing.
This is required so that samples needed for Run3 trigger tuning can be produced before
the MC23 Full Chain is validated. Fixes ATLASSIM-5960.
Tagging @jmaurer, @tlari, @mbandier, @wsonghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/59943Fix master--HepMC2 nightly compilation2023-01-20T15:45:57+01:00John Derek ChapmanFix master--HepMC2 nightly compilationFollows !59862, which broke the compilation of the master--HepMC2 nightly. No effect on the HepMC3 build, so the CI won't see any code change.Follows !59862, which broke the compilation of the master--HepMC2 nightly. No effect on the HepMC3 build, so the CI won't see any code change.