athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-02-17T03:07:27+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/40687Add option to use StripDigitization2021-02-17T03:07:27+01:00Nicholas StylesAdd option to use StripDigitizationAllows use of ```StripDigitization``` in place of ```SCT_Digitization``` through setting a new ```experimentaldigi``` option. E.g.
```
Reco_tf.py --AMI r12189 --inputHITSFile myHITS.pool.root --outputRDOFile myRDO.pool.root --geometryVe...Allows use of ```StripDigitization``` in place of ```SCT_Digitization``` through setting a new ```experimentaldigi``` option. E.g.
```
Reco_tf.py --AMI r12189 --inputHITSFile myHITS.pool.root --outputRDOFile myRDO.pool.root --geometryVersion ATLAS-P2-ITK-23-00-02 --preExec 'all:from AthenaCommon.GlobalFlags import globalflags; globalflags.DataSource.set_Value_and_Lock("geant4");' 'HITtoRDO:from Digitization.DigitizationFlags import digitizationFlags; digitizationFlags.doInDetNoise.set_Value_and_Lock(False); digitizationFlags.overrideMetadata+=["SimLayout","PhysicsList"];digitizationFlags.experimentalDigi+=["doStripDigi"]'
```https://gitlab.cern.ch/atlas/athena/-/merge_requests/40683Add binomial random number generator with cached probabilities for fixed p: R...2021-03-16T03:03:04+01:00Michael Duehrssen-DeblingAdd binomial random number generator with cached probabilities for fixed p: RandBinomialFixedPThe TRT digitization code uses binomial random numbers with a fixed probability. This code provides a variant of CLHEP::RandBinomial that avoids thread local variables and caches binomial random numbers for a fixed probability and this w...The TRT digitization code uses binomial random numbers with a fixed probability. This code provides a variant of CLHEP::RandBinomial that avoids thread local variables and caches binomial random numbers for a fixed probability and this way speeds digitization up by ~10%. The static shoot(...) methods are all disabled, as the caching only works with an instantiated instance of RandBinomialFixedPhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40673Provide compatibility with Geant4 10.7.1 for testing2021-02-17T03:05:29+01:00Benjamin Morganben.morgan@warwick.ac.ukProvide compatibility with Geant4 10.7.1 for testingWhilst Athena `master` is using Geant4 10.6.3 at the moment, there's interest in further testing and trials with the latest 10.7.1 version.
This MR provides the changes needed to compile Athena `master` with Geant4 10.7.1 whilst retain...Whilst Athena `master` is using Geant4 10.6.3 at the moment, there's interest in further testing and trials with the latest 10.7.1 version.
This MR provides the changes needed to compile Athena `master` with Geant4 10.7.1 whilst retaining full back compatibility with the earlier versions currently in use. The changes are minor and restricted to one file(!).
- One call to a no longer provided interface if `#if` protected on the used Geant4 version.
- The remaining changes involve changing a direct data member access to access via a member function. The direct access is removed in 10.7, but all earlier versions provide the member function access, so no checks on the Geant4 version in use are required.
These changes have been tested for AthSimulation and full Athena builds using the current externals (so geant4 10.6.3) so _should_ pass without error. No changes to physics are involved.
Pinging @jchapman and @mduehrss for their info.https://gitlab.cern.ch/atlas/athena/-/merge_requests/40655Remove explicit Eigen usage from muon packages2021-02-16T03:03:48+01:00Nicolas KoehlerRemove explicit Eigen usage from muon packagesHi,
this MR removes the explicit includes of Eigen from muon packages where the Eigen functionality is used via e.g. `GeoPrimitives` indirectly. But no `find_package(Eigen)` is required for that.
Best, NicoHi,
this MR removes the explicit includes of Eigen from muon packages where the Eigen functionality is used via e.g. `GeoPrimitives` indirectly. But no `find_package(Eigen)` is required for that.
Best, Nicohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40651ISF_PunchThroughTools: Fix clang warning.2021-02-16T03:03:36+01:00Scott SnyderISF_PunchThroughTools: Fix clang warning.clang doesn't allow using math functions in constexpr expressions.clang doesn't allow using math functions in constexpr expressions.https://gitlab.cern.ch/atlas/athena/-/merge_requests/40638Fix HepMC includes after !38151 (small MR)2021-02-16T03:05:57+01:00Andrii VerbytskyiFix HepMC includes after !38151 (small MR)Fix HepMC includes after !38151 to be Hepmc3 compatibleFix HepMC includes after !38151 to be Hepmc3 compatiblehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40628Add btaggingLink in FTAG42021-02-16T03:07:45+01:00Binbin DongAdd btaggingLink in FTAG4Add AuxDyn.btaggingLink for 201903 btagged VRTrack jets.
Tagging @vdao , @cschiavi , @sanmay and @duperrin to review.Add AuxDyn.btaggingLink for 201903 btagged VRTrack jets.
Tagging @vdao , @cschiavi , @sanmay and @duperrin to review.https://gitlab.cern.ch/atlas/athena/-/merge_requests/40618Prepare job configuration to use the TrackingGeometry conditions in ID and tr...2021-03-02T14:26:48+01:00Goetz GayckenPrepare job configuration to use the TrackingGeometry conditions in ID and tracking tools.To allow using the TrackingGeometry conditions data instead of the TrackingGeometrySvc several ID tools require to be properly configured. In most cases the correct extrapolator has to be assigned. This requires to adjust various jobOpti...To allow using the TrackingGeometry conditions data instead of the TrackingGeometrySvc several ID tools require to be properly configured. In most cases the correct extrapolator has to be assigned. This requires to adjust various jobOptions to use properly configured tools rather than relying on default tools having correct default values. In some cases fixes to the run3 style ID configuration are needed which now gets pulled in via the run3 style monitoring and btagging configuration.
After this patch in q221, q431, q220, and when toggling the switch to use the TrackingGeometry conditions, there are still a few algorithms for Muon reconstruction which require the TrackingGeometrySvc.https://gitlab.cern.ch/atlas/athena/-/merge_requests/40611Update AF3 parametrization file for run 2 re-processing2021-04-03T03:05:09+02:00Ahmed Hasiba.hasib@cern.chUpdate AF3 parametrization file for run 2 re-processinghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40602Do not compute and output thinned LAr digits by default2021-02-13T03:05:05+01:00Tadej Novaktadej.novak@cern.chDo not compute and output thinned LAr digits by defaultDo not compute and output thinned LAr digits by default. This otherwise causes some issues with running trigger in 21.0. This information is not needed in reconstruction. Introduces a new flag `AddCaloDigiThinned`.
Also fixes ATLASSIM-5...Do not compute and output thinned LAr digits by default. This otherwise causes some issues with running trigger in 21.0. This information is not needed in reconstruction. Introduces a new flag `AddCaloDigiThinned`.
Also fixes ATLASSIM-5093.
/cc @gunal @jchapman @pavol @wlamplhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40598Fix test_ReSimulation.sh (ATLASSIM-5083)2021-09-17T23:55:57+02:00John Derek ChapmanFix test_ReSimulation.sh (ATLASSIM-5083)The test is updated to account for the fact that without further code changes
re-simulation output will not exactly match direct simulation output with a given
simulator configuration. Therefore closure checks are removed. This should fi...The test is updated to account for the fact that without further code changes
re-simulation output will not exactly match direct simulation output with a given
simulator configuration. Therefore closure checks are removed. This should fix ATLASSIM-5083.https://gitlab.cern.ch/atlas/athena/-/merge_requests/40593Fix sTGC-QL3 geometry clash (ATLASSIM-5002)2021-02-17T22:06:25+01:00Alexandre LaurierFix sTGC-QL3 geometry clash (ATLASSIM-5002)Fix a geometry clash in the NSW sTGC caused by the QL3 sectors as outlined here (ATLASSIM-5002).
An update to the QL3 geometry is also done by way of updating the xml files which described the NSW. The trapezoidal shapes had two of 6 ve...Fix a geometry clash in the NSW sTGC caused by the QL3 sectors as outlined here (ATLASSIM-5002).
An update to the QL3 geometry is also done by way of updating the xml files which described the NSW. The trapezoidal shapes had two of 6 vertexes 15mm offset from the nominal values.
The two xml files are exact copies of the latest versions, except where yCutout="545.3" have been updated to yCutout="560.4".https://gitlab.cern.ch/atlas/athena/-/merge_requests/40578Fix numerical instability in verbose output for quasi stable particle simulation2021-04-03T03:05:10+02:00Michael Duehrssen-DeblingFix numerical instability in verbose output for quasi stable particle simulationhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40565Sweeping !40459 from 21.0 to master.
Fix FCS pieciewise linear interpolation ...2021-02-12T03:04:48+01:00Atlas NightlybuildSweeping !40459 from 21.0 to master.
Fix FCS pieciewise linear interpolation lookup at edgesFix FCS pieciewise linear interpolation lookup at edges
See merge request atlas/athena!40459Fix FCS pieciewise linear interpolation lookup at edges
See merge request atlas/athena!40459https://gitlab.cern.ch/atlas/athena/-/merge_requests/40554ISF_FastCaloSimParametrization: Fix cppcheck warnings.2021-02-12T03:03:19+01:00Scott SnyderISF_FastCaloSimParametrization: Fix cppcheck warnings.- Prefer preincrement to postincrement for iterator classes.
- Fix warning about potential uninitialized use of Eigen object.- Prefer preincrement to postincrement for iterator classes.
- Fix warning about potential uninitialized use of Eigen object.https://gitlab.cern.ch/atlas/athena/-/merge_requests/40534Remove legacy codes in ISF_FastCaloSimParametrization2021-07-15T13:33:27+02:00Ahmed Hasiba.hasib@cern.chRemove legacy codes in ISF_FastCaloSimParametrizationhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40529Fix const correctness in codes related to HepMC (small MR)2021-02-16T03:05:24+01:00Andrii VerbytskyiFix const correctness in codes related to HepMC (small MR)Fix const correctness in codes related to HepMC.
The changes will reduce the number of warnings in the nightlies by ~10.Fix const correctness in codes related to HepMC.
The changes will reduce the number of warnings in the nightlies by ~10.https://gitlab.cern.ch/atlas/athena/-/merge_requests/40476Hepmc3 nightly fixes 09022021 part 22021-02-10T03:04:19+01:00Andrii VerbytskyiHepmc3 nightly fixes 09022021 part 2In this MR:
- Eliminate some warnings, mostly unused variablesIn this MR:
- Eliminate some warnings, mostly unused variableshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40472Draft: Hepmc3 nightly fixes 09022021 part 12021-02-09T15:02:15+01:00Andrii VerbytskyiDraft: Hepmc3 nightly fixes 09022021 part 1In this MR:
- Eliminate some warnings, mostly unused variablesIn this MR:
- Eliminate some warnings, mostly unused variableshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40471SimuJobTransforms/CommonSkeletonJobOptions: Switch to PerfMonMT for MT-jobs2021-02-10T03:02:18+01:00Walter LamplSimuJobTransforms/CommonSkeletonJobOptions: Switch to PerfMonMT for MT-jobsThe title says it all...The title says it all...