athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2020-08-29T03:02:55+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/35974TagEvent+LArSimEvent: Fix cppcheck warnings.2020-08-29T03:02:55+02:00Scott SnyderTagEvent+LArSimEvent: Fix cppcheck warnings.Pass class instances by const reference, not by value.
Prefer to use an initializer list to initializing within a ctor body.
Prefer preincrement to postincrement for iterators.
Also use emplace_back.Pass class instances by const reference, not by value.
Prefer to use an initializer list to initializing within a ctor body.
Prefer preincrement to postincrement for iterators.
Also use emplace_back.https://gitlab.cern.ch/atlas/athena/-/merge_requests/35969G4ExtraProcesses: Fix clang warning.2020-09-01T03:02:32+02:00Scott SnyderG4ExtraProcesses: Fix clang warning.Don't use fabs() with an integer argument.Don't use fabs() with an integer argument.https://gitlab.cern.ch/atlas/athena/-/merge_requests/35968Calorimeter : clang tidy related fixes2020-08-29T03:02:45+02:00Christos Anastopouloschristos.anastopoulos@cern.chCalorimeter : clang tidy related fixes- pass by const ref
- nullptr
- emplace_back
- use empty
- pass by const ref
- nullptr
- emplace_back
- use empty
https://gitlab.cern.ch/atlas/athena/-/merge_requests/35967Teach ISF new config test to run2020-09-05T03:03:16+02:00Rupert TombsTeach ISF new config test to runGet ISF configuration to run a test without failing.
Many changes of private tools to public tools.
Add flag-based default decision for ConfigFlags.Sim.ISF.HITSMergingRequired (cc @jchapman )
Add Kernel_ATLFASTIIMTCfg
Get Bas...Get ISF configuration to run a test without failing.
Many changes of private tools to public tools.
Add flag-based default decision for ConfigFlags.Sim.ISF.HITSMergingRequired (cc @jchapman )
Add Kernel_ATLFASTIIMTCfg
Get BaseSimulationSelector to accept an empty simulator, as needed for MT.
Numerous changes and suggestions are thanks to @bleban
https://gitlab.cern.ch/atlas/athena/-/merge_requests/35960Remove clashes between ATLAS feet and MDT rail support2020-08-29T03:03:15+02:00Nicolas KoehlerRemove clashes between ATLAS feet and MDT rail supportHi,
this MR removes some clashes in the passive material description between the ATLAS feet and brackets of the MDT rail support.
Best, NicoHi,
this MR removes some clashes in the passive material description between the ATLAS feet and brackets of the MDT rail support.
Best, Nicohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/35944Mcutils update to make it work with HepMC32020-09-01T03:03:01+02:00Andrii VerbytskyiMcutils update to make it work with HepMC3MCUtils are used in Thena seldom, therefore one can just take the used functions and port them to HepM3.
Reduces the amount of work for Andy.
In this MR:
- functions that work for HepMC3 and HepMC2.
Tagging @jchapman , @abuckleyMCUtils are used in Thena seldom, therefore one can just take the used functions and port them to HepM3.
Reduces the amount of work for Andy.
In this MR:
- functions that work for HepMC3 and HepMC2.
Tagging @jchapman , @abuckleyhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/35916OverlayCopyAlgs: run EventInfoOverlay in tests2020-08-28T03:02:20+02:00Tadej Novaktadej.novak@cern.chOverlayCopyAlgs: run EventInfoOverlay in testsRun `EventInfoOverlay` in `OverlayCopyAlgs` tests to avoid missing `xAOD::EventInfo`.Run `EventInfoOverlay` in `OverlayCopyAlgs` tests to avoid missing `xAOD::EventInfo`.https://gitlab.cern.ch/atlas/athena/-/merge_requests/35907Use the new overlay skeleton in Reco_tf2020-10-20T03:03:19+02:00Tadej Novaktadej.novak@cern.chUse the new overlay skeleton in Reco_tfUpdate `Reco_tf` to use the new overlay skeleton. Also cleanup `Reco_tf.py` a bit.Update `Reco_tf` to use the new overlay skeleton. Also cleanup `Reco_tf.py` a bit.https://gitlab.cern.ch/atlas/athena/-/merge_requests/35902Sweeping !35840 from 21.0 to master.
FastCaloSimGAN: skip unused layers early...2020-08-27T03:02:23+02:00Atlas NightlybuildSweeping !35840 from 21.0 to master.
FastCaloSimGAN: skip unused layers early in the GAN layer simulation chainFastCaloSimGAN: skip unused layers early in the GAN layer simulation chain
See merge request atlas/athena!35840FastCaloSimGAN: skip unused layers early in the GAN layer simulation chain
See merge request atlas/athena!35840https://gitlab.cern.ch/atlas/athena/-/merge_requests/35899Sweeping !35830 from master to 21.0.
G4ExtraProcesses module2020-10-16T12:19:41+02:00Atlas NightlybuildSweeping !35830 from master to 21.0.
G4ExtraProcesses moduleG4ExtraProcesses module
See merge request atlas/athena!35830G4ExtraProcesses module
See merge request atlas/athena!35830https://gitlab.cern.ch/atlas/athena/-/merge_requests/35889TagEvent+LArSimEvent: Enable thread-safety checking.2020-08-27T03:02:27+02:00Scott SnyderTagEvent+LArSimEvent: Enable thread-safety checking.Enable thread-safety checking.Enable thread-safety checking.https://gitlab.cern.ch/atlas/athena/-/merge_requests/35885Duplicated GeoMaterials and G4Materials now generate WARNING messages in Simu...2020-09-03T03:04:18+02:00John Derek ChapmanDuplicated GeoMaterials and G4Materials now generate WARNING messages in SimulationNow that all current duplicated G4Materials have been fixed,
`Geo2G4MaterialFactory` is updated so that any future duplicated materials
will generate a warning and so should be picked up by tests like `RunTier0Tests.py`.
See ATLASSIM-467...Now that all current duplicated G4Materials have been fixed,
`Geo2G4MaterialFactory` is updated so that any future duplicated materials
will generate a warning and so should be picked up by tests like `RunTier0Tests.py`.
See ATLASSIM-4679
Merge after !35884.https://gitlab.cern.ch/atlas/athena/-/merge_requests/35884Use static material maps in Geo2G4MaterialFactory2020-08-29T03:02:48+02:00John Derek ChapmanUse static material maps in Geo2G4MaterialFactoryMaking `Geo2G4MaterialFactory::m_geoMaterialToG4Material` and
`Geo2G4MaterialFactory::m_geoMaterialNameToObject` into static
member variables prevents the attempt to create a duplicate
`'trt::CO2'` material during simulation. Due to two ...Making `Geo2G4MaterialFactory::m_geoMaterialToG4Material` and
`Geo2G4MaterialFactory::m_geoMaterialNameToObject` into static
member variables prevents the attempt to create a duplicate
`'trt::CO2'` material during simulation. Due to two different
`Geo2G4MaterialFactory` instances being asked to build the
`'trt::CO2'` material.
It is safe to make these variables static as this code is only
run during the initialization of Geant4 (which is single-threaded).
This will fix the final duplicated material warning listed in
ATLASSIM-4679.
Merge after !35795https://gitlab.cern.ch/atlas/athena/-/merge_requests/35882Set of small changes for HepMC32020-08-29T03:03:20+02:00Andrii VerbytskyiSet of small changes for HepMC3In this MR:
- fixed typo in TruthParticle_test.cxx
- update HepMcParticleLink.cxx for HepMC3
- use std:: algorithm instead of self-made one in FastShowerCellBuilderTool.cxx
- support for Taoula with HepMC3
Tagging @jchapman
In this MR:
- fixed typo in TruthParticle_test.cxx
- update HepMcParticleLink.cxx for HepMC3
- use std:: algorithm instead of self-made one in FastShowerCellBuilderTool.cxx
- support for Taoula with HepMC3
Tagging @jchapman
https://gitlab.cern.ch/atlas/athena/-/merge_requests/35877WIP: Add back and fix Emulation HLT tests2020-08-25T16:30:51+02:00Francesca PastoreWIP: Add back and fix Emulation HLT tests- reverted back https://gitlab.cern.ch/atlas/athena/-/commit/292c5449a9635783e03a59abe9e4ca0fe68adb98
- fixed Emu_step_menu test
Referred to ATR-21840- reverted back https://gitlab.cern.ch/atlas/athena/-/commit/292c5449a9635783e03a59abe9e4ca0fe68adb98
- fixed Emu_step_menu test
Referred to ATR-21840Francesca PastoreFrancesca Pastorehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/35875Merge 21.0.117 into 21.32020-10-28T12:32:41+01:00John Derek ChapmanMerge 21.0.117 into 21.3This merge request merges all the changes that were made to the ~"21.0" branch between the release [release/21.0.117](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.117) and the previous release [release/21.0.116](https://gitlab.c...This merge request merges all the changes that were made to the ~"21.0" branch between the release [release/21.0.117](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.117) and the previous release [release/21.0.116](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.116).
Below is the full list of merge requests that were included between these two tags:
* !35745 : FastCaloSim: Add an option to initialize the GAN energy from the simulstate instead of always using Ekin
* !35602 : FCS: allow disabling of LWTNN in standalone mode
* !35345 : Sweeping !35322 from master to 21.0.
* !35250 : Decide whether SimHit Collections should be created per simulator on a per region-basis
* !35199 : Protect against invalid data when PNG not requested
* !35085 : Rejecting tracks with shared hits and veto of peripheral region in the SCTLorentzMonTool
Link to the full diff between [release/21.0.117](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.117) and
[release/21.0.116](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.116)
is available at
https://gitlab.cern.ch/atlas/athena/compare/release/21.0.116...release/21.0.117https://gitlab.cern.ch/atlas/athena/-/merge_requests/35870Fix MergeRDO for pile-up premixing and add AthenaMP tests for pile-up digitiz...2020-08-26T03:03:42+02:00Tadej Novaktadej.novak@cern.chFix MergeRDO for pile-up premixing and add AthenaMP tests for pile-up digitizationFix MergeRDO for pile-up premixing and add AthenaMP tests for pile-up digitization.
/cc @jchapmanFix MergeRDO for pile-up premixing and add AthenaMP tests for pile-up digitization.
/cc @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/35846Replace const HepMC::GenParticlePtr with HepMC::ConstGenParticlePtr2020-08-26T03:02:40+02:00John Derek ChapmanReplace const HepMC::GenParticlePtr with HepMC::ConstGenParticlePtrThis is just a small set of changes to ensure that the meaning of
some lines isn't changed by the switch to using the `HepMC::GenParticlePtr`
typedefs (part of the preparation for the HepMC3 migration).
For HepMC2
```
const HepMC::GenPa...This is just a small set of changes to ensure that the meaning of
some lines isn't changed by the switch to using the `HepMC::GenParticlePtr`
typedefs (part of the preparation for the HepMC3 migration).
For HepMC2
```
const HepMC::GenParticlePtr == HepMC::GenParticle* const
HepMC::ConstGenParticlePtr == const HepMC::GenParticle*
```
FYI @averbytshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/35840FastCaloSimGAN: skip unused layers early in the GAN layer simulation chain2020-10-16T12:19:41+02:00Michael Duehrssen-DeblingFastCaloSimGAN: skip unused layers early in the GAN layer simulation chainIn the loop over layers in the FastCaloSim GAN simulation, unused layers were skipped too late which resulted in a spurious initialisation try.In the loop over layers in the FastCaloSim GAN simulation, unused layers were skipped too late which resulted in a spurious initialisation try.https://gitlab.cern.ch/atlas/athena/-/merge_requests/35830G4ExtraProcesses module2020-10-16T12:19:41+02:00Miha Muskinjamiha.muskinja@cern.chG4ExtraProcesses moduleAs discussed in ATLASSIM-4608, some particles (e.g. Xi_b) in Geant4 don't have EM physics processes assigned to them. This module adds a possibility to add EM processes to such particles.
Enabled with a preInclude:
SimulationJobOptio...As discussed in ATLASSIM-4608, some particles (e.g. Xi_b) in Geant4 don't have EM physics processes assigned to them. This module adds a possibility to add EM processes to such particles.
Enabled with a preInclude:
SimulationJobOptions/preInclude.G4ExtraProcesses.py
Configured in SimFlags:
https://gitlab.cern.ch/mmuskinj/athena/-/commit/f78155037a4ac9252d321fd02f40354c6decef81#d32e16f5286c9bd4930717f07c24c12801d4f1ff_834_834
Print out indicating that it added processes to Xi_b:
```
INFO Adding EM processes for anti_xi_b-
INFO Adding EM processes for xi_b-
```
Verbose tracking for xi_b, indicating that it lost energy:
```
EVNTtoHITS 09:25:59 ---------> Dumping now track #202 barcode 10021 pdgID -5132 in event 4940034
EVNTtoHITS 09:25:59 1 -23.1 -4.27 33.3 2.52e+06 5.89e-06 33.4 33.4 SectionC02 Transportation
EVNTtoHITS 09:25:59 2 -23.1 -4.27 33.3 2.52e+06 0.00313 0.00146 33.4 SectionC03 Transportation
EVNTtoHITS 09:25:59 3 -24 -4.42 34.2 2.52e+06 0.276 1.26 34.7 SectionC108 Transportation
EVNTtoHITS 09:25:59 4 -24 -4.43 34.3 2.52e+06 0.0203 0.0874 34.7 SectionC109 Transportation
EVNTtoHITS 09:25:59 5 -24 -4.43 34.3 2.52e+06 0.00451 0.0175 34.8 SectionC110 Transportation
EVNTtoHITS 09:25:59 6 -24.3 -4.47 34.5 2.52e+06 0.0653 0.35 35.1 SectionC111 Transportation
EVNTtoHITS 09:25:59 7 -24.3 -4.47 34.6 2.52e+06 0.0101 0.0364 35.1 BeamPipe Transportation
EVNTtoHITS 09:25:59 8 -27.8 -5.05 38.3 2.52e+06 0.000827 5.12 40.3 Atlas::Atlas Transportation
EVNTtoHITS 09:25:59 9 -28.4 -5.16 39 2.52e+06 4.67e-05 0.99 41.3 IDET::IDET Transportation
```
**Should also be swept into R21**.