athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-22T08:46:02+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/700262024-03-21: merge of 24.0 into main2024-03-22T08:46:02+01:00Frank Winklmeier2024-03-21: merge of 24.0 into mainThis sweep contains the following MRs:
* !70032 fix for ATR-29037 - No such flag: minTRTonTrk ~Trigger, ~TriggerID
* !70018 Fix issue with incomplete hashing in HLT Nav conversion ~Trigger
* !70014 AthenaPython: delete copy_file and ...This sweep contains the following MRs:
* !70032 fix for ATR-29037 - No such flag: minTRTonTrk ~Trigger, ~TriggerID
* !70018 Fix issue with incomplete hashing in HLT Nav conversion ~Trigger
* !70014 AthenaPython: delete copy_file and read_file utilities ~Core
* !69991 LArCafJobs: delete legacy config referencing RecExConfig ~LAr
* !69714 MuonConfig: drop RPC cabling map override ~MuonSpectrometer, ~Run3-MCReco-output-changed, ~Tools
* !70015 TrigPSC+TrigServices: set ConcurrencyFlags::numProcs ~Core, ~Trigger
* !69969 ID trigger: dynamic creation of flags ~Trigger, ~TriggerID
* !70001 L1calo efex tau bdt add max and min thresholds ~L1Calo, ~Trigger
* !69992 Remove HLT_e5_lhvloose_bBeeM6000_L1BKeePrimary from T0 monitoring ~Trigger, ~TriggerMenu
* !69865 More fixes for !68913: hasFlag and iterators ~Core
* !69996 Fixes for wrong stream assignment VBFDelayed -> PhysicsStream ~Trigger, ~TriggerMenu
* !69833 AFP ToF monitoring new hist + bugfix ~DQ, ~ForwardDetectors
* !69984 Fix physval memory leak, ATLASDQ-1136 ~DQ
* !69988 TBDetDescrAlg: delete legacy config and cleanup ~TestBeam
* !69987 ForwardTransport[Svc]: delete legacy configuration ~ForwardDetectors
* !69958 Adding versioning in ZDC calibration files via parameter for TDirectory name ~ForwardDetectors
* !69796 fixes some details of the task, container names and updates file to be used. ~DQ, ~LAr
* !69945 Prevent ONNX from spawning additional threads ~Simulation
* !69930 ZDC CA synchronized with Tier0 version ~ForwardDetectors
* !69886 StoreGate: add SG::HiveMgrSvc::setNumProcs helper ~Core
* !68579 AFT-702: Add heterogeneous input support for GN2 ~Analysis, ~BTagging, ~JetEtmiss
* !69899 Fix LAr CAF jobs ~LAr
* !69857 CA-based script to populate the LAr Bad Feb database ~LAr
* !69981 AFP_GeoModel+Digitization: delete legacy job options ~Digitization, ~ForwardDetectors
* !69949 Protect possible rare FPEs in trigger ~Tracking
* !69963 gFEX pileup threshold update ~EDM, ~JetEtmiss, ~L1Calo, ~Trigger
* !69917 ZdcRec: delete legacy configuration ~ForwardDetectors
* !69967 NTUPtoNTUPCore: delete unused package ~Analysis
* !69971 ForwardRec: delete legacy job options ~ForwardDetectors
* !69966 LArL1Sim: delete legacy job options ~LAr
* !69959 Remove custom JetSuper Roi zedHalfWidth ~JetEtmiss, ~Trigger, ~TriggerID
* !69970 Disable ONNXRuntime CUDA Support, 24.0 branch (2024.03.20.) ~Build
* !69939 ATR-28870: add hh4b GN2 80% chain to physics ~Trigger, ~TriggerMenu, ~changes-trigger-countshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70021Fix SiHitCollectionCnv unit tests2024-03-22T09:41:47+01:00John Derek ChapmanFix SiHitCollectionCnv unit testsFix the SiHitCollectionCnv unit tests to create multiple hits per particle as this is a better test of the compression
algorithm used in the TP conversion.
Also improve comments in the TRT_HitCollectionCnv unit tests.Fix the SiHitCollectionCnv unit tests to create multiple hits per particle as this is a better test of the compression
algorithm used in the TP conversion.
Also improve comments in the TRT_HitCollectionCnv unit tests.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70016Revise McEventCollectionFilter to be id based (ATLASSIM-6999)2024-03-22T09:41:55+01:00John Derek ChapmanRevise McEventCollectionFilter to be id based (ATLASSIM-6999)Common logic used for the creation of the updated `HepMcParticleLink`instances is moved to a new `updatedLink(...)` method in the `HitsTruthRelinkBase` base class. This has to be overriden for the TRT, but it makes the code look cleaner....Common logic used for the creation of the updated `HepMcParticleLink`instances is moved to a new `updatedLink(...)` method in the `HitsTruthRelinkBase` base class. This has to be overriden for the TRT, but it makes the code look cleaner.
Added a new `HitsTruthRelinkBase::getReferenceId(...)` method to return the id value of the new `GenParticle` to be linked to. The `HitsTruthRelinkBase::getReferenceBarcode(...)` method will be removed in a future merge request.
The logic in the new `updatedLink(...)` methods is updated to be based on `GenParticle::id()` rather than barcodes, with the corner case that we have to leave one check on the barcode value from the old `HepMcParticleLink` in place to cope with HITS files read in using barcode-based persistent EDMs. This will be removed in the future.
See ATLASSIM-6999https://gitlab.cern.ch/atlas/athena/-/merge_requests/70010ZdcConditions+InDetSimEvent: Fix cppcheck warnings.2024-03-21T11:39:51+01:00Scott SnyderZdcConditions+InDetSimEvent: Fix cppcheck warnings.Pass strings by const reference, not by value.Pass strings by const reference, not by value.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70007ISF_FastCaloSimEvent: cmake fix2024-03-22T09:41:00+01:00Scott SnyderISF_FastCaloSimEvent: cmake fixFix regexp syntax in LOG_IGNORE_PATTERN.Fix regexp syntax in LOG_IGNORE_PATTERN.https://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/69995Update EntryLayerFilter.h to remove unused include2024-03-21T09:43:07+01:00Andrii VerbytskyiUpdate EntryLayerFilter.h to remove unused includeUpdate EntryLayerFilter.h to remove unused includeUpdate EntryLayerFilter.h to remove unused includehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69989Remove the GenericBarcodeFilter2024-03-21T14:22:45+01:00Andrii VerbytskyiRemove the GenericBarcodeFilterRemove the GenericBarcodeFilter as it is not used anywhere. Part of the migration away from barcode usage. See ATLASSIM-6906.
@jchapman @pclarkRemove the GenericBarcodeFilter as it is not used anywhere. Part of the migration away from barcode usage. See ATLASSIM-6906.
@jchapman @pclarkhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69979Fix cppcheck warnings: iterateByValue2024-03-20T18:11:51+01:00Andrii VerbytskyiFix cppcheck warnings: iterateByValueFix cppcheck warnings: iterateByValue
@sroeFix cppcheck warnings: iterateByValue
@sroehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69973GeoModelSQLite - Swtich ART test to run with 1 thread2024-03-20T15:26:45+01:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chGeoModelSQLite - Swtich ART test to run with 1 threadTagging: @boudreau, @mbandier, @tsulaiaTagging: @boudreau, @mbandier, @tsulaiahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69954Draft: Improvements to HepMcParticleLink and extension of unit tests for SiHi...2024-03-22T19:14:55+01:00John Derek ChapmanDraft: Improvements to HepMcParticleLink and extension of unit tests for SiHitCollectionCnv.Further robustness improvements for `HepMcParticleLink` in the case that position-based constructors are used and
constructors using the event number=0 workaround. (Fixes unit test failures in the dbg build.)
Updated `HepMcParticleLink_...Further robustness improvements for `HepMcParticleLink` in the case that position-based constructors are used and
constructors using the event number=0 workaround. (Fixes unit test failures in the dbg build.)
Updated `HepMcParticleLink_test` to test the `==` operator for a HepMcParticleLink instances created with wider set of possible constructor arguments.
Updated `SiHitCollectionCnv_pX_test` unit tests to check the behaviour with SiHits using barcode/id = 0 (typically delta-rays). This has implications for HITS file compression if it doesn't work properly, so is worth testing.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69945Prevent ONNX from spawning additional threads2024-03-26T08:53:26+01:00Joshua Falco Beirerjoshua.beirer@cern.chPrevent ONNX from spawning additional threadsPrevent ONNX from spawning additional threads in the FastCaloSim implementation.
Should fix ATLASSIM-7146 (and potentially ATLASSIM-7031 ?)
fyi @zhangr @jchapmanPrevent ONNX from spawning additional threads in the FastCaloSim implementation.
Should fix ATLASSIM-7146 (and potentially ATLASSIM-7031 ?)
fyi @zhangr @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69910MuonReadoutGeometryR4 - Return the global -> local as copy instead of returni...2024-03-19T17:41:55+01:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chMuonReadoutGeometryR4 - Return the global -> local as copy instead of returning by referenceglobal -> local transformations do not need to be returned by reference. They can be quickly calculated on-the fly by inverting the local-> global transformations... Reduce the memory footprint of the muon readout geometry by 50MBs
```
B...global -> local transformations do not need to be returned by reference. They can be quickly calculated on-the fly by inverting the local-> global transformations... Reduce the memory footprint of the muon readout geometry by 50MBs
```
Building of GeoModelSvc.MuonDetectorToolR4.MdtReadoutGeomTool consumed 201 MB memory
Building of GeoModelSvc.MuonDetectorToolR4.RpcReadoutGeomTool consumed 8 MB memory
Building of GeoModelSvc.MuonDetectorToolR4.TgcReadoutGeomTool consumed 7 MB memory
Building of GeoModelSvc.MuonDetectorToolR4.sTgcReadoutGeomTool consumed 1 MB memory
Building of GeoModelSvc.MuonDetectorToolR4.MmReadoutGeomTool consumed 1 MB memory
Building of GeoModelSvc.MuonDetectorToolR4.MuonChamberAssembleTool consumed 0 MB memory
```
After:
```
Building of GeoModelSvc.MuonDetectorToolR4.MdtReadoutGeomTool consumed 147 MB memory
Building of GeoModelSvc.MuonDetectorToolR4.RpcReadoutGeomTool consumed 7 MB memory
Building of GeoModelSvc.MuonDetectorToolR4.TgcReadoutGeomTool consumed 6 MB memory
Building of GeoModelSvc.MuonDetectorToolR4.sTgcReadoutGeomTool consumed 1 MB memory
Building of GeoModelSvc.MuonDetectorToolR4.MmReadoutGeomTool consumed 0 MB memory
Building of GeoModelSvc.MuonDetectorToolR4.MuonChamberAssembleTool consumed 0 MB memory
```
Tagging: @asalzbur, @pagessin, @damperiahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69885Update interfaces of InDetSimEvent, MuonSimEvent and G4AncillarySimEvent tran...2024-03-18T12:14:01+01:00John Derek ChapmanUpdate interfaces of InDetSimEvent, MuonSimEvent and G4AncillarySimEvent transient EDM classesThis merge request updates the interfaces of the InDetSimEvent, MuonSimEvent and G4AncillarySimEvent transient EDM classes to prepare for migration of client classes to be based on `GenParticle::id()` rather than `barcodes`.
- Rename `tr...This merge request updates the interfaces of the InDetSimEvent, MuonSimEvent and G4AncillarySimEvent transient EDM classes to prepare for migration of client classes to be based on `GenParticle::id()` rather than `barcodes`.
- Rename `trackNumber()` method to `truthBarcode()` for InDetSimEvent and MuonSimEvent transient EDM classes
- Rename `TRTUncompressedHit::GetTrackID()` method to `TRTUncompressedHit::truthBarcode()`.
- Add `truthID()` method to return `GenParticle::id()` to InDetSimEvent, MuonSimEvent and G4AncillarySimEvent transient EDM classes
See ATLASSIM-6978https://gitlab.cern.ch/atlas/athena/-/merge_requests/69878Changed ZDC module placement to allow for the RPD foot2024-03-18T10:16:13+01:00Chad Stephen LantzChanged ZDC module placement to allow for the RPD footMoved module placement to within each module to give the RPD information about the mother volume so the RPD foot could extend to the bottom of the volume.Moved module placement to within each module to give the RPD information about the mother volume so the RPD foot could extend to the bottom of the volume.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69853Clear up warnings about missing containers in simulation jobs2024-03-15T16:51:03+01:00John Derek ChapmanClear up warnings about missing containers in simulation jobsThis should fix warnings of the following type in the simulation output:
```
INFO OutputStreamHITS.OutputStreamHITS_TopFolder 3 2 WARNING add: can not find type [JetCollection] in clid db
INFO OutputStreamHITS....This should fix warnings of the following type in the simulation output:
```
INFO OutputStreamHITS.OutputStreamHITS_TopFolder 3 2 WARNING add: can not find type [JetCollection] in clid db
INFO OutputStreamHITS.OutputStreamHITS_TopFolder 3 2 WARNING add: can not find type [xAOD::JetContainer] in clid db
```
when the containers are not present.https://gitlab.cern.ch/atlas/athena/-/merge_requests/698512024-03-15: merge of 24.0 into main2024-03-15T17:30:03+01:00Walter Lampl2024-03-15: merge of 24.0 into mainThis sweep contains the following MRs:
* !69816 InDetAlignmentMonitoringRun3: avoid multiple filling of histograms that occurs when a variable is used many times ~DQ, ~InnerDetector
* !69678 LAr calib. data processing fixes ~LAr
* !69...This sweep contains the following MRs:
* !69816 InDetAlignmentMonitoringRun3: avoid multiple filling of histograms that occurs when a variable is used many times ~DQ, ~InnerDetector
* !69678 LAr calib. data processing fixes ~LAr
* !69819 Adding correct tests for 2D histograms ~DQ
* !69840 Bypass TImage::FromPad due to ROOT 6.28 bug ~DQ
* !69677 Fixing SinglFloat upload ~LAr
* !69616 Simplifying DumpGeo, merging GeoExporter into DumpGeo, removing legacy configuration ~Geometry
* !69799 Remove various obsolete ISF job property modules + clean up legacy config references in comments ~Simulation
* !69763 Add more tests for AthConfigFlag hashing, fix bug from !68913 ~Core
* !69807 HIGlobal: delete legacy flags and utilities ~Reconstruction
* !69808 RecJobTransforms: delete unused legacy RDOFilePeeker ~Reconstruction
* !69802 CosmicGenerator: delete legacy job options ~Generators
* !69801 AthenaCommon: delete CfgGetter ~Core, ~DQ, ~MuonSpectrometer, ~Simulation
* !69798 Update MergeConfigs.py - new feature to select specific folders for config... ~DQ
* !69773 athena: remove --no-display and --minimal command line option (legacy) ~Core
* !69777 Switch LUCID_SensitiveDetector to use TrackHelper and fix bug in LUCID_SimHit constructor arguments ~ForwardDetectors, ~Simulation
* !69778 delete old-style cfg of Calo-BCID and LArNoise AC cond algs ~Calorimeter, ~LAr
* !69783 enable bjet chains in the run4 menu ~BTagging, ~ITk, ~Trigger, ~TriggerMenu
* !69814 TrigT1CaloSim: remove legacy config ~Trigger
* !69797 Replace InputFilePeeker with direct flag access ~Trigger
* !69806 TrigEFMissingET: delete legacy JO and cleanup link dependencies ~Trigger
* !69805 update of lowMu menu for Ph1 migration ~Trigger, ~TriggerMenu
* !69803 TrigAnalysisTest: delete unused ART test ~Trigger
* !69779 add LArSaturation as not checked TOB in L1DataConsistencyChecker (ATR-28958) ~Trigger
* !69715 Remove regtest.pl and regtest.py from TrigValTools ~Trigger
* !69610 Defferr sequences creation in HLT menu generation step ~Trigger, ~TriggerMenu
* !67310 Implementing Fast calo Energy Calibration for Electron Chains ~Egamma, ~Trigger, ~TriggerMenuhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69801AthenaCommon: delete CfgGetter2024-03-15T14:21:16+01:00Frank WinklmeierAthenaCommon: delete CfgGetterDelete the legacy `CfgGetter` and associated factory which has only few
remaining (unused) references in the repository. Note that `CfgMgr`
(which is still heavily used) is not affected by this change.
Also fix/remove a few comments ref...Delete the legacy `CfgGetter` and associated factory which has only few
remaining (unused) references in the repository. Note that `CfgMgr`
(which is still heavily used) is not affected by this change.
Also fix/remove a few comments referencing this class.
cc @wlamplhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69799Remove various obsolete ISF job property modules + clean up legacy config ref...2024-03-15T14:21:16+01:00John Derek ChapmanRemove various obsolete ISF job property modules + clean up legacy config references in commentsThis merge request drops a number of obsolete legacy job property modules:
```
Simulation/ISF/ISF_Config/python/ISF_jobProperties.py
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/python/ISF_NativeFastCaloSimJobProperties....This merge request drops a number of obsolete legacy job property modules:
```
Simulation/ISF/ISF_Config/python/ISF_jobProperties.py
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/python/ISF_NativeFastCaloSimJobProperties.py
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimJobProperties.py
Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/FatrasPhysicsList.py
Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/FatrasTuning.py
Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/FatrasValidation.py
Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasJobProperties.py
```
Plus clears up a few more references to legacy configuration in comments.https://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.