athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2019-01-21T05:09:23+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/20423Sweeping !20259 from 21.3 to 21.9.
NSW MMSimHit (ATLASSIM-3755)2019-01-21T05:09:23+01:00Atlas NightlybuildSweeping !20259 from 21.3 to 21.9.
NSW MMSimHit (ATLASSIM-3755)NSW MMSimHit (ATLASSIM-3755)
See merge request atlas/athena!20259NSW MMSimHit (ATLASSIM-3755)
See merge request atlas/athena!20259https://gitlab.cern.ch/atlas/athena/-/merge_requests/20197Update master to use HepMcParticleLink_p2 by default2019-01-21T17:40:42+01:00John Derek ChapmanUpdate master to use HepMcParticleLink_p2 by defaultThe changes in this merge request migrate Athena to use the new transient HepMcParticleLink version and write out the HepMcParticleLink_p2 version by default.
There was a weakness in old HepMcParticleLink that it could only point to on...The changes in this merge request migrate Athena to use the new transient HepMcParticleLink version and write out the HepMcParticleLink_p2 version by default.
There was a weakness in old HepMcParticleLink that it could only point to one McEventCollection. Hard-scatter and pile-up HepMC::GenEvent objects were all stored in the same McEventCollection. The HepMcParticleLink attempted to identify a specfic HepMC::GenParticle using the barcode and event number. Due to the fact that the hard-scatter and pile-up events are from different samples it was perfectly possible for a pile-up HepMC::GenEvent to have the same event number as the hard-scatter HepMC::GenEvent. In such cases HepMcParticleLink would loop through the HepMC::GenEvent objects in the McEventCollection and link to first the HepMC::GenParticle with the matching barcode that it found, leading to incorrect links. Not much of an issue for standard production without pile-up truth, but crippling if pile-up truth was being used as the input for Truth-seeded tracking... The solution is to have one McEventCollection per input dataset (i.e. one for each of the hard-scatter, low pT minbias, high pT minbias etc.). In standard production everything looks the same, but when pile-up truth is being saved then we would have three McEventCollections typically. The new HepMcParticleLink constructor now takes an optional argument to point it to the correct McEventCollection.
This merge request simply updates the default persistent version written out, but does not update the transient HepMcParticleLink code to enable it to point at multiple McEventCollections. This will be done in a separate merge request, so that any differences in output can be seen more clearly.
The output root files are not directly comparable due to the persistent version changes, but no change in sim/digi/reco output is expected.
Summary talk from SPOT#8 here: https://indico.cern.ch/event/721374/contributions/2965501/attachments/1631503/2601151/SPOT.pdf
These changes are based on https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/16561https://gitlab.cern.ch/atlas/athena/-/merge_requests/20462LArG4Validation: removed references to EventInfo and moved all headers to src2019-01-22T03:02:27+01:00Vakhtang TsulaiaLArG4Validation: removed references to EventInfo and moved all headers to srcAlso cleaned up old comments from `LArCafJobs/src/LArNoiseBursts.cxx`Also cleaned up old comments from `LArCafJobs/src/LArNoiseBursts.cxx`https://gitlab.cern.ch/atlas/athena/-/merge_requests/20405Remove unnecessary (I)SiProperties(CH)Svc and LorentzAngleSvcSetup.py (ATLASR...2019-01-23T03:02:56+01:00Susumu OdaRemove unnecessary (I)SiProperties(CH)Svc and LorentzAngleSvcSetup.py (ATLASRECTS-4048)Remove unnecessary (I)SiProperties(CH)Svc and LorentzAngleSvcSetup.py.
Client configuration are updated accordingly.
https://its.cern.ch/jira/browse/ATLASRECTS-4048
Although updated codes should not affect anything of q221/q431 ...Remove unnecessary (I)SiProperties(CH)Svc and LorentzAngleSvcSetup.py.
Client configuration are updated accordingly.
https://its.cern.ch/jira/browse/ATLASRECTS-4048
Although updated codes should not affect anything of q221/q431 tests, RunTier0Tests.py was run and fine.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20534FastCaloSim: Making FastShowerCellBuilderTool const.2019-01-23T03:03:26+01:00Scott SnyderFastCaloSim: Making FastShowerCellBuilderTool const.TH1::GetRandom() and TH2::GetRandom2() are not MT-safe, since they're
non-const and also use gRandom. These are used from
ParticleEnergyParametrization. Rewrite so as to be const and to allow
passing in a random generator rather than h...TH1::GetRandom() and TH2::GetRandom2() are not MT-safe, since they're
non-const and also use gRandom. These are used from
ParticleEnergyParametrization. Rewrite so as to be const and to allow
passing in a random generator rather than having to use gRandom.
(We currently still pass in gRandom. Changing that would change rng seeding,
so that will be fixed in a subsequent change.)https://gitlab.cern.ch/atlas/athena/-/merge_requests/20516Remove RndmEngine from the expected list of properties of PixelDigitizationTool2019-01-23T15:02:57+01:00John Derek ChapmanRemove RndmEngine from the expected list of properties of PixelDigitizationToolThis should fix the `Digitization_test_MC16a_Digi_tf_configuration` unit test
which was broken when the `RndmEngine` property was dropped from `PixelDigitizationTool`
in !20297.This should fix the `Digitization_test_MC16a_Digi_tf_configuration` unit test
which was broken when the `RndmEngine` property was dropped from `PixelDigitizationTool`
in !20297.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20521Add support for using the MixMax random number generator.2019-01-24T03:02:21+01:00John Derek ChapmanAdd support for using the MixMax random number generator.Now that the master branch uses CLHEP 2.4.0.1.atl01, it is possible to add support for
the MixMax random number generator. See ATLASSIM-3909Now that the master branch uses CLHEP 2.4.0.1.atl01, it is possible to add support for
the MixMax random number generator. See ATLASSIM-3909https://gitlab.cern.ch/atlas/athena/-/merge_requests/20579TileGeoG4Calib: A couple const fixes.2019-01-25T03:02:35+01:00Scott SnyderTileGeoG4Calib: A couple const fixes.Declare as const ServiceHandles to the detStore used as arguments.
Needed for compatibility with thread-safety fixes in AthenaBaseComps.Declare as const ServiceHandles to the detStore used as arguments.
Needed for compatibility with thread-safety fixes in AthenaBaseComps.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20621FastCaloSim: Making FastShowerCellBuilderTool const.2019-01-26T03:02:05+01:00Scott SnyderFastCaloSim: Making FastShowerCellBuilderTool const.Change from IAtRndmGenSvc to IAthRNGSvc for MT-compatibility.
Remove uses of gRandom.
Results change due to differences in how RNGs are seeded.Change from IAtRndmGenSvc to IAthRNGSvc for MT-compatibility.
Remove uses of gRandom.
Results change due to differences in how RNGs are seeded.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20636Adds an option to turn on range cuts for gamma processes (conv, phot, compt).…2019-01-26T03:02:09+01:00Miha Muskinjamiha.muskinja@cern.chAdds an option to turn on range cuts for gamma processes (conv, phot, compt).…Manual sweep of https://gitlab.cern.ch/atlas/athena/merge_requests/20013 into master.
```python
simFlags.OptionalUserActionList.addAction(
'G4UA::EnergyConservationTestTool', ['Event', 'Tracking', 'Step'])
```
change...Manual sweep of https://gitlab.cern.ch/atlas/athena/merge_requests/20013 into master.
```python
simFlags.OptionalUserActionList.addAction(
'G4UA::EnergyConservationTestTool', ['Event', 'Tracking', 'Step'])
```
changed into
```python
simFlags.OptionalUserActionList.addAction(
'G4UA::EnergyConservationTestTool')
```
in masterhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20635PreStepPoint quantities in StepHistogramTool. Manualy sweeped into master.2019-01-29T03:02:02+01:00Miha Muskinjamiha.muskinja@cern.chPreStepPoint quantities in StepHistogramTool. Manualy sweeped into master.manual sweep of https://gitlab.cern.ch/atlas/athena/merge_requests/20262
StepHistogramTool.cxx didn't work because `report` is `m_report` in R21manual sweep of https://gitlab.cern.ch/atlas/athena/merge_requests/20262
StepHistogramTool.cxx didn't work because `report` is `m_report` in R21https://gitlab.cern.ch/atlas/athena/-/merge_requests/20654TrkG4UserActions: fix ubsan warnings.2019-01-29T03:02:04+01:00Miha Muskinjamiha.muskinja@cern.chTrkG4UserActions: fix ubsan warnings.Manual sweep of https://gitlab.cern.ch/atlas/athena/merge_requests/20653/
Fix ubsan warnings.
Done in same way as https://gitlab.cern.ch/atlas/athena/commit/0bfe0ea8f53a9de503576e4071deef3ba7612bcdManual sweep of https://gitlab.cern.ch/atlas/athena/merge_requests/20653/
Fix ubsan warnings.
Done in same way as https://gitlab.cern.ch/atlas/athena/commit/0bfe0ea8f53a9de503576e4071deef3ba7612bcdhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20642User action that sets G4 looper threshold values2019-01-29T03:02:19+01:00Miha Muskinjamiha.muskinja@cern.chUser action that sets G4 looper threshold valuesThis user action can configure the looper threshold values in Geant4:
http://www-geant4.kek.jp/lxr/source/processes/transportation/src/G4Transportation.cc#L878
The preInclude will set them both to 0 for debugging purposes. By default, G...This user action can configure the looper threshold values in Geant4:
http://www-geant4.kek.jp/lxr/source/processes/transportation/src/G4Transportation.cc#L878
The preInclude will set them both to 0 for debugging purposes. By default, Geant4 would only print Exceptions for particles above 100 MeV.
The user action also calls a Geant4 printout method, e.g.:
```
G4Transportation: Current values for thresholds related to the killing of looping tracks:
Warning Energy = 0 MeV ( below this tracks are killed without warning )
Important Energy = 0 ( above this tracks are given multiple chances )
Extra Trials = 10 'important' tracks, i.e. those above 'important' energy
```https://gitlab.cern.ch/atlas/athena/-/merge_requests/20697Fix ATLASSIM-3987 by setting the random number service name correctly2019-01-30T03:01:59+01:00John Derek ChapmanFix ATLASSIM-3987 by setting the random number service name correctlyCloses ATLASSIM-3987Closes ATLASSIM-3987https://gitlab.cern.ch/atlas/athena/-/merge_requests/20704Migrate ISF_Geant4Tools/TransportTool to use the thread-safe random number se...2019-02-02T03:02:14+01:00John Derek ChapmanMigrate ISF_Geant4Tools/TransportTool to use the thread-safe random number serviceThis merge request updates `TransportTool` to use `IAthRNGSvc` rather than `IAtRndmGenSvc`.
The Mersenne Twister is still used by default, but the syntax now matches what is used
in `G4AtlasAlg`.
The way the random number engine is re-s...This merge request updates `TransportTool` to use `IAthRNGSvc` rather than `IAtRndmGenSvc`.
The Mersenne Twister is still used by default, but the syntax now matches what is used
in `G4AtlasAlg`.
The way the random number engine is re-seeded changes slightly, so the simulation out will change.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20694Considering all surfaces (not only material ones) in TimedExtrapolator.cxx2019-02-05T00:04:18+01:00Olivier ArnaezConsidering all surfaces (not only material ones) in TimedExtrapolator.cxxConsidering all surfaces (not only material ones) as 'compatible' in TimedExtrapolator.cxx to restore SCT hits on both sides.
ATLASSIM-3745Considering all surfaces (not only material ones) as 'compatible' in TimedExtrapolator.cxx to restore SCT hits on both sides.
ATLASSIM-3745https://gitlab.cern.ch/atlas/athena/-/merge_requests/20837migrate G4EmProcessOptions.hh to G4EmParameters.hh2019-02-05T03:02:09+01:00Miha Muskinjamiha.muskinja@cern.chmigrate G4EmProcessOptions.hh to G4EmParameters.hhMigration to use directly `G4EmParameters` instead of `G4EmProcessOptions` as advised by Geant4 people.
It is potentially a breaking change because it merges two properties of hysicsListToolBase into one. This was advised decided upon d...Migration to use directly `G4EmParameters` instead of `G4EmProcessOptions` as advised by Geant4 people.
It is potentially a breaking change because it merges two properties of hysicsListToolBase into one. This was advised decided upon discussion in ATLASSIM-3967.
With a LXR search only one client using these properties was found and the settings were commented out. This MR adds an additional comment as a warning.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20850Use default destructor in SCT related codes2019-02-05T03:02:24+01:00Susumu OdaUse default destructor in SCT related codesUse default destructor in SCT related codesUse default destructor in SCT related codeshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20886Sweeping !20643 from 21.0 to master.
Add the ability to flag additional PDG c...2019-02-07T03:02:19+01:00Atlas NightlybuildSweeping !20643 from 21.0 to master.
Add the ability to flag additional PDG codes as being non-interactingAdd the ability to flag additional PDG codes as being non-interacting
See merge request atlas/athena!20643Add the ability to flag additional PDG codes as being non-interacting
See merge request atlas/athena!20643https://gitlab.cern.ch/atlas/athena/-/merge_requests/20924CellMakerTool methods are const.2019-02-08T03:02:21+01:00Scott SnyderCellMakerTool methods are const.ICaloCellMakerTool::process and ICaloConstCellMakerTool::process are now const,
with an EventContext argument.
Adjust uses of it.
Working to make more of the calorimeter reconstruction reentrant.ICaloCellMakerTool::process and ICaloConstCellMakerTool::process are now const,
with an EventContext argument.
Adjust uses of it.
Working to make more of the calorimeter reconstruction reentrant.