athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2019-04-04T09:56:08+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/21869Delete uneeded copies of pointers in sTGC Digitization (ATLASSIM-3832)2019-04-04T09:56:08+02:00Chav Chhiv ChauDelete uneeded copies of pointers in sTGC Digitization (ATLASSIM-3832)Many pointers in sTgcDigitizationTool.cxx are unnecessary and could potentially cause memory leak. So the merge request deleted the copies of pointers following the discussion in ATLASSIM-3832.Many pointers in sTgcDigitizationTool.cxx are unnecessary and could potentially cause memory leak. So the merge request deleted the copies of pointers following the discussion in ATLASSIM-3832.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21873Fix crashes related to reading 21.0 RDOs where pile-up GenEvents were not rec...2019-03-15T15:46:09+01:00John Derek ChapmanFix crashes related to reading 21.0 RDOs where pile-up GenEvents were not recorded.This fixes two crashes related to reading 21.0 RDOs where pile-up GenEvents were not recorded.
As described in ATLASRECTS-4874. (The test job in question still crashes, but at a later point
so far the reason for this third crash has not ...This fixes two crashes related to reading 21.0 RDOs where pile-up GenEvents were not recorded.
As described in ATLASRECTS-4874. (The test job in question still crashes, but at a later point
so far the reason for this third crash has not been determined.)https://gitlab.cern.ch/atlas/athena/-/merge_requests/21904Apply MMSimHit in MM fast digitization (ATLASSIM-3755)2019-03-18T17:00:11+01:00Jing ChenApply MMSimHit in MM fast digitization (ATLASSIM-3755)A new hit EDM MMSimHit had been added and used in regular digitization. Modified MuonFastDigitization package to apply MMSimHit in MM fast digitization.A new hit EDM MMSimHit had been added and used in regular digitization. Modified MuonFastDigitization package to apply MMSimHit in MM fast digitization.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21948Sweeping !21904 from 21.3 to master.
Apply MMSimHit in MM fast digitization (...2019-03-19T03:02:31+01:00Atlas NightlybuildSweeping !21904 from 21.3 to master.
Apply MMSimHit in MM fast digitization (ATLASSIM-3755)Apply MMSimHit in MM fast digitization (ATLASSIM-3755)
See merge request atlas/athena!21904Apply MMSimHit in MM fast digitization (ATLASSIM-3755)
See merge request atlas/athena!21904https://gitlab.cern.ch/atlas/athena/-/merge_requests/21916ComponentAccumulator configuration for SCT digitization2019-03-19T03:02:14+01:00Rupert TombsComponentAccumulator configuration for SCT digitizationDefine new style replacements for PixelDigitizationConfig.py.
ToolSetup dependencies also converted to new style.
ConfigFlags initialisation set up for Digitization and Overlay, with legacy keys inserted.
Also makes minor updates to B...Define new style replacements for PixelDigitizationConfig.py.
ToolSetup dependencies also converted to new style.
ConfigFlags initialisation set up for Digitization and Overlay, with legacy keys inserted.
Also makes minor updates to BCM_Digitization.
Add ConditionsStore StoreGateSvc in tests.
Tests for all new modules.
This duplicates most of https://gitlab.cern.ch/atlas/athena/merge_requests/21340, but without Pixel digitization which has ongoing issues.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21956Sweeping !21869 from 21.3 to 21.9.
Delete uneeded copies of pointers in sTGC ...2019-03-18T16:28:49+01:00Atlas NightlybuildSweeping !21869 from 21.3 to 21.9.
Delete uneeded copies of pointers in sTGC Digitization (ATLASSIM-3832)Delete uneeded copies of pointers in sTGC Digitization (ATLASSIM-3832)
See merge request atlas/athena!21869Delete uneeded copies of pointers in sTGC Digitization (ATLASSIM-3832)
See merge request atlas/athena!21869https://gitlab.cern.ch/atlas/athena/-/merge_requests/21947Sweeping !21904 from 21.3 to 21.9.
Apply MMSimHit in MM fast digitization (AT...2019-03-18T17:00:01+01:00Atlas NightlybuildSweeping !21904 from 21.3 to 21.9.
Apply MMSimHit in MM fast digitization (ATLASSIM-3755)Apply MMSimHit in MM fast digitization (ATLASSIM-3755)
See merge request atlas/athena!21904Apply MMSimHit in MM fast digitization (ATLASSIM-3755)
See merge request atlas/athena!21904https://gitlab.cern.ch/atlas/athena/-/merge_requests/22016Remove duplicate Random.Engine flags2019-03-21T03:02:39+01:00Rupert TombsRemove duplicate Random.Engine flagsAttempted fix to ATLASSIM-4107
Remove duplicate Random.Engine flags.
Remove unused BCM digitization config flags script.
Remove deprecated additions of the ConditionsStore service from the BCM digitization test.Attempted fix to ATLASSIM-4107
Remove duplicate Random.Engine flags.
Remove unused BCM digitization config flags script.
Remove deprecated additions of the ConditionsStore service from the BCM digitization test.https://gitlab.cern.ch/atlas/athena/-/merge_requests/22033Mr21869 to master2019-03-21T03:02:47+01:00Chav Chhiv ChauMr21869 to masterManually sweep MR !21869 to master.
More detail at https://gitlab.cern.ch/atlas/athena/merge_requests/21869Manually sweep MR !21869 to master.
More detail at https://gitlab.cern.ch/atlas/athena/merge_requests/21869https://gitlab.cern.ch/atlas/athena/-/merge_requests/22050Propagate the correct track link to sTGC SDO2019-05-15T15:10:53+02:00Chav Chhiv ChauPropagate the correct track link to sTGC SDOSave the correct track link in sTGC SDO, to fix a minor bug introduced when cleaning pointers in sTGC_Digitization in MR !21869.Save the correct track link in sTGC SDO, to fix a minor bug introduced when cleaning pointers in sTGC_Digitization in MR !21869.https://gitlab.cern.ch/atlas/athena/-/merge_requests/22096Sweeping !22050 from 21.3 to 21.9.
Propagate the correct track link to sTGC SDO2019-03-22T12:58:53+01:00Atlas NightlybuildSweeping !22050 from 21.3 to 21.9.
Propagate the correct track link to sTGC SDOPropagate the correct track link to sTGC SDO
See merge request atlas/athena!22050Propagate the correct track link to sTGC SDO
See merge request atlas/athena!22050https://gitlab.cern.ch/atlas/athena/-/merge_requests/21993Dealing with Multiple McEventCollections2019-03-23T03:02:10+01:00John Derek ChapmanDealing with Multiple McEventCollections!20486 allowed the possibility of `HepMcParticleLinks` which pointed different
`McEvenCollection` objects within the same event. This merge request adds the
code to allow the digitization step to create multiple `McEventCollection` objec...!20486 allowed the possibility of `HepMcParticleLinks` which pointed different
`McEvenCollection` objects within the same event. This merge request adds the
code to allow the digitization step to create multiple `McEventCollection` objects.
(One for the hard-scatter and one for each type of pile-up.) It also includes
changes to allow `FastChain_tf.py` to run with pile-up HITS inputs. The code has
been kept as similar to the versions in ~"21.3" as possible to reduce the number
of conflicts when future fixes are swept.https://gitlab.cern.ch/atlas/athena/-/merge_requests/22091Drop keyless retrieve of xAOD::EventInfo in CscDigitizationTool2019-03-23T03:02:17+01:00John Derek ChapmanDrop keyless retrieve of xAOD::EventInfo in CscDigitizationToolCscDigitizationTool was retrieving an `xAOD::EventInfo` object from the
`evtStore` and storing the event and run numbers in member variables.
These values were only used in two DEBUG messages.CscDigitizationTool was retrieving an `xAOD::EventInfo` object from the
`evtStore` and storing the event and run numbers in member variables.
These values were only used in two DEBUG messages.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21398Create pile-up events hash and store it in xAOD::EventInfo, master edition (A...2019-03-23T03:02:13+01:00Tadej Novaktadej.novak@cern.chCreate pile-up events hash and store it in xAOD::EventInfo, master edition (ATLASSIM-3795)It might be useful to have an information how many pile-up events repeat in an analysis (e.g. we get exactly the same mixture of minbias events). This MR adds a 128-bit MD5 hash of pile-up info to the `xAOD::EventInfo` objects.
!20788...It might be useful to have an information how many pile-up events repeat in an analysis (e.g. we get exactly the same mixture of minbias events). This MR adds a 128-bit MD5 hash of pile-up info to the `xAOD::EventInfo` objects.
!20788 was updated to be compatible with master. Please review again.https://gitlab.cern.ch/atlas/athena/-/merge_requests/22086PrivateTools style for ComponentAccumulators in InDetDigitization2019-03-26T03:02:21+01:00Rupert TombsPrivateTools style for ComponentAccumulators in InDetDigitizationChange from (acc, tool) tuple return to just acc with the new set/popPrivateTools methods.
Update tests.
BCM: fix comments, match flags style, remove use of CfgMgrChange from (acc, tool) tuple return to just acc with the new set/popPrivateTools methods.
Update tests.
BCM: fix comments, match flags style, remove use of CfgMgrhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/22110Add SCT_DigitizationMT_test2019-03-27T03:02:11+01:00Susumu OdaAdd SCT_DigitizationMT_testAdd SCT_DigitizationMT_test (SCT digitization job without multithreads without pileup)
https://its.cern.ch/jira/browse/ATLASSIM-3931Add SCT_DigitizationMT_test (SCT digitization job without multithreads without pileup)
https://its.cern.ch/jira/browse/ATLASSIM-3931https://gitlab.cern.ch/atlas/athena/-/merge_requests/21772Improve sTGC resolution and bug fixes2019-04-29T23:00:53+02:00Alexandre LaurierImprove sTGC resolution and bug fixesImprovements to NSW-sTGC digitization.
Change the resolution dependance on the incidence angle to a more recent, better model as described by @kluit . Cleaning up general code and adding functionalities to stop using hard-coded values.
...Improvements to NSW-sTGC digitization.
Change the resolution dependance on the incidence angle to a more recent, better model as described by @kluit . Cleaning up general code and adding functionalities to stop using hard-coded values.
@cchau @rosati @wleighthttps://gitlab.cern.ch/atlas/athena/-/merge_requests/22024ComponentAccumulator: Introduce "primary component"2019-03-29T03:02:33+01:00Walter LamplComponentAccumulator: Introduce "primary component"This is the squashed version of the lenghty WIP-MR !21809
Instead of returning a tuple (ComponentAccumulator,PrimaryComponent) from configuration methods, designate a primary component inside the ComponentAccumulator.
This MR makes th...This is the squashed version of the lenghty WIP-MR !21809
Instead of returning a tuple (ComponentAccumulator,PrimaryComponent) from configuration methods, designate a primary component inside the ComponentAccumulator.
This MR makes the necessary changes to ComponentAccumulator.py and adjust some but not all of the existing new-style configuration code.https://gitlab.cern.ch/atlas/athena/-/merge_requests/22208Sweeping !21772 from 21.3 to 21.9.
Improve sTGC resolution and bug fixes2019-03-28T17:24:55+01:00Atlas NightlybuildSweeping !21772 from 21.3 to 21.9.
Improve sTGC resolution and bug fixesImprove sTGC resolution and bug fixes
See merge request atlas/athena!21772Improve sTGC resolution and bug fixes
See merge request atlas/athena!21772https://gitlab.cern.ch/atlas/athena/-/merge_requests/22121Merge 21.0.95 into 21.3 branch2019-03-28T18:03:15+01:00John Derek ChapmanMerge 21.0.95 into 21.3 branchThis merge request merges the changes that went into the ~"21.0" branch between the [release/21.0.94](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.94) and
[release/21.0.95](https://gitlab.cern.ch/atlas/athena/tags/release/21.0....This merge request merges the changes that went into the ~"21.0" branch between the [release/21.0.94](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.94) and
[release/21.0.95](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.95) tags into the ~"21.3" branch.
MRs in https://gitlab.cern.ch/atlas/athena/tags/nightly/21.0/2019-02-13T2159, accepted since https://gitlab.cern.ch/atlas/athena/tags/nightly/21.0/2019-03-20T2159 :
* !21887 : 21.0-FastCaloSim: Adding function LoadFCalGeometryFromFiles to CaloGeometryFromFile
* !21917 : Updating to the latest version of FastCaloSimV2 parametrization file
* !21963 : Add protection for rounding errors
* !21859 : Fix failure on invalid LumiAccounting data (affected 301915 and 301918)
* !21828 : xAOD::EventInfo conversion fix in PileUpEventLoopMgr (ATLASSIM-4081)
* !21598 : R-Hadron Mass Updates
* !21660 : Patch preInclude.Qball.py to work-around missing specialConfiguration metadata
* !21682 : User action that dumps all volumes and classifies them.
* !21699 : Fix for TrigAnalysisTest test test_mc_ntup_physval_grid.sh
* !21722 : 21.0-FastCaloSim: Removing LoadFCalGeometryFromFiles function
* !21764 : Added more histograms as a function of initial step vol/process/material
* !21768 : Protection for empty GenEvents in BeamEffectsAlg::patchSignalProcessVertex(...)
* !21114 : DerivationFrameworkInDet: Fixes DOAD_IDTIDE derivation format
* !21646 : Patch Simulation RunTier0Test job, so that it works in AthSimulation builds
* !20467 : Optimization of CPU time of FastCaloSimV2 (ATLASSIM-3980)
* !21400 : Tier0Tests: Add versioning for overlay background RDO samples
* !21412 : Add new tests to TrigAnalysisTest ART tests
* !21422 : Fixes for Qball simulation configuration
* !21465 : replaces parameterized_sin with parameterized_sincos ~"changes\-fullsim\-output"
* !21492 : MC overlay ART updates (21.0 branch)
* !21520 : Sweeping !21432 from 21.3 to 21.0.
* !21539 : 21.0-ART_test-InDetPhysValMonitoring
* !21577 : 2018PbPb overlay config update
* !21587 : 21.0 SimulationJobOptions: Fix in postInclude.HijingPars.py to get output streams from correct locations
* !20214 : PixelRadDamDigitization: Algorithm for interpolation of irraditaed E fields
* !21336 : Tilecal new laser unpack 2019 02 19
* !21349 : Sweeping !21299 from 21.3 to 21.0.
* !21374 : Sweeping !21326 from 21.3 to 21.0.
* !21460 : RadiationMapsMaker: added flux for >100 keV neutrons and charged hadrons
* !21256 : Sweeping !21226 from master to 21.0.
* !21221 : TileJetMonTool: update of the tool
* !21163 : 21.0-ISF_FastCaloSim: Adding TFCSCenterPositionCalculation to the simulation chain
* !21074 : Switch off AthSimulation ART-build tests for unsupported Simulation configurations
The full diff between [release/21.0.95](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.95) and
[release/21.0.94](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.94) is available at https://gitlab.cern.ch/atlas/athena/compare/release/21.0.94...release/21.0.95
7d996a63