athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-04-03T03:05:05+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/40971mpt PDFcreator getRand() pass by reference to map comparators2021-04-03T03:05:05+02:00Thomas Michael Cartermpt PDFcreator getRand() pass by reference to map comparatorsAdjust map comparators that are use in FCS muonPunchThroughTool PDFcreator getRand() to pass arguments by reference.
This addresses the first point in [ATLASSIM-5119](https://its.cern.ch/jira/browse/ATLASSIM-5119)Adjust map comparators that are use in FCS muonPunchThroughTool PDFcreator getRand() to pass arguments by reference.
This addresses the first point in [ATLASSIM-5119](https://its.cern.ch/jira/browse/ATLASSIM-5119)Thomas Michael CarterThomas Michael Carterhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/28714MR 28412 in master2019-12-12T03:02:07+01:00Tulay Cuhadar DonszelmannMR 28412 in masterSweeping of MR 28412 from 21.3 failed to master, making new MR for master.
@jchapman, @vpascuzz and @tlari.Sweeping of MR 28412 from 21.3 failed to master, making new MR for master.
@jchapman, @vpascuzz and @tlari.https://gitlab.cern.ch/atlas/athena/-/merge_requests/38056MT consistency fix for PassbackG42020-11-12T13:39:29+01:00Benjamin Michael WynneMT consistency fix for PassbackG4PassbackG4 was not returning MT results consistent with those in single-threaded mode.
The problem seems to have come from the returning of secondary particles from the passback user action. Each (athenaMT slot-associated) TransportTool...PassbackG4 was not returning MT results consistent with those in single-threaded mode.
The problem seems to have come from the returning of secondary particles from the passback user action. Each (athenaMT slot-associated) TransportTool was caching a pointer to a (G4 thread-associated) user action. In some cases the TransportTool was then used in a different thread, and so the wrong user action was retrieved from the cache.
Fixed by caching each user action mapped to the index of the corresponding thread.
tagging @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/38478MT-safe migration for FastHitConvertTool2020-11-24T03:02:49+01:00Benjamin Michael WynneMT-safe migration for FastHitConvertToolCurrently FastHitConvertTool gives an error if run in AthenaMT, because its public method (process) casts off the constness of the tool itself in order to run. However, this is all to support historical structure of the tool, and there w...Currently FastHitConvertTool gives an error if run in AthenaMT, because its public method (process) casts off the constness of the tool itself in order to run. However, this is all to support historical structure of the tool, and there was nothing fundamentally blocking a migration to AthenaMT. Used DataHandleKeys to allow fully const execution of the tool, except in one instance (PileupEventInfo is retrieved and modified by non-const eventStore()->retrieve), and the error is moved there.
Checked that this does not change results in ATLFASTII or FastCaloSimV2 (single threaded). Allows FastCaloSim to run multithreaded without crashing.
Needed for https://its.cern.ch/jira/browse/ATLASSIM-4764
Tagging @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/59219Much improved G4mplEquationSetup - simpler and less churn2023-01-20T14:18:26+01:00John Derek ChapmanMuch improved G4mplEquationSetup - simpler and less churn`G4mplEquationSetup`
1) Create a ChordFinder only in InitializeForField
2) Recall the 'original' ChordFinder for use of regular charged
particles (and to reinstate it in the FieldMgr at end of stepping)
`G4mplAtlasTransp...`G4mplEquationSetup`
1) Create a ChordFinder only in InitializeForField
2) Recall the 'original' ChordFinder for use of regular charged
particles (and to reinstate it in the FieldMgr at end of stepping)
`G4mplAtlasTransportation`: adapted to changes above.
The above changes from @japost should finally fix ATLASSIM-6019 and related tickets.https://gitlab.cern.ch/atlas/athena/-/merge_requests/64235MultipleScatteringSamplerGeneralMixture : pass by const reference2023-07-10T21:15:37+02:00Christos Anastopouloschristos.anastopoulos@cern.chMultipleScatteringSamplerGeneralMixture : pass by const reference MultipleScatteringSamplerGeneralMixture : pass by const reference MultipleScatteringSamplerGeneralMixture : pass by const referencehttps://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/53933Multithreaded Pileup Digitization2022-07-26T15:12:14+02:00Beojan Stanislausbeojan.stanislaus@cern.chMultithreaded Pileup Digitization*Multithreaded pileup digitization implementation*
The multithreaded version is used if `Digi_tf` is given both the `--CA` option and AthenaMT is used.
Pileup merging is now done tool at a time, then bunch at a time. Unused background ...*Multithreaded pileup digitization implementation*
The multithreaded version is used if `Digi_tf` is given both the `--CA` option and AthenaMT is used.
Pileup merging is now done tool at a time, then bunch at a time. Unused background events from previous batches are reused in the next batch to be loaded, and batches must be loaded in order to ensure the same background events are in a given batch.https://gitlab.cern.ch/atlas/athena/-/merge_requests/25953MuonByteStreamCnv New Config2019-08-22T11:48:43+02:00Rupert TombsMuonByteStreamCnv New ConfigConvert MuonByteStreamCnvTestConfig.py to new config style.
Add corresponding configuration functions to the Muon modules TGC, MDT, RPC, and CSC. Use these in the digitisation test.
Change relevant tools to private, update parts of...Convert MuonByteStreamCnvTestConfig.py to new config style.
Add corresponding configuration functions to the Muon modules TGC, MDT, RPC, and CSC. Use these in the digitisation test.
Change relevant tools to private, update parts of CSC configuration in MuonConfig.https://gitlab.cern.ch/atlas/athena/-/merge_requests/68714MuonConfiguration - Auto detect whether the R4 style or legacy geometry are l...2024-02-12T19:39:16+01:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chMuonConfiguration - Auto detect whether the R4 style or legacy geometry are loadedHi everybody,
if a SQLite file is parsed as Geometry input, it's checked whether the geometry was made with the new R4 style MuonPlugin (cf. https://gitlab.cern.ch/atlas/geomodelatlas/GeoModelATLAS/-/merge_requests/124). The Muon geomet...Hi everybody,
if a SQLite file is parsed as Geometry input, it's checked whether the geometry was made with the new R4 style MuonPlugin (cf. https://gitlab.cern.ch/atlas/geomodelatlas/GeoModelATLAS/-/merge_requests/124). The Muon geometry configuration flag is then set accordingly. Rename the `useGeoModelXml` flag into `usePhaseIIGeoSetup`
Tagging: @emoyse, @boudreau, @tadejhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/22090Muon digitization ComponentAccumulator configuration2019-03-30T03:02:20+01:00Rupert TombsMuon digitization ComponentAccumulator configurationNew style digitization configuration for the CSC, MDT, TGC and RPC systems, with tests for each.
Link a new HITS file with special configuration for MDT testing.
Add getSpecialConfiguration to DigitizationConfigFlags.py (based on ...New style digitization configuration for the CSC, MDT, TGC and RPC systems, with tests for each.
Link a new HITS file with special configuration for MDT testing.
Add getSpecialConfiguration to DigitizationConfigFlags.py (based on DigitizationReadMetaData.py/doSpecialConfiguration and G4Atlas_Metadata.py/checkForSpecialConfigurationMetadata).
https://gitlab.cern.ch/atlas/athena/-/merge_requests/66434MuonDigitization - Remove legacy configuration2024-02-15T19:16:52+01:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chMuonDigitization - Remove legacy configurationRemove legacy digitization configuration for muons.Remove legacy digitization configuration for muons.https://gitlab.cern.ch/atlas/athena/-/merge_requests/32526MuonDigToolInterfaces+MuonRegionSelector+TrackRecord: cmake fixes2020-05-03T03:02:11+02:00Scott SnyderMuonDigToolInterfaces+MuonRegionSelector+TrackRecord: cmake fixesThese packages have component libraries, but they also export headers.
Define interface libraries for the headers.These packages have component libraries, but they also export headers.
Define interface libraries for the headers.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20481MuonEntryLayer to NTUP_FCS (ATLASSIM-3888)2019-06-29T03:02:24+02:00Thomas Michael CarterMuonEntryLayer to NTUP_FCS (ATLASSIM-3888)Added necessary changes to propagate muon entry layer information to NTUP_FCS file for muon punch through parameterisationAdded necessary changes to propagate muon entry layer information to NTUP_FCS file for muon punch through parameterisationhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/23899MuonEntry_to_NTUP_FCS (ATLASSIM-3888) resolved conflicts2019-06-07T03:02:46+02:00Thomas Michael CarterMuonEntry_to_NTUP_FCS (ATLASSIM-3888) resolved conflictsResolved conflicts of MuonEntry_to_NTUP_FCS to merge with master, sweep to master of previous MR failed (https://gitlab.cern.ch/atlas/athena/merge_requests/20481)Resolved conflicts of MuonEntry_to_NTUP_FCS to merge with master, sweep to master of previous MR failed (https://gitlab.cern.ch/atlas/athena/merge_requests/20481)https://gitlab.cern.ch/atlas/athena/-/merge_requests/55643MuonEventAthenaPool: Fix thread-safety checker warnings.2022-08-04T21:42:39+02:00Scott SnyderMuonEventAthenaPool: Fix thread-safety checker warnings.(Disabled-by-default) warnings on calls to unchecked code.(Disabled-by-default) warnings on calls to unchecked code.Scott SnyderScott Snyderhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/26430MuonEventTPCnv+MuonG4SD: CxxUtils::make_unqiue -> std::make_unique2019-09-11T03:02:23+02:00Scott SnyderMuonEventTPCnv+MuonG4SD: CxxUtils::make_unqiue -> std::make_uniqueGet make_unique from std::.Get make_unique from std::.https://gitlab.cern.ch/atlas/athena/-/merge_requests/66243MuonG4R4 - Add muon sim hit sorting algorithm2023-10-10T21:42:07+02:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chMuonG4R4 - Add muon sim hit sorting algorithmHi everybody,
this MR adds a small helper package to resort the xAOD::MuonSimHitContainer such that hits from the same chamber are close together in memory. The algorithm can either create a deep copy or a VIEW_ELEMENTS one which might ...Hi everybody,
this MR adds a small helper package to resort the xAOD::MuonSimHitContainer such that hits from the same chamber are close together in memory. The algorithm can either create a deep copy or a VIEW_ELEMENTS one which might not be super optimal in memory access patterns later. Anyway, if this should happen in the simulation job, the G4AtlasAlg needs to declare its dependencies. Introducing WriteHandleKeys to the senstive detectors is impossible as the master tool is held by service and by the G4AtlasAlg. Instead, the dependencies can be declared via the `ExtraOutput` property. I took the checkxAOD from a recent run 3 file to setup the containers for the other detectors as well. In case, of the Inner detector, I'm not really ceratin to what `BCMHits` & `BLMHits` belongs to
```
# checking [HITS/group.det-muon.33831012.EXT0._000060.HITS.pool.root]...
Py:AthFile INFO loading cache from [athfile-cache.ascii.gz]...
Py:AthFile INFO loading cache from [athfile-cache.ascii.gz]... [done]
Py:AthFile INFO opening [HITS/group.det-muon.33831012.EXT0._000060.HITS.pool.root]...
================================================================================
Container type | StoreGate keys
-----------------------------------------+--------------------------------------
SiHitCollection | BCMHits, BLMHits, PixelHits, SCT_Hits
TileHitVector | MBTSHits, TileHitVec
TRTUncompressedHitCollection | TRTUncompressedHits
TGCSimHitCollection | TGC_Hits
RPCSimHitCollection | RPC_Hits
LArHitContainer | LArHitEMB, LArHitEMEC, LArHitFCAL, LArHitHEC
xAOD::EventAuxInfo | EventInfoAux.
MMSimHitCollection | MM_Hits
xAOD::EventInfo | EventInfo
MDTSimHitCollection | MDT_Hits
DataHeader | StreamHITS
TrackRecordCollection | CaloEntryLayer, MuonEntryLayer, MuonExitLayer
sTGCSimHitCollection | sTGC_Hits
McEventCollection | TruthEvent
================================================================================
## Bye.
```
Tagging @jchapman, @tadej, @sroe as I'm curious to hear about their opinionhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/33940MuonG4SD: cmake fix2020-06-20T03:04:15+02:00Scott SnyderMuonG4SD: cmake fixDon't build the same source into multiple libraries.Don't build the same source into multiple libraries.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20165MuonG4SD: Comply with ATLAS naming conventions.2019-01-05T03:02:14+01:00Scott SnyderMuonG4SD: Comply with ATLAS naming conventions.Private data members should start with m_.Private data members should start with m_.