athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-21T11:53:38+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/69998Reduce the usage of #ifdef HEPMC32024-03-21T11:53:38+01:00Andrii VerbytskyiReduce the usage of #ifdef HEPMC3Reduce the usage of #ifdef HEPMC3
@pclark @jchapmanReduce the usage of #ifdef HEPMC3
@pclark @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69777Switch LUCID_SensitiveDetector to use TrackHelper and fix bug in LUCID_SimHit...2024-03-15T14:21:17+01:00John Derek ChapmanSwitch LUCID_SensitiveDetector to use TrackHelper and fix bug in LUCID_SimHit constructor argumentsThe barcode (TrackID) and PDG code arguments of the calls to the LUCID_SimHit constructor in `LUCID_SensitiveDetector.cxx` were switched see [LUCID_SimHit.h](https://gitlab.cern.ch/atlas/athena/-/blob/main/ForwardDetectors/LUCID/LUCID_Si...The barcode (TrackID) and PDG code arguments of the calls to the LUCID_SimHit constructor in `LUCID_SensitiveDetector.cxx` were switched see [LUCID_SimHit.h](https://gitlab.cern.ch/atlas/athena/-/blob/main/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_SimEvent/LUCID_SimEvent/LUCID_SimHit.h#L23-50). This compiled as they were both `int`. Fixing in ~"24.0" just in case LUCID simulation is required for mc23e.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69721Update to LCG_104d_ATLAS_9, main branch (2024.03.11.)2024-03-18T11:47:30+01:00Attila KrasznahorkayUpdate to LCG_104d_ATLAS_9, main branch (2024.03.11.)This is a slightly bigger update, switching the ~main branch to using [LCG_104d_ATLAS_9](https://lcginfo.cern.ch/release/104d_ATLAS_9/), as discussed in ATLINFR-5281.
The new LCG layer comes with the following updates: https://lcginfo.c...This is a slightly bigger update, switching the ~main branch to using [LCG_104d_ATLAS_9](https://lcginfo.cern.ch/release/104d_ATLAS_9/), as discussed in ATLINFR-5281.
The new LCG layer comes with the following updates: https://lcginfo.cern.ch/compare_releases/None/104d_ATLAS_9/104d_ATLAS_7, as discussed in SPI-2517. The (from a technical perspective) important updates being:
- Rivet was updated from version `3.1.10` to `4.0.0`. But only in [LCG_104d_ATLAS_9](https://lcginfo.cern.ch/release/104d_ATLAS_9/). [LCG_104d_ATLAS_10](https://lcginfo.cern.ch/release/104d_ATLAS_10/) remained on version `3.1.10`, as the new version is not compatible with HepMC2 anymore.
* This required adding some pre-processor choices in [Rivet_i](Generators/Rivet_i) and [TruthRivetTools](Generators/TruthRivetTools) to allow both the HepMC3 and HepMC2 based nightlies to continue functioning. :thinking:
- Re-introduced CUDA into the ATLAS layer with CUDA 12.4, which finally supports GCC 13.
- Also re-introduced cuDNN, with version 8.9.7.
To account for the Rivet and CUDA changes, had to update the externals to [atlasexternals-2.1.12](https://gitlab.cern.ch/atlas/atlasexternals/-/tags/2.1.12). Which comes with the following updates (https://gitlab.cern.ch/atlas/atlasexternals/-/compare/2.1.10...2.1.12):
- Introduced `FindHighFive.cmake` for the correspondingly named external;
* This is a header-only package that Rivet 4.0.0 depends on. And I see just now that [LCG_104d_ATLAS_10](https://lcginfo.cern.ch/release/104d_ATLAS_10/) misses HighFive as well. :thinking: So I may need to tweak the CMake configuration of the two affected packages a bit more, to not break the HepMC2 nightlies right away...
- Changed [External/onnxruntime](https://gitlab.cern.ch/atlas/atlasexternals/-/tree/main/External/onnxruntime?ref_type=heads) to download a pre-built binary of ONNXRuntime instead of building it itself;
* Updated `Findonnxruntime.cmake` to handle the different header layout coming with the pre-built binaries.
The ONNXRuntime change was made to avoid spending a loooong time with figuring out how to make ONNXRuntime build successfully with CUDA 12.4, cuDNN 8 and GCC 13. (It didn't do so out of the box. :frowning:) But this required the include statements for all ONNXRuntime headers to be updated. Since as it turns out, our custom build was not installing the ONNX headers quite correctly so far. :thinking:https://gitlab.cern.ch/atlas/athena/-/merge_requests/69286Fixup SiliconHitsTruthRelink2024-02-28T07:26:38+01:00John Derek ChapmanFixup SiliconHitsTruthRelinkSiHit constructor should take the updated HepMcParticleLink as an argument rather than the updated barcode for robustness.
Should not change the output currently.SiHit constructor should take the updated HepMcParticleLink as an argument rather than the updated barcode for robustness.
Should not change the output currently.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69077Multiply vertex time coordinate by speed of light in VertexBeamCondPositioner2024-02-21T11:04:21+01:00Thomas StreblerMultiply vertex time coordinate by speed of light in VertexBeamCondPositionerFollow up to !65933 and ATLSWUPGR-215
Relevant for Run 4 samples only, since Run 3 samples don't use time smearing
FYI @jedebevc @aleopold @htorre @sch @dshope @jmasikFollow up to !65933 and ATLSWUPGR-215
Relevant for Run 4 samples only, since Run 3 samples don't use time smearing
FYI @jedebevc @aleopold @htorre @sch @dshope @jmasikFrank WinklmeierFrank Winklmeierhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69055HepMcParticleLink Drop support for separate McEventCollections for pile-up truth2024-02-26T10:36:09+01:00John Derek ChapmanHepMcParticleLink Drop support for separate McEventCollections for pile-up truthThe idea of having separate McEventCollection instances for each type of pile-up used was never used in production and with the ability to decorate GenEvents directly with this information using Attributes is now completely redundant.
R...The idea of having separate McEventCollection instances for each type of pile-up used was never used in production and with the ability to decorate GenEvents directly with this information using Attributes is now completely redundant.
Removing this will simplify the HepMcParticleLink EDM. Unfortunately due to the large number of client classes then this merge request is quite large. Here is a breakdown to ease the review process:
1. The main changes are in the `Generators/GeneratorObjects` package. Removing the obsolete code and in particular revising the `ExtendedBarCode` and `HepMcParticleLink` constructor syntax.
1. The next set of changes are in `MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonSimHit/Root/xAODMuonSimHit_V1.cxx` and `InnerDetector/InDetEventCnv/InDetSimEventTPCnv/src/InDetHits/*.cxx` hard-coding variables in some persistent class objects to the only value ever used in production. (Future versions of these persistent classes will drop this variable, but that will be a separate merge request.)
1. The next set of changes are in the various TP converter test classes - avoiding checks on the variable(s) now removed from the transient HepMcParticlelink class.
1. The rest of the changes are dropping the obsolete arguments from HepMcParticleLink constructor calls.
Tagging @ewelina, @averbyts, @pclarkhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68993Remove legacy Campaigns and RunDependentSimData/Comps job options2024-02-22T10:49:24+01:00John Derek ChapmanRemove legacy Campaigns and RunDependentSimData/Comps job optionsMore clean-up of legacy job options which should now be obsolete.
Tagging @tadejMore clean-up of legacy job options which should now be obsolete.
Tagging @tadejhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68656OverlayConfiguration: Reduce python dependencies.2024-02-07T18:00:58+01:00Scott SnyderOverlayConfiguration: Reduce python dependencies.Don't load configuration code for disabled detectors.Don't load configuration code for disabled detectors.https://gitlab.cern.ch/atlas/athena/-/merge_requests/68648New DD configuration: introduced an overrider for the standard path to SQLite...2024-02-08T15:04:32+01:00Vakhtang TsulaiaNew DD configuration: introduced an overrider for the standard path to SQLite Geometry DBIntroduced a new command-line argument for job transforms `--geometrySQLiteFullPath` to override
the standard path to the SQLite Geometry Database. If this argument is used then GeoModelSvc
switches to the initialization of geometry from...Introduced a new command-line argument for job transforms `--geometrySQLiteFullPath` to override
the standard path to the SQLite Geometry Database. If this argument is used then GeoModelSvc
switches to the initialization of geometry from SQLite and takes the SQLite database path from
the override instead of trying to find the file in the standard location
CC @sroe @nstyles @tadej @jojungge @boudreauhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68398Tracking: Do not use global config flags2024-01-29T10:56:47+01:00Tadej Novaktadej.novak@cern.chTracking: Do not use global config flagsDo not use global config flags in `Tracking` tests and scripts.
/cc @ncalaceDo not use global config flags in `Tracking` tests and scripts.
/cc @ncalacehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68096Remove explicit enum support in AthConfigFlag and use type2024-01-10T18:42:06+01:00Tadej Novaktadej.novak@cern.chRemove explicit enum support in AthConfigFlag and use typeRemove explicit enum support in `AthConfigFlag` and use type.
Also fix argument parsing with the type checking.
/cc @fwinklRemove explicit enum support in `AthConfigFlag` and use type.
Also fix argument parsing with the type checking.
/cc @fwinklhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68084Update CalibrationRun Sim flag to allow the possibility of producing CaloCali...2024-01-16T15:35:07+01:00John Derek ChapmanUpdate CalibrationRun Sim flag to allow the possibility of producing CaloCalibrationHits in the ZDCPreparatory changes for !67996. This merge request updates `simFlags.CalibrationRun` and `flags.Sim.CalibrationRun` syntax to allow for the possibility of producing CaloCalibrationHits in the ZDC.
Tagging @mbandier, @schaarsc, @clantzPreparatory changes for !67996. This merge request updates `simFlags.CalibrationRun` and `flags.Sim.CalibrationRun` syntax to allow for the possibility of producing CaloCalibrationHits in the ZDC.
Tagging @mbandier, @schaarsc, @clantzhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67690Added ZDC_SimFiberHit_CollectionCnv class ATLASSIM-67512023-12-11T16:05:32+01:00Chad Stephen LantzAdded ZDC_SimFiberHit_CollectionCnv class ATLASSIM-6751Adding ZDC_SimFiberHit_CollectionCnv class originally intended for https://gitlab.cern.ch/atlas/athena/-/merge_requests/67419Adding ZDC_SimFiberHit_CollectionCnv class originally intended for https://gitlab.cern.ch/atlas/athena/-/merge_requests/67419https://gitlab.cern.ch/atlas/athena/-/merge_requests/67681Patching MC23d configuration2023-12-08T11:10:53+01:00John Derek ChapmanPatching MC23d configurationSome issues were found in the first version of the MC23d configuration in !67101.
One of which could not be worked around. Unfortunately a `23.0.32.2,Athena` build will be required.
This merge request should fix them.
NB The `MC23dSimu...Some issues were found in the first version of the MC23d configuration in !67101.
One of which could not be worked around. Unfortunately a `23.0.32.2,Athena` build will be required.
This merge request should fix them.
NB The `MC23dSimulationNoIoV`, `MC23dSimulationSingleIoV`, `MC23dSimulationMultipleIoV` and
`MC23cSimulationMultipleIoVCalibrationHits` functions were not added as the simulation step will not
be re-run for MC23d. MC23c HITS will be used.
Tagging @tadej, @ewelina, @jferrand, @jmaurer, @dta, @ahabouel, @dsouth, @zmarshal, @jcatmore, @nstyleshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67629Fixed ordering bug in the random numbers given to the GAN in FastCaloGAN2023-12-08T10:53:37+01:00Henry Day-HallFixed ordering bug in the random numbers given to the GAN in FastCaloGANIn my previous code from MR https://gitlab.cern.ch/atlas/athena/-/merge_requests/63562 there was a bug in the ordering of random inputs for the GAN.
The GAN for FastCaloGan takes 3 conditioning variables, and 50 random numbers. It can b...In my previous code from MR https://gitlab.cern.ch/atlas/athena/-/merge_requests/63562 there was a bug in the ordering of random inputs for the GAN.
The GAN for FastCaloGan takes 3 conditioning variables, and 50 random numbers. It can be stored as an ONNX file or an LWTNN file. When entering the random numbers for the ONNX file, my code was sorting the nodes alphabetically rather than numerically. This lead to the same physics (as the random numbers are all drawn from the same distribution), but gave different random fluctuations when the model was run as ONNX or LWTNN. It is equivalent to changing the random seed.
To verify conversions between ONNX and LWTNN it's best if they have the same random numbers. There is still some difference in the 8th decimal place between the output of ONNX and LWTNN, due to differences in internal precision. This is unavoidable.
Evidence of the fix;
![image](/uploads/004ab6d04c9296c7367ae6bd875e00d3/image.png)https://gitlab.cern.ch/atlas/athena/-/merge_requests/67368Fixing if-condition with simulation region for forward detectors2023-11-26T10:40:58+01:00Mustafa Andre SchmidtFixing if-condition with simulation region for forward detectorshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67026Removal of Obosolete ATLFASTII code2023-11-17T10:08:28+01:00John Derek ChapmanRemoval of Obosolete ATLFASTII codeThis MR attempts to remove code which was used by ATLFASTII (and in some cases ATLFAST), but is not used by ATLFAST3.
Will also address ATLASSIM-6133.
There may still be some dangling includes in legacy configuration, but these will be ...This MR attempts to remove code which was used by ATLFASTII (and in some cases ATLFAST), but is not used by ATLFAST3.
Will also address ATLASSIM-6133.
There may still be some dangling includes in legacy configuration, but these will be removed with the rest of the legacy configuration in the near future.https://gitlab.cern.ch/atlas/athena/-/merge_requests/66980Fix McEventColl merge tools2023-11-09T15:40:13+01:00Beojan Stanislausbeojan.stanislaus@cern.chFix McEventColl merge toolsFix the `processAllSubEvents` functions in the McEventCollection merge tools by ensuring the member variable indicating a new event is set _before_ it's read.Fix the `processAllSubEvents` functions in the McEventCollection merge tools by ensuring the member variable indicating a new event is set _before_ it's read.https://gitlab.cern.ch/atlas/athena/-/merge_requests/66930Activate use of ShadowEvents by default when running Quasi-stable particle si...2024-03-12T17:44:04+01:00John Derek ChapmanActivate use of ShadowEvents by default when running Quasi-stable particle simulationThe changes in !63059 have passed Physics Validation (ATLPHYSVAL-960), so can now be activated by default for jobs running quasi-stable particle simulation.
Needed for ATLASSIM-6908.
Tagging: @mbandier, @schaarsc, @averbyts, @pclarkThe changes in !63059 have passed Physics Validation (ATLPHYSVAL-960), so can now be activated by default for jobs running quasi-stable particle simulation.
Needed for ATLASSIM-6908.
Tagging: @mbandier, @schaarsc, @averbyts, @pclarkhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/66888Fix typo in SimConfigFlags2023-11-03T14:40:28+01:00Baptiste Ravinabaptiste.ravina@cern.chFix typo in SimConfigFlagsSimulation experts should check, but this was most likely a typo :slight_smile:Simulation experts should check, but this was most likely a typo :slight_smile: