athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-15T10:31:34+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/69834Delete a trivial wrapped getParentHadronID2024-03-15T10:31:34+01:00Andrii VerbytskyiDelete a trivial wrapped getParentHadronIDDelete a trivial wrapped getParentHadronIDDelete a trivial wrapped getParentHadronIDhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69802CosmicGenerator: delete legacy job options2024-03-15T14:21:16+01:00Frank WinklmeierCosmicGenerator: delete legacy job optionsDelete unused legacy job options.
cc @ewelina @jchapmanDelete unused legacy job options.
cc @ewelina @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69776New persistent version of LucidSimHitCollection based on GenParticle::id()2024-03-20T15:55:08+01:00John Derek ChapmanNew persistent version of LucidSimHitCollection based on GenParticle::id()Following !67602 - add new persistent version of `LucidSimHitCollection` based on `GenParticle::id()`.Following !67602 - add new persistent version of `LucidSimHitCollection` based on `GenParticle::id()`.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69741Move the Info class outside of the IMCTruthClassifier class2024-03-15T16:36:07+01:00Andrii VerbytskyiMove the Info class outside of the IMCTruthClassifier classMove the Info class outside of the `IMCTruthClassifier` class.
With this change it becomes very straightforward to inherit from the `Info` class.Move the Info class outside of the `IMCTruthClassifier` class.
With this change it becomes very straightforward to inherit from the `Info` class.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69737HepMC::uniqueID should return id rather than barcode for HepMC3.2024-03-14T10:46:56+01:00John Derek ChapmanHepMC::uniqueID should return id rather than barcode for HepMC3.Preparing the ground for !67602 in cases where a barcode is being used as a unique ID for a truth particle only then it should be possible to use the id value interchangeably as this is also unique for each truth particle within a genera...Preparing the ground for !67602 in cases where a barcode is being used as a unique ID for a truth particle only then it should be possible to use the id value interchangeably as this is also unique for each truth particle within a generated/simulated event. (Pile-up truth requires the truth event number in additions to uniquely link to a particle.)
Adding placeholder `id()` methods for `xAOD::TruthParticle` and `HepMcParticleLink` which for now just return the result of `barcode()`.
!67602 will update this to be the `GenParticle::id()` for `HepMcParticleLink` and eventually !67195 will do this for `xAOD::Truth`.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69733Removed trivial unused wrappers for the MCTruthClassifier::defOrigOfParticle2024-03-19T17:43:02+01:00Andrii VerbytskyiRemoved trivial unused wrappers for the MCTruthClassifier::defOrigOfParticleRemoved trivial unused wrappers for the MCTruthClassifier::defOrigOfParticle
@pclark @jchapmanRemoved trivial unused wrappers for the MCTruthClassifier::defOrigOfParticle
@pclark @jchapmanhttps://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/69709Draft: Generators: Support for Rivet42024-03-11T22:49:24+01:00Christian GutschowDraft: Generators: Support for Rivet4FYI @akraszna, this doesn't necessarily to get merged but perhaps it's useful. Untested, but should hopefully cover `Rivet_i` at least.
cf ATLINFR-5281
cc @ewelina @elmsheus @jchapmanFYI @akraszna, this doesn't necessarily to get merged but perhaps it's useful. Untested, but should hopefully cover `Rivet_i` at least.
cf ATLINFR-5281
cc @ewelina @elmsheus @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/696922024-03-11: merge of 24.0 into main2024-03-12T17:43:15+01:00Walter Lampl2024-03-11: merge of 24.0 into mainThis sweep contains the following MRs:
* !69651 Cleanup TP converter unit test processing script and do not fall-back on AFS ~Database
* !69625 Clean up InDetJiveXML legacy configs ~InnerDetector
* !69627 Clean up legacy InDetRecTools...This sweep contains the following MRs:
* !69651 Cleanup TP converter unit test processing script and do not fall-back on AFS ~Database
* !69625 Clean up InDetJiveXML legacy configs ~InnerDetector
* !69627 Clean up legacy InDetRecTools configs ~InnerDetector
* !69626 Clean up legacy SCT_Monitoring configs ~DQ, ~InnerDetector
* !69577 Fix SCT calibration loop transform for running with hist input files ~InnerDetector
* !69629 Clean up legacy InDetSecVertexValidation config ~InnerDetector
* !69628 Clean up legacy TRT_TR_Process config ~InnerDetector, ~Simulation
* !69636 Clean up legacy TrkTrackSummaryTool configs ~Tracking
* !69631 Clean up legacy configs for TrkDetDescr ~Tracking
* !69630 Clean up legacy TrkConditions configs ~Tracking
* !69653 SCT_RawDataByteStreamCnv: Use input file from CVMFS ~InnerDetector
* !69624 Clean up legacy configs in InDetDetDescr GeoModel ~InnerDetector
* !69635 Clean up legacy TrkExUnitTests config ~Tracking
* !69637 Delete legacy RecJobTransforms configs ~JetEtmiss, ~Reconstruction
* !69640 Restore CA RDOtoRDOTrigger:False for q443 tests ~JetEtmiss, ~MuonSpectrometer, ~Reconstruction, ~Tools
* !69634 Delete TrkExExample ~Tracking
* !69648 Tile monitoring: Use default geometry tags ~DQ, ~Tile
* !69642 Updates for TauCP PHYSVAL monitoring ~Analysis, ~Tau
* !69615 Remove HLTbphys references for physics_BphysDelayed stream ~DQ
* !69607 Move RngComps.RandomServices module to RngComps.RngCompsConfig ~Core, ~Digitization, ~ForwardDetectors, ~Generators, ~HGTD, ~ITk, ~InnerDetector, ~LAr, ~MuonSpectrometer, ~Overlay, ~Simulation, ~Tile, ~Upgradehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69691Update SUSY_SimplifiedModel_PreInclude.py2024-03-12T13:54:55+01:00Javier Montejo BerlingenUpdate SUSY_SimplifiedModel_PreInclude.pyWrite mixing directly to param_blocks instead of returning a copy, which will anyway be used to update param_blocks.
Add some logging.
The changes are aiming for 23.6.X release, let me know if this is not the right branch to targetWrite mixing directly to param_blocks instead of returning a copy, which will anyway be used to update param_blocks.
Add some logging.
The changes are aiming for 23.6.X release, let me know if this is not the right branch to targethttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69655barcode -> ID migration for HGTD/InDet/MuonDigitization.2024-03-27T14:14:49+01:00John Derek Chapmanbarcode -> ID migration for HGTD/InDet/MuonDigitization.Migrate HGTD_Digitization, InDetDigitization and MuonDigitization code to use `GenParticle::id` rather than barcodes internally.
(Should not change Digitization output.)
See ATLASSIM-6978Migrate HGTD_Digitization, InDetDigitization and MuonDigitization code to use `GenParticle::id` rather than barcodes internally.
(Should not change Digitization output.)
See ATLASSIM-6978https://gitlab.cern.ch/atlas/athena/-/merge_requests/696182024-03-07: merge of 24.0 into main2024-03-08T06:56:59+01:00Vakhtang Tsulaia2024-03-07: merge of 24.0 into mainTwo conflicts on this one:
* `InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/python/TRTCalibrationMgrConfig.py`
The conflict was generated by !69487 in ~main (author @tstreble) and !69561 in ~"24.0" (author @serodrig). I had to manually res...Two conflicts on this one:
* `InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/python/TRTCalibrationMgrConfig.py`
The conflict was generated by !69487 in ~main (author @tstreble) and !69561 in ~"24.0" (author @serodrig). I had to manually resolve the conflict. Please have a look at it and let me know if the resolution looks OK to you. Thanks.
* `Tools/WorkflowTestRunner/python/References.py`
A new test `af3_PHYS_Run3` has been introduced in ~"24.0". Also, !69490 in the ~main required updating of ref files for all derivation tests. Finally, as per @dguest [message](https://gitlab.cern.ch/atlas/athena/-/merge_requests/69490#note_7700454), the changes from !69490 are going to be back-ported to ~"24.0" which opens up a possibility for conflicts in future sweeps into the ~main. CC again @wlampl and @tadej
This sweep contains the following MRs:
* !69594 RegionSelector: delete legacy configuration methods ~Geometry, ~Trigger
* !69576 Fix zero eTau rates when using eTau BDT algorithm ~L1Calo, ~Tau, ~Trigger, ~changes-trigger-counts
* !68406 HLTResultByteStreamCnv: Destroy the incoming address if exists and recreate ~Trigger
* !69453 ID trigger: simplify and decouple ID and ITk sequence code ~Egamma, ~ITk, ~Trigger, ~TriggerID, ~TriggerMenu, ~TriggerMinBias
* !68986 Run test_mc21_13p6TeV_hi_withtrigger in 24.0 ~Reconstruction
* !69590 RngComps: delete legacy config and test cleanup ~Core
* !69502 Update DAOD CI tests ~Derivation, ~Test, ~Tools
* !69556 Simulation: Remove more legacy configuration modules ~Digitization, ~JetEtmiss, ~Overlay, ~Simulation
* !69565 IOVDbSvc.CondDB: remove usage of RecFlags ~Database
* !69579 AthenaServices: cleanup legacy job options and unused tests ~Core
* !69564 CutFlowHelpers: remove usage of RecFlags ~EDM
* !69558 Clean-up/Migration of commented out legacy configuration in Simulation packages ~Simulation
* !69549 RecJobTransforms+PATJobTransforms: delete unused DPDUtils ~Analysis, ~Reconstruction
* !69568 MagFieldServices: migrate CondAlg unit test to CA ~Magnets
* !69533 Delete legacy TTVA configs ~Analysis, ~BTagging, ~InnerDetector, ~JetEtmiss, ~Reconstruction
* !69548 Remove legacy simulation configs ~ACTS, ~ForwardDetectors, ~Generators, ~ITk, ~InnerDetector, ~MuonSpectrometer, ~Simulation, ~Tracking
* !69570 Clean up legacy DataQualityTools configs ~DQ, ~JetEtmiss
* !69545 Slim references for ATLASDQ-1133 ~DQ
* !69516 Projects: Update the LCG layer and Externals version in the 24.0 branch ~Build
* !69561 TRT - Remove share scripts and using GlobalChi2Fitter ~InnerDetector
* !69519 Fix the code in TrfUtils.py to correspond to the PyYAML 5.1+ requirements ~InnerDetector
* !69504 DataQualityConfigurations: disable han-config-gen in dbg build ~DQ
* !69498 Exclude items without root streamers. ~InnerDetector
* !69539 Delete legacy InDetPerfMonitoring config ~DQ, ~InnerDetector
* !69538 Delete reference to legacy config in InDetPRDToxAOD ~InnerDetector
* !69535 Delete legacy AthenaMonitoring configs ~Core, ~DQ
* !69534 Delete legacy InDetRecStatistics configs ~InnerDetector
* !69532 Delete PixelToTPIDTool legacy config ~InnerDetector
* !69578 Removing a bunch of legacy config, and scripts that rely on it #2 ~DQ, ~Digitization, ~MuonSpectrometer
* !69531 Delete legacy TRTMonitoringRun3 configs ~DQ, ~InnerDetector
* !69562 Removing a bunch of legacy config, and scripts that rely on it ~DQ, ~MuonSpectrometer
* !69529 Delete legacy InDetDiMuonMonitoring config ~DQ, ~InnerDetector
* !69499 PyUtils: remove use of RecFlags in MetaReaderPeeker ~Tools
* !69587 DQ sqlalchemy fixes backport (APR-130) ~DQ
* !69492 xAODTruthCnv: delete legacy job options ~EDM
* !69496 AODFix+RecoFix: delete obsolete legacy packages ~Reconstruction
* !69495 Update FTAG derivation ART branch ~BTagging, ~Derivation
* !69493 DigitizationTests ART: Fix repeated output file names between tests ~Digitization, ~Simulation
* !69571 Requesting athena MT resources (memory 16GB) for test_q445_serial.sh ~Tools
* !69378 MuonReadoutGeometry - Streamline the caching flags & fix B-Lines ~MuonSpectrometer, ~Run2-DataReco-output-changed, ~Run3-DataReco-output-changed, ~Tools, ~Upgrade, ~frozen-tier0-violatinghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69607Move RngComps.RandomServices module to RngComps.RngCompsConfig2024-03-11T11:03:22+01:00John Derek ChapmanMove RngComps.RandomServices module to RngComps.RngCompsConfigMinor change, standardising module name.Minor change, standardising module name.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69581Andrej Saibel corrections to SFGen Athena interface2024-03-13T15:26:16+01:00Lorenzo Primomo164021@spes.uniud.itAndrej Saibel corrections to SFGen Athena interfaceThis is the merge request for the SFGen interface with some small correction suggested by @asaibel. Tagging @gpanizzo and @ewelina .
FIX AGENE-2074This is the merge request for the SFGen interface with some small correction suggested by @asaibel. Tagging @gpanizzo and @ewelina .
FIX AGENE-2074https://gitlab.cern.ch/atlas/athena/-/merge_requests/69548Remove legacy simulation configs2024-03-07T20:51:16+01:00Frank WinklmeierRemove legacy simulation configsRemove the legacy simulation configs.
cc @jchapmanRemove the legacy simulation configs.
cc @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69542Rivet_i: docs update2024-03-06T18:31:01+01:00Christian GutschowRivet_i: docs updateDocument latest available versions.Document latest available versions.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69541Sherpa_i: patch tarCreator when running in containers2024-03-06T18:33:05+01:00Christian GutschowSherpa_i: patch tarCreator when running in containersLooks like `bc` is no longer available in the singularity images :neutral_face:
cc @ewelina @fsiegert @yharrisLooks like `bc` is no longer available in the singularity images :neutral_face:
cc @ewelina @fsiegert @yharrishttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69536Update HepMcParticleLink interface and clients without changing behaviour2024-03-18T09:09:00+01:00John Derek ChapmanUpdate HepMcParticleLink interface and clients without changing behaviour!67602 adapts HepMcParticleLink to use `GenParticle::id()` internally rather than the old GenParticle barcodes from HEPMC2.
In some cases (particularly in the case of quasi-stable particle simulation), then the ordering of particles by b...!67602 adapts HepMcParticleLink to use `GenParticle::id()` internally rather than the old GenParticle barcodes from HEPMC2.
In some cases (particularly in the case of quasi-stable particle simulation), then the ordering of particles by barcode does not
always match the ordering of particles by id. This results in some containers which are ordered by `HepMcParticleLink` being slightly different after the change (same information different order). This merge request updates the HepMcParticleLink interface without updating the internals, allowing the clients to be updated without the output changing. A smaller output-changing merge request can then be made afterwards.
See ATLASSIM-6999.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69528fix the format of HepMC version printout2024-03-06T18:33:34+01:00Ewelina Maria Lobodzinskafix the format of HepMC version printoutfix the format of HepMC version printoutfix the format of HepMC version printouthttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69517MadGraphControl: fix recently introduced issue with upper case dicts2024-03-06T18:38:13+01:00Hannes MildnerMadGraphControl: fix recently introduced issue with upper case dictsHere the idea was to create a dict of dicts entirely with upper-case keys.
However, we did just copy the (potentially lower case) subdicts, so that they can contain both old and upper-case key along each other.
This is fixed now, we star...Here the idea was to create a dict of dicts entirely with upper-case keys.
However, we did just copy the (potentially lower case) subdicts, so that they can contain both old and upper-case key along each other.
This is fixed now, we start from an empty dict.