athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-09-09T03:03:22+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/46347Add RenameHitCollectionAlg2021-09-09T03:03:22+02:00John Derek ChapmanAdd RenameHitCollectionAlgThis Algorithm is used to rename Hit collections back to their original names in ReSimulation jobs.
It is used in the case that the current event does not need to be resimulated and so the original
HitCollections are still valid.
This i...This Algorithm is used to rename Hit collections back to their original names in ReSimulation jobs.
It is used in the case that the current event does not need to be resimulated and so the original
HitCollections are still valid.
This is a partial sweep of !39019 from ~"21.0".
(It could be argued that separate algorithms might be faster, but this would need to be checked before being changed.)https://gitlab.cern.ch/atlas/athena/-/merge_requests/46281Add SimEventFilter Algorithm for ReSimulation Workflow2021-09-10T12:40:43+02:00John Derek ChapmanAdd SimEventFilter Algorithm for ReSimulation WorkflowPartial sweep of the changes in !39019 and !40442.
Also add ComponentAccumulator-based configuration for SimEventFilter.Partial sweep of the changes in !39019 and !40442.
Also add ComponentAccumulator-based configuration for SimEventFilter.https://gitlab.cern.ch/atlas/athena/-/merge_requests/46279Manual sweep of !39842 from 21.0 to master: ISF EntryLayerTool: Avoid using B...2021-09-07T03:04:18+02:00John Derek ChapmanManual sweep of !39842 from 21.0 to master: ISF EntryLayerTool: Avoid using BeginEvent Incident to Trigger TrackRecordCollection creationISF EntryLayerTool: Avoid using BeginEvent Incident to Trigger TrackRecordCollection creation
See merge request atlas/athena!39842
`EntryLayerToolMT` is also updated to conform to the updated `IEntryLayerTool` interface.
FYI @mduehrssISF EntryLayerTool: Avoid using BeginEvent Incident to Trigger TrackRecordCollection creation
See merge request atlas/athena!39842
`EntryLayerToolMT` is also updated to conform to the updated `IEntryLayerTool` interface.
FYI @mduehrsshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46277Sweep TruthResetAlg and TruthClosureCheck from 21.0 to master2021-09-07T03:03:49+02:00John Derek ChapmanSweep TruthResetAlg and TruthClosureCheck from 21.0 to masterThis merge request is a partial sweep of the changes in !39019.
It adds the TruthResetAlg and TruthClosureCheck algorithms used in the ReSimulation workflow.
FYI @mduehrssThis merge request is a partial sweep of the changes in !39019.
It adds the TruthResetAlg and TruthClosureCheck algorithms used in the ReSimulation workflow.
FYI @mduehrsshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/45591Sweeping !45471 from 21.0 to master.
Expand RegularFormula class to handle sp...2021-08-04T03:05:41+02:00Atlas NightlybuildSweeping !45471 from 21.0 to master.
Expand RegularFormula class to handle special characters via escapeExpand RegularFormula class to handle special characters via escape
See merge request atlas/athena!45471Expand RegularFormula class to handle special characters via escape
See merge request atlas/athena!45471https://gitlab.cern.ch/atlas/athena/-/merge_requests/45192Sweeping !45158 from 21.0 to master.
Retry simulation if FCal cell assignment...2021-07-16T03:05:00+02:00Atlas NightlybuildSweeping !45158 from 21.0 to master.
Retry simulation if FCal cell assignment failsRetry simulation if FCal cell assignment fails
See merge request atlas/athena!45158Retry simulation if FCal cell assignment fails
See merge request atlas/athena!45158https://gitlab.cern.ch/atlas/athena/-/merge_requests/45165Manual sweep of !41282 and !40534 from 21.0 to master2021-07-16T03:03:08+02:00John Derek ChapmanManual sweep of !41282 and !40534 from 21.0 to masterFix reproducibility in FCS mpt getRand() by using TFCS custom hist classes
Move to using TFCS custom histogram classes rather than TF1/TF2 in PunchThroughTools PDFcreator.cxx getRand(). Drawing random numbers from TF1/TF2 via getRandom...Fix reproducibility in FCS mpt getRand() by using TFCS custom hist classes
Move to using TFCS custom histogram classes rather than TF1/TF2 in PunchThroughTools PDFcreator.cxx getRand(). Drawing random numbers from TF1/TF2 via getRandom() causes reproducibility issues. New implementation allows for the use of CLHEP random number generator.
See merge request atlas/athena!41282
Remove legacy codes in ISF_FastCaloSimParametrization
See merge request atlas/athena!40534
FYI @thcarter, @ahasibhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/43118Merge 21.0.125 and 21.0.126 into 21.3 branch2021-05-04T16:16:56+02:00John Derek ChapmanMerge 21.0.125 and 21.0.126 into 21.3 branchThis is the list of merge requests that were included bewtween [release/21.0.125](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.125) and the previous release [release/21.0.124](https://gitlab.cern.ch/atlas/athena/tags/release/21....This is the list of merge requests that were included bewtween [release/21.0.125](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.125) and the previous release [release/21.0.124](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.124):
- !42930 : Reporting events which passed ISF_SimEventFilter for ReSim jobs (ATLASJT-417)
- !42865 : Add property to scale xtalk between middle and back layer of LArEM
- !42861 : Sweeping !42812 from 21.3 to 21.0.
- !42789 : egamma ART change from master to rel21
- !42474 : Sweeping !42384 from 21.2 to 21.0.
- !42530 : additional histograms for egamma ART
- !42307 : Add missing Charginos package to AthSimulation project
- !42294 : Apply ZeroLifetimePositioner to all neutral mesons with oscillations: B0, B0s, D0
- !42337 : Changes to propagate Pile-up xAOD::Truth information to HITS files
- !42172 : Adding LAr cell DQ plots to UPC stream
- !42332 : TCT: Increasing memory for AthenaMP tests and updating the comparison step
- !41970 : Fix test_Sim_FullG4_ZPrime_QuasiStable.sh in AthSimulation nightlies
- !42031 : Fix for ALFA_SimHitsTestTool (ATLASSIM-5034)
This is the list of merge requests that were included bewtween [release/21.0.126](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.126) and the previous release [release/21.0.125](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.125):
* !42991 : Reporting ReSim events to the jobReport (ATLASJT-417)
Link to the full diff between [release/21.0.126](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.126) and
[release/21.0.124](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.124)
is available at https://gitlab.cern.ch/atlas/athena/compare/release/21.0.124...release/21.0.126https://gitlab.cern.ch/atlas/athena/-/merge_requests/42615Sweeping changes for ReSimulation Workflow to master2021-09-20T21:47:13+02:00John Derek ChapmanSweeping changes for ReSimulation Workflow to masterTechnically this is a sweep of merge requests:
atlas/athena!39019, atlas/athena!40307, atlas/athena!40442,
atlas/athena!40456, atlas/athena!40598, atlas/athena!40983,
atlas/athena!41440, atlas/athena!41202
However, in practice most of th...Technically this is a sweep of merge requests:
atlas/athena!39019, atlas/athena!40307, atlas/athena!40442,
atlas/athena!40456, atlas/athena!40598, atlas/athena!40983,
atlas/athena!41440, atlas/athena!41202
However, in practice most of the configuration has been re-written.
Due to the improved `AddressRemappingSvc` implementation in ~master it is possible
to run the ReSimulation workflow in a single Athena job rather than having
a separate initial job where the containers in the HITS file are renamed.
ComponentAccumulator-based configuration will be implemented in a separate
merge request.https://gitlab.cern.ch/atlas/athena/-/merge_requests/42560Apply ZeroLifetimePositioner to all neutral mesons with oscillations: B0, B0s...2021-04-15T03:03:09+02:00Michael Duehrssen-DeblingApply ZeroLifetimePositioner to all neutral mesons with oscillations: B0, B0s, D0Manual sweep of !42294 into masterManual sweep of !42294 into masterhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/42308Manual sweep of !42307 from 21.0 to master: Add missing Charginos package to ...2021-04-08T03:02:43+02:00John Derek ChapmanManual sweep of !42307 from 21.0 to master: Add missing Charginos package to AthSimulation projecthttps://gitlab.cern.ch/atlas/athena/-/merge_requests/42035Fix for ALFA_SimHitsTestTool (ATLASSIM-5034)2021-03-30T03:03:44+02:00John Derek ChapmanFix for ALFA_SimHitsTestTool (ATLASSIM-5034)`ALFA_SensitiveDetector` can make hits with `plate==100` for `GVS` volumes.
Usually `0<plate<10`. The hit plotting code in `ALFA_SimHitsTestTool` assumes
a maximum value of 10 when it uses `plate` as the index to arrays, so when a
hit wi...`ALFA_SensitiveDetector` can make hits with `plate==100` for `GVS` volumes.
Usually `0<plate<10`. The hit plotting code in `ALFA_SimHitsTestTool` assumes
a maximum value of 10 when it uses `plate` as the index to arrays, so when a
hit with `plate==100` is processed this ends up well outside the array and
corrupts the stack. The fix is to put the `GVS` hits into a separate histogram,
skipping the stage where they are used as the index to an array.
Closes ATLASSIM-5034https://gitlab.cern.ch/atlas/athena/-/merge_requests/42034Manual sweep of !42031 from 21.0 to 21.9: Fix for ALFA_SimHitsTestTool (ATLAS...2021-03-30T03:06:18+02:00John Derek ChapmanManual sweep of !42031 from 21.0 to 21.9: Fix for ALFA_SimHitsTestTool (ATLASSIM-5034)`ALFA_SensitiveDetector` can make hits with `plate==100` for `GVS` volumes.
Usually `0<plate<10`. The hit plotting code in `ALFA_SimHitsTestTool` assumes
a maximum value of 10 when it uses `plate` as the index to arrays, so when a
hit wi...`ALFA_SensitiveDetector` can make hits with `plate==100` for `GVS` volumes.
Usually `0<plate<10`. The hit plotting code in `ALFA_SimHitsTestTool` assumes
a maximum value of 10 when it uses `plate` as the index to arrays, so when a
hit with `plate==100` is processed this ends up well outside the array and
corrupts the stack. The fix is to put the `GVS` hits into a separate histogram,
skipping the stage where they are used as the index to an array.
Closes ATLASSIM-5034https://gitlab.cern.ch/atlas/athena/-/merge_requests/42032Manual sweep of !42031 from 21.0 to 21.3: Fix for ALFA_SimHitsTestTool (ATLAS...2021-03-28T03:05:07+02:00John Derek ChapmanManual sweep of !42031 from 21.0 to 21.3: Fix for ALFA_SimHitsTestTool (ATLASSIM-5034)`ALFA_SensitiveDetector` can make hits with `plate==100` for `GVS` volumes.
Usually `0<plate<10`. The hit plotting code in `ALFA_SimHitsTestTool` assumes
a maximum value of 10 when it uses `plate` as the index to arrays, so when a
hit wi...`ALFA_SensitiveDetector` can make hits with `plate==100` for `GVS` volumes.
Usually `0<plate<10`. The hit plotting code in `ALFA_SimHitsTestTool` assumes
a maximum value of 10 when it uses `plate` as the index to arrays, so when a
hit with `plate==100` is processed this ends up well outside the array and
corrupts the stack. The fix is to put the `GVS` hits into a separate histogram,
skipping the stage where they are used as the index to an array.
Closes ATLASSIM-5034https://gitlab.cern.ch/atlas/athena/-/merge_requests/41923Merge 21.0.124 into 21.32021-03-27T09:03:27+01:00John Derek ChapmanMerge 21.0.124 into 21.3This merge request merges all the changes that were made to the ~"21.0" branch between the release
[release/21.0.124](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.124) and the previous release
[release/21.0.123](https://gitlab.c...This merge request merges all the changes that were made to the ~"21.0" branch between the release
[release/21.0.124](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.124) and the previous release
[release/21.0.123](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.123).
Below is the full list of merge requests that were included between these two tags:
* !41777 : PyEvtFilterFromFile - extention of PyEvtFilter functionality
* !41766 : Sweeping !41744 from 21.3 to 21.0.
* !41587 : Move G4particle_whitelist.txt to TruthUtils so that it is available in AthSimulation
* !41282 : Fix reproducibility in FCS mpt getRand() by using TFCS custom hist classes
* !41629 : Update default radius beyond which particles are considered as quasi-stable and make configurable
* !41603 : Update particle flow in HeavyIon running
* !41454 : Fix the switch of Tile-Muon coincidence with DB contents for MC16e (ATR-22584)
* !41539 : removing tmdb simulation from RDOtoRDOTrig step
* !41440 : Drop dumping of StoreGateSvc contents to the log in ReSimulation workflow
* !41438 : Enable quasi-stable particle Simulation in the AthSimulation project
* !41428 : Revert "Merge branch 'mhodgkin_HIPFlowJetClusters' into '21.0'"
* !41258 : Update HeavyIon PFO cluster links
* !41154 : Sweeping !41051 from 21.2 to 21.0.
* !41202 : Clean-up test_ReSimulation.sh (ATLASSIM-5083)
* !40971 : mpt PDFcreator getRand() pass by reference to map comparators
* !36219 : Bugfix for truth local x position of the particle in the cluster
Link to the full diff between [release/21.0.124](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.124) and
[release/21.0.123](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.123)
is available at
https://gitlab.cern.ch/atlas/athena/compare/release/21.0.123...release/21.0.124https://gitlab.cern.ch/atlas/athena/-/merge_requests/41922Merge 21.0.123 into 21.32021-03-26T10:12:21+01:00John Derek ChapmanMerge 21.0.123 into 21.3This merge request merges all the changes that were made to the ~"21.0" branch between the release
[release/21.0.123](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.123) and the previous release
[release/21.0.122](https://gitlab.c...This merge request merges all the changes that were made to the ~"21.0" branch between the release
[release/21.0.123](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.123) and the previous release
[release/21.0.122](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.122).
Below is the full list of merge requests that were included between these two tags:
* !41115 : Revert "Merge branch 'mhodgkin_HIPFlowJetClusters' into '21.0'"
* !40881 : Adding TP Separation for LUCID_SimHitCollection to 21.0
* !40983 : Fix ReSimulation ART job (ATLASSIM-4959)
* !40977 : Change art diff to run only on successful reco
* !40968 : fix zero integral error in PDFcreator::getRand()
* !40912 : Do not simulate particles that fail extrapolation to ID-Calo surface
* !40671 : Adjust CaloCluster links to charged PFO for HI reprocessing
* !40797 : Ensure that the PDGTable.MeV file is only copied locally once during the simulation configuration.
* !40807 : libpng Fix, 21.0 branch (2021.02.18.)
* !40785 : AFP Webdisplay: Config files updated with new histograms [rel 21]
* !40788 : add the missing algorithm header
* !39958 : FastCaloSim Gaussian Correlated Fluctuations
* !40611 : Update AF3 parametrization file for run 2 re-processing
* !40442 : Minor tidying of SimEventFilter
* !40598 : Fix test_ReSimulation.sh (ATLASSIM-5083)
* !40578 : Fix numerical instability in verbose output for quasi stable particle simulation
* !40493 : fixing seg fault when jets don't have btagging aux info
* !40534 : Remove legacy codes in ISF_FastCaloSimParametrization
* !40446 : Added electron/muon comparison plot
* !40459 : Fix FCS pieciewise linear interpolation lookup at edges
* !40338 : FastCaloSim: add mechanism to better clean up the AuxInfo in the simulation state
* !40388 : Update TestBeam_tf.py to use addSimIOTrfArgs
* !40456 : Changes so that ReSim_tf.py runs in AthenaMP
* !40340 : Adding Benedtto/LHCC scripts
* !40268 : Sweeping !40069 from 21.0-mc16d to 21.0.
* !40394 : Turn off diff-pool in AF3 tests (ATLASSIM-5045)
Link to the full diff between [release/21.0.123](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.123) and
[release/21.0.122](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.122)
is available at
https://gitlab.cern.ch/atlas/athena/compare/release/21.0.122...release/21.0.123https://gitlab.cern.ch/atlas/athena/-/merge_requests/41921Merge 21.0.122 into 21.32021-03-26T18:59:45+01:00John Derek ChapmanMerge 21.0.122 into 21.3This merge request merges all the changes that were made to the ~"21.0" branch between the release
[release/21.0.122](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.122) and the previous release
[release/21.0.121](https://gitlab.c...This merge request merges all the changes that were made to the ~"21.0" branch between the release
[release/21.0.122](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.122) and the previous release
[release/21.0.121](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.121).
Below is the full list of merge requests that were included between these two tags:
* !40192 : Adding csv framework+plotting scripts
* !40307 : Updates for Re-simulation workflow
* !38526 : ZDC development branch to be merged into 21.0 ~"changes-run2-reconstruction-output"
* !39948 : Fix bunch intensity values in LHCBunchCrossingTool
* !40176 : Update rel21 muon reco ART tests
* !39019 : Quasi stable particle sim on the fly
* !39965 : Update the Quasi-stable particle checks in GenParticleSimWhiteList
* !40073 : Fix distance computation bug in FCS extrapolator
* !39911 : update AF3 regression test (ATLASSIM-5045)
* !39661 : TMDB simulation in RDOtoRDO_Trigger step
* !39842 : ISF EntryLayerTool: Avoid using BeginEvent Incident to Trigger TrackRecordCollection creation
* !39622 : Fix CaloJiveXML to read ESD and RDO level clusters
* !39759 : Sweeping !39606 from master to 21.0.
* !39760 : Sweeping !39711 from master to 21.0.
* !39693 : Sweeping !39645 from master to 21.0.
* !39716 : Make McEventCollectionCnv_p5_test and McEventCollectionCnv_p4_test more robust
* !39678 : ATLFAST3 simulator
* !39627 : Sweeping !39556 from master to 21.0.
Link to the full diff between [release/21.0.122](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.122) and
[release/21.0.121](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.121)
is available at
https://gitlab.cern.ch/atlas/athena/compare/release/21.0.121...release/21.0.122https://gitlab.cern.ch/atlas/athena/-/merge_requests/41870Manual sweep of !41587 from 21.0 to master: Move G4particle_whitelist.txt to ...2021-03-26T11:12:05+01:00John Derek ChapmanManual sweep of !41587 from 21.0 to master: Move G4particle_whitelist.txt to TruthUtils so that it is available in AthSimulationMove G4particle_whitelist.txt to TruthUtils so that it is available in AthSimulation
See merge request atlas/athena!41587Move G4particle_whitelist.txt to TruthUtils so that it is available in AthSimulation
See merge request atlas/athena!41587https://gitlab.cern.ch/atlas/athena/-/merge_requests/41869Manual sweep of !41587 from 21.0 to 21.6: Move G4particle_whitelist.txt to Tr...2021-03-26T03:06:01+01:00John Derek ChapmanManual sweep of !41587 from 21.0 to 21.6: Move G4particle_whitelist.txt to TruthUtils so that it is available in AthSimulationMove G4particle_whitelist.txt to TruthUtils so that it is available in AthSimulation
See merge request atlas/athena!41587
Swept to ~"21.6" to keep things consistent, but it's up to @ewelina whether or not we want this change in ~"21.6".Move G4particle_whitelist.txt to TruthUtils so that it is available in AthSimulation
See merge request atlas/athena!41587
Swept to ~"21.6" to keep things consistent, but it's up to @ewelina whether or not we want this change in ~"21.6".https://gitlab.cern.ch/atlas/athena/-/merge_requests/41858Sweeping !41777 from 21.0 to master.
PyEvtFilterFromFile - extention of PyEvt...2021-03-26T03:02:44+01:00Atlas NightlybuildSweeping !41777 from 21.0 to master.
PyEvtFilterFromFile - extention of PyEvtFilter functionalityPyEvtFilterFromFile - extention of PyEvtFilter functionality
See merge request atlas/athena!41777PyEvtFilterFromFile - extention of PyEvtFilter functionality
See merge request atlas/athena!41777