athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-09-17T23:55:51+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/40456Changes so that ReSim_tf.py runs in AthenaMP2021-09-17T23:55:51+02:00John Derek ChapmanChanges so that ReSim_tf.py runs in AthenaMPUpdates to the RenameHITS substep.
- This now writes a HITS_RNM file, rather
than a HITS_MRG file to avoid name clashes with any MP-related HITS merging.
- Set the `disableMP=True` option in the `athenaExecutor` contruction for this
sub-...Updates to the RenameHITS substep.
- This now writes a HITS_RNM file, rather
than a HITS_MRG file to avoid name clashes with any MP-related HITS merging.
- Set the `disableMP=True` option in the `athenaExecutor` contruction for this
sub-step. This forces it to run in serial Athena even if `nprocs` is set.
Updates to the ReSim substep.
- This now takes a HITS_RNM file as input.
- outputHITS_RNMFile is now of type `argHITSFile` rather than `argPOOLFile`.
With these changes then:
```
--athenaopts "ReSim:--nprocs=8"
```
on the command-line or simply setting the usual environment variable:
```
export ATHENA_PROC_NUMBER=8
```
is all that is needed to make the second sub-step of `ReSim_tf.py`, but not the first, run in AthenaMP. Output merging works as normal. What I haven't yet tested is whether there is any issue with the job metadata recorded.
FYI @mduehrss, @elmsheus, @rmazini, @pbertahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40455Remove deprecated XbbScore variables from HbbCommon2021-02-14T03:07:18+01:00Julia Lynne GonskiRemove deprecated XbbScore variables from HbbCommonReplacing the addRecommendedXbbTaggers decorations with a return, so old `XbbScores` aren't written to any output DAODs. This is to alleviate confusion with the current `Xbb202006` score which is added to existing DAODs and not run at De...Replacing the addRecommendedXbbTaggers decorations with a return, so old `XbbScores` aren't written to any output DAODs. This is to alleviate confusion with the current `Xbb202006` score which is added to existing DAODs and not run at DerivationFramework level.
Tagging @dguest, @vdao, and @vvecchio to check correctness/completeness. Adding @sanmay, @duperrin and @cschiavi to review.https://gitlab.cern.ch/atlas/athena/-/merge_requests/40394Turn off diff-pool in AF3 tests (ATLASSIM-5045)2021-04-03T03:05:10+02:00Ahmed Hasiba.hasib@cern.chTurn off diff-pool in AF3 tests (ATLASSIM-5045)* Need to turn off the `diff-pool` test since these simulations are running in `AthenaMP` and results a difference if they are added up in a different order. `diff-root` is sufficient for these tests.
* Removing frozen showers from FCAl ...* Need to turn off the `diff-pool` test since these simulations are running in `AthenaMP` and results a difference if they are added up in a different order. `diff-root` is sufficient for these tests.
* Removing frozen showers from FCAl as they are not need for AF3https://gitlab.cern.ch/atlas/athena/-/merge_requests/40307Updates for Re-simulation workflow2021-09-17T23:55:33+02:00John Derek ChapmanUpdates for Re-simulation workflowThis merge request makes one minor update to `ReSim_tf.py` and updates the corresponding ART test.
FYI @mduehrss, @rmazini, @pbertaThis merge request makes one minor update to `ReSim_tf.py` and updates the corresponding ART test.
FYI @mduehrss, @rmazini, @pbertahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/40073Fix distance computation bug in FCS extrapolator2021-03-24T15:24:21+01:00Joshua Falco Beirerjoshua.beirer@cern.chFix distance computation bug in FCS extrapolatorThis MR fixes a bug in the FCS extrapolator for which negative distances as a consequence of precision artifacts resulted in bad extrapolation. Unphysical negative distances are now forced to 0 and additional debug messages are added.This MR fixes a bug in the FCS extrapolator for which negative distances as a consequence of precision artifacts resulted in bad extrapolation. Unphysical negative distances are now forced to 0 and additional debug messages are added.https://gitlab.cern.ch/atlas/athena/-/merge_requests/39957Make HitIdentifierHelper with HGTD support backwards-compatible2021-02-02T20:35:04+01:00Nicholas StylesMake HitIdentifierHelper with HGTD support backwards-compatibleAddressing issues in !38312 to allow existing Run4 HITS to be supported.
If ```DetFlags.geometry.HGTD_on()``` (same condition for generating HGTD_ID Dictionary) we change the version string in the Identifier dictionary. For existing ver...Addressing issues in !38312 to allow existing Run4 HITS to be supported.
If ```DetFlags.geometry.HGTD_on()``` (same condition for generating HGTD_ID Dictionary) we change the version string in the Identifier dictionary. For existing versions, using version "SLHC", things will remain consistent. For the new version with "ITkHGTD" we expand the "part" range.
For the moment this means the status of ```HGTD_on``` must be consistent between all processing steps (sim, digi, reco). **This is only a temporary fix** to avoid reverting !38312 - longer term we should be able to run a set of HITS with and without HGTD on, and for this we should a parameter from the Geometry tag to determine how we initialize the ```SiHitIdHelper```.
FYI @ncalace @tstreble @dshope @cohm @tadejhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39953Update of simulation reference file after merge of !399002021-01-26T03:02:56+01:00John Derek ChapmanUpdate of simulation reference file after merge of !39900!39900 updated the Geant4 version to Geant4 10.6.patch03.atlas01,
so changed the simulation output.
FYI @fwinkl, @mduehrss, @bmorgan, @mbandier!39900 updated the Geant4 version to Geant4 10.6.patch03.atlas01,
so changed the simulation output.
FYI @fwinkl, @mduehrss, @bmorgan, @mbandierhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39911update AF3 regression test (ATLASSIM-5045)2021-03-24T15:24:21+01:00Ahmed Hasiba.hasib@cern.chupdate AF3 regression test (ATLASSIM-5045)adding `--order-trees` in regression test since the simulations run in MPadding `--order-trees` in regression test since the simulations run in MPhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39703Fix the errors in 392362021-01-19T03:05:47+01:00Andrii VerbytskyiFix the errors in 39236Fix the errors in !39236
(the errors would emerge only in HepMC3 branch builds)
@wlampl @jchapmanFix the errors in !39236
(the errors would emerge only in HepMC3 branch builds)
@wlampl @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39678ATLFAST3 simulator2021-07-20T11:36:10+02:00Ahmed Hasiba.hasib@cern.chATLFAST3 simulator* Adding ATLFAST3 simulator
* Renaming G4FastCalo_QS to ATLFAST3_QS
* FastCaloSimSvcV2 will run muon punch through by default
@jchapman @mduehrss* Adding ATLFAST3 simulator
* Renaming G4FastCalo_QS to ATLFAST3_QS
* FastCaloSimSvcV2 will run muon punch through by default
@jchapman @mduehrsshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39154Fix quasi stable particle sim2021-01-15T14:42:50+01:00Michael Duehrssen-DeblingFix quasi stable particle simMR to fix the calculation of the particle lifetime in quasi stable particle simulation. This issue was seen during the validation, see ATLASSIM-172 and https://atlas.web.cern.ch/Atlas/GROUPS/PHYSICS/PLOTS/FTAG-2020-002/. The old calculat...MR to fix the calculation of the particle lifetime in quasi stable particle simulation. This issue was seen during the validation, see ATLASSIM-172 and https://atlas.web.cern.ch/Atlas/GROUPS/PHYSICS/PLOTS/FTAG-2020-002/. The old calculation used only the vertex information to calculate the lifetime. However, at least with some generators, the vertex information was numerically not sufficiently precise, so the calculation is now changed to use only the vertex space-distance and take the time information from the particle 4-momentum propagationhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39019Quasi stable particle sim on the fly2021-09-17T23:55:26+02:00Michael Duehrssen-DeblingQuasi stable particle sim on the flyMR to enable a new workflow: existing simulation HIT files are read in, only events that match certain conditions are re-simulated, while all other events are just copied into the output. The initial filter will look for events that woul...MR to enable a new workflow: existing simulation HIT files are read in, only events that match certain conditions are re-simulated, while all other events are just copied into the output. The initial filter will look for events that would pass the selection conditions for quasi-stable particles to enable a re-simulation of only those events as part of the MC16 re-processing
Test with ART test test_ReSimulation.shhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/38704Remove more hardcoded numbers of tubes per layer2020-12-03T20:33:44+01:00Nicolas KoehlerRemove more hardcoded numbers of tubes per layerHi,
this MR removes some more occurences of hardcoded numbers of MDT tubes per tube layer.
This MR fixes ATLASRECTS-5808, it also fixes ATR-22452 and also fixes ATLASSIM-4986.
It also is a preparation step for ATLASRECTS-5792 where we...Hi,
this MR removes some more occurences of hardcoded numbers of MDT tubes per tube layer.
This MR fixes ATLASRECTS-5808, it also fixes ATR-22452 and also fixes ATLASSIM-4986.
It also is a preparation step for ATLASRECTS-5792 where we aim to go for one centralised definition (ideally dynamically during runtime) of the maximum number of tubes.
Best, Nicohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/38637Avoid DB configuration dependency in InDetGMFlags2020-12-01T11:35:19+01:00Edward MoyseAvoid DB configuration dependency in InDetGMFlagsTry to address ATR-22390, ATLASRECTS-5778
(This is a copy of !38595, with just one fix)Try to address ATR-22390, ATLASRECTS-5778
(This is a copy of !38595, with just one fix)https://gitlab.cern.ch/atlas/athena/-/merge_requests/38595Avoid DB configuration dependency in InDetGMFlags2020-11-28T04:59:51+01:00Peter OnyisiAvoid DB configuration dependency in InDetGMFlagsTry to address ATR-22390, ATLASRECTS-5778Try to address ATR-22390, ATLASRECTS-5778https://gitlab.cern.ch/atlas/athena/-/merge_requests/38436Fix inconsistent pile-up decorations2020-11-30T13:16:48+01:00Tadej Novaktadej.novak@cern.chFix inconsistent pile-up decorationsWe recently discovered that pile-up decorations are inconsistently done for MC and data (ATEAM-672). This MR tries to fix that:
- rename the decorations and all clients to be consistent with `xAOD::EventInfo` (thanks @tsulaia)
- add `N...We recently discovered that pile-up decorations are inconsistently done for MC and data (ATEAM-672). This MR tries to fix that:
- rename the decorations and all clients to be consistent with `xAOD::EventInfo` (thanks @tsulaia)
- add `NoPileUpMuWriter` to just decorate zeros for MC without pile-up
I can run `q221` and `q440` fine locally.
Labelling ~urgent as this is needed for new samples production.
/cc @ssnyder, @akraszna, @jchapman, @jburrhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/38126Change default mpt eta window in ISF_FastCaloSimServices AdditionalConfig.py2021-01-15T14:42:51+01:00Thomas Michael CarterChange default mpt eta window in ISF_FastCaloSimServices AdditionalConfig.pyMinor change to FCS AdditionalConfig.py to allow punch through tools to work in negative eta range as default.Minor change to FCS AdditionalConfig.py to allow punch through tools to work in negative eta range as default.Thomas Michael CarterThomas Michael Carterhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/37622More robust bin selection based on outEnergy in PunchThroughTools PDFcreator....2021-01-15T14:42:51+01:00Thomas Michael CarterMore robust bin selection based on outEnergy in PunchThroughTools PDFcreator.cxx getRand()New bin stepping in case of empty y-projection when determining kinematics based on punch through particle outEnergy. Now step incrementally towards projectionX bin with most entries rather than centre of histogram.
Tested with 10k eve...New bin stepping in case of empty y-projection when determining kinematics based on punch through particle outEnergy. Now step incrementally towards projectionX bin with most entries rather than centre of histogram.
Tested with 10k events of 100GeV 800Gev and 5TeV single pions.Thomas Michael CarterThomas Michael Carterhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/37533updates for gaudi v34r12021-01-15T15:49:55+01:00Charles Leggettupdates for gaudi v34r1 * nlohmann dependency
* autoretrieval of AlgTools by Services, check for data deps
* IDataHandleHolder::renounceInput
* Python type support for DataHandles (this supersedes !36864 which contains many more details on the implemen... * nlohmann dependency
* autoretrieval of AlgTools by Services, check for data deps
* IDataHandleHolder::renounceInput
* Python type support for DataHandles (this supersedes !36864 which contains many more details on the implementation)
Note to RC: There are many commits, but please **do not squash**.https://gitlab.cern.ch/atlas/athena/-/merge_requests/37435allow for control of FCS muon punch through simulation via Job Options2020-11-12T11:27:11+01:00Thomas Michael Carterallow for control of FCS muon punch through simulation via Job OptionsAdd the ability to turn on the FCS muon punch through simulation, and supply custom parameterisation file via the Sim_tf.py --PreExec job options.Add the ability to turn on the FCS muon punch through simulation, and supply custom parameterisation file via the Sim_tf.py --PreExec job options.Thomas Michael CarterThomas Michael Carter