athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-29T14:11:29+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/702072024-03-29: merge of 24.0 into main2024-03-29T14:11:29+01:00Edward Moyse2024-03-29: merge of 24.0 into mainThis sweep contains the following MRs:
* !70123 Read jFEX calibration values from the database in MC ~L1Calo, ~Run3-MCReco-output-changed, ~Tools, ~Trigger
* !70200 Update L1CaloFEXSimCfg.py - enable heuristic eTAU when running DQ envi...This sweep contains the following MRs:
* !70123 Read jFEX calibration values from the database in MC ~L1Calo, ~Run3-MCReco-output-changed, ~Tools, ~Trigger
* !70200 Update L1CaloFEXSimCfg.py - enable heuristic eTAU when running DQ environment... ~L1Calo, ~Trigger
* !70193 Fix timing monitoring histograms for ITk TrigInDetValidation ART tests (EFTRACK-463) ~ITk, ~Trigger, ~TriggerID
* !70192 HltAsyncEventLoopMgr: backport fixes from HltEventLoopMgr ~Trigger
* !70196 Valkyrie: delete legacy job options and executable ~Core
* !70111 CaloMonitoring: delete legacy job options and ROOT macros ~Calorimeter, ~DQ, ~Trigger
* !68758 MuonTrackingGeometry fix memory bugs ~LAr, ~MuonSpectrometer, ~Run2-DataReco-output-changed, ~Run2-MCReco-output-changed, ~Run3-DataReco-output-changed, ~Run3-MCReco-output-changed, ~Simulation, ~Tile, ~Tools, ~Tracking, ~frozen-tier0-violating
* !70159 TileTBRec: Remove legacy JO configurations (ATLASRECTS-7939) ~Tile
* !70167 TileMonitoring: Remove old Tile monitoring tools for physics events ~DQ, ~JetEtmiss, ~Tile
* !70157 TileCosmicAlgs: Remove legacy JO configurations (ATLASRECTS-7939) ~Tile, ~Trigger
* !70173 TriggerJobOpts: move HepMcParticleLink silencing to runHLTCfg ~Trigger
* !70166 TrigHLTJetHypo - on request of the menu decelopers, make Tool names unique within a chain only ~JetEtmiss, ~Trigger, ~TriggerJet
* !70165 Update Enhanced Bias menu for 2024 ~Trigger, ~TriggerMenu
* !70162 Remove info messages from UTT hypos and L2LayerNumberTool ~Trigger, ~TriggerIDhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70204Draft: sTgcReadoutElement - Fixing wireGroup Positions2024-03-28T21:09:21+01:00Ishan Kiritbhai VyasDraft: sTgcReadoutElement - Fixing wireGroup Positions- Changing localChannelPosition function in the readout element to replicate the R3 wireGroup positions.
- Fixing the beam line radius
@alainb @jojungge @pscholer- Changing localChannelPosition function in the readout element to replicate the R3 wireGroup positions.
- Fixing the beam line radius
@alainb @jojungge @pscholerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70164Add CA-based configuration for the FastIDKiller2024-03-28T16:41:23+01:00John Derek ChapmanAdd CA-based configuration for the FastIDKillerInitial version of FastIDKiller configuration - can be expanded as required.
Needed for egamma studies.Initial version of FastIDKiller configuration - can be expanded as required.
Needed for egamma studies.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70146Draft: Improve consistency of InDetSimEventTPCnv behaviour.2024-03-27T09:46:05+01:00John Derek ChapmanDraft: Improve consistency of InDetSimEventTPCnv behaviour.In recent updates to HepMcParticleLink, it was observed that the behaviour of `TRT_HitCollectionCnv_p4` and `SiHitCollectionCnv_p3`
differed from the behaviour of TP converter classes using `HepMcParticleLinkCnv_p2` directly.
This merge...In recent updates to HepMcParticleLink, it was observed that the behaviour of `TRT_HitCollectionCnv_p4` and `SiHitCollectionCnv_p3`
differed from the behaviour of TP converter classes using `HepMcParticleLinkCnv_p2` directly.
This merge request attempts to make the behaviour of `SiHitCollectionCnv_p3/4`and `TRT_HitCollectionCnv_p4/5`
consistent with `HepMcParticleLinkCnv_p2/3`.
Relates to ATLASSIM-6999.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70137[ATR-29000] Enable supercell output for Run 4 MC-MC overlay2024-03-27T10:52:15+01:00Tim Martin[ATR-29000] Enable supercell output for Run 4 MC-MC overlayFollows on from !68314
Applies the same change (`== Run 3` -> `>= Run 3`) also to the Overlay workflow.
cc @damazio, @pavolFollows on from !68314
Applies the same change (`== Run 3` -> `>= Run 3`) also to the Overlay workflow.
cc @damazio, @pavolhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70106Draft: ActsGeometryContext - Non const access2024-03-29T15:19:43+01:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chDraft: ActsGeometryContext - Non const accesshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70056Draft: Extend unit tests for HepMcParticleLink and SiHitCollectionCnv_pX.2024-03-25T18:35:35+01:00John Derek ChapmanDraft: Extend unit tests for HepMcParticleLink and SiHitCollectionCnv_pX.https://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/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/69592Draft: Removal of H6 TB simu2024-03-08T08:59:33+01:00Pavol StrizenecDraft: Removal of H6 TB simuThis should remove H6 TB simulations, as agreed on https://its.cern.ch/jira/browse/ATLASSIM-7104This should remove H6 TB simulations, as agreed on https://its.cern.ch/jira/browse/ATLASSIM-7104https://gitlab.cern.ch/atlas/athena/-/merge_requests/69229Updating LAr EM NTuple creation to CA based configuration2024-03-28T18:07:37+01:00Mustafa Andre SchmidtUpdating LAr EM NTuple creation to CA based configurationUpdating configuration file and README file to switch NTuple creation from legacy to CA-based configuration.Updating configuration file and README file to switch NTuple creation from legacy to CA-based configuration.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69203Draft: HepMcParticleLink: Testing the adaption to GenParticle::id2024-02-29T14:08:28+01:00John Derek ChapmanDraft: HepMcParticleLink: Testing the adaption to GenParticle::idFollows !69076Follows !69076https://gitlab.cern.ch/atlas/athena/-/merge_requests/69076Draft: HepMcParticleLink: Flag whether link points to suppressed pile-up truth2024-02-23T17:38:05+01:00John Derek ChapmanDraft: HepMcParticleLink: Flag whether link points to suppressed pile-up truthFollows !69055Follows !69055https://gitlab.cern.ch/atlas/athena/-/merge_requests/67837Draft: FastCaloSim: Factorize functionality from GAN sim and new Frozen Showe...2024-03-15T10:43:36+01:00Michael Duehrssen-DeblingDraft: FastCaloSim: Factorize functionality from GAN sim and new Frozen Shower into new methodsFactorize functionality from FastCaloGAN sim to run over sub simulation components into dedicated methods in the TFCSParametrizationBinnedChain mother class. Then use these methods in FastCaloGANV2 and in the new FastCaloSim Frozen Showe...Factorize functionality from FastCaloGAN sim to run over sub simulation components into dedicated methods in the TFCSParametrizationBinnedChain mother class. Then use these methods in FastCaloGANV2 and in the new FastCaloSim Frozen Shower like simulation. The Frozen Shower at this stage just provides the framework and implements only some dummy for the energy and hit simulation.https://gitlab.cern.ch/atlas/athena/-/merge_requests/67750Draft: Add truth particle to secondaries2024-02-19T10:53:17+01:00Rui WangDraft: Add truth particle to secondaries@jchapman Adding truth particle to secondaries using the ITruthSvc
Getting error
`ServiceManager FATAL No Service factory for ISF_TruthRecordSvc available.`
when running `test_MC16_ATLFAST3F_ACTSMT_ttbar.sh`
- /Simulation/ISF/I...@jchapman Adding truth particle to secondaries using the ITruthSvc
Getting error
`ServiceManager FATAL No Service factory for ISF_TruthRecordSvc available.`
when running `test_MC16_ATLFAST3F_ACTSMT_ttbar.sh`
- /Simulation/ISF/ISF_Acts/ISF_ActsTools/CMakeLists.txt
- /Simulation/ISF/ISF_Acts/ISF_ActsTools/src/ActsFatrasSimTool.h
- /Simulation/ISF/ISF_Acts/ISF_ActsTools/src/ActsFatrasSimTool.cxxRui WangRui Wanghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67505Draft: Update TruthIncidents and ISFParticle to know about uniqueID2024-03-28T11:19:33+01:00John Derek ChapmanDraft: Update TruthIncidents and ISFParticle to know about uniqueID(ATLASSIM-6978)(ATLASSIM-6978)https://gitlab.cern.ch/atlas/athena/-/merge_requests/67195Draft: Added new TruthParticle and TruthVertex aux containers.2024-03-13T11:57:38+01:00John Derek ChapmanDraft: Added new TruthParticle and TruthVertex aux containers.Extra changes on top of !66561
Tagging @akraszna, @averbyts and @pclarkExtra changes on top of !66561
Tagging @akraszna, @averbyts and @pclarkhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61557Draft: Attempt to make EntryLayerTool(MT)::registerParticle() method more rob...2024-02-19T11:09:38+01:00John Derek ChapmanDraft: Attempt to make EntryLayerTool(MT)::registerParticle() method more robust (ATLASSIM-6425)By tweaking how the {{GeoIDSvc::inside}} method works, it was possible to recover most of the entries in the MuonEntryLayer TrackRecordCollection. The issue is that the `ISFParticles` returned to ISF by Geant4 after the Calorimeter simul...By tweaking how the {{GeoIDSvc::inside}} method works, it was possible to recover most of the entries in the MuonEntryLayer TrackRecordCollection. The issue is that the `ISFParticles` returned to ISF by Geant4 after the Calorimeter simulation in ATLFAST3 jobs are often classified as being outside the calorimeter envelope and inside the muon system envelope by the {{GeoIDSvc}} as the ISF and Geant4 envelopes do not exactly line up in the endcap regions.
The {{GeoIDSvc::inside}} method creates two positions offset from the current position of the {{ISFParticle}} and uses those too assess if the {{ISFParticle}} is inside, outside or on the surface of the envelope corresponding to the geoID provided in the arguments.
The {{EntryLayerTool(MT)}} relies on the {{ISFParticles}} being classified as being on the surface of one or more of these envelopes to figure out which entry layer they lie on:
https://gitlab.cern.ch/atlas/athena/-/blob/master/Simulation/ISF/ISF_Geant4/ISF_Geant4CommonTools/src/EntryLayerToolMT.cxx#L75-86
By making the offset of these two positions configurable:
https://gitlab.cern.ch/atlas/athena/-/blob/master/Simulation/ISF/ISF_Core/ISF_Services/src/GeoIDSvc.cxx#L271-272
we can increase the separation when needed making it more likely that the ISFParticle will be classified as being on the surface of the envelopes.
Leaving the changes as draft for now as I need to tidy up the code a bit, but I think it's a reasonable solution. Comments welcome. This should not alter the FullSim output, but will run the CI now as a cross-check.