athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-04-15T03:06:09+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/42475Sweeping !42384 from 21.2 to 21.3.
Fix issue with short index for IOVPayload ...2021-04-15T03:06:09+02:00Atlas NightlybuildSweeping !42384 from 21.2 to 21.3.
Fix issue with short index for IOVPayload PT conversionFix issue with short index for IOVPayload PT conversion
See merge request atlas/athena!42384Fix issue with short index for IOVPayload PT conversion
See merge request atlas/athena!42384https://gitlab.cern.ch/atlas/athena/-/merge_requests/42298cleanup of MMClusterOnTrack2021-04-08T16:24:55+02:00Patrick Scholercleanup of MMClusterOnTrackThe following changes have been applied:
- pass `stripDriftDists` and `stripDriftDistErrors` as const reference rather than by value (ATLASRECTS-5988)
- Add those variables also to the copy constructor, the default constructor and the as...The following changes have been applied:
- pass `stripDriftDists` and `stripDriftDistErrors` as const reference rather than by value (ATLASRECTS-5988)
- Add those variables also to the copy constructor, the default constructor and the assignment operatorhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/42256Manual sweep of !42154 (Fix for BIS78: do not use COOL db for efficiency and ...2021-04-07T13:22:56+02:00Nicolas KoehlerManual sweep of !42154 (Fix for BIS78: do not use COOL db for efficiency and cluster size for RUN3)Hi,
since the automatic sweep of https://gitlab.cern.ch/atlas/athena/-/merge_requests/42154 into ~"21.3" and ~"21.9" failed, here the manual sweep.
Best, NicoHi,
since the automatic sweep of https://gitlab.cern.ch/atlas/athena/-/merge_requests/42154 into ~"21.3" and ~"21.9" failed, here the manual sweep.
Best, Nicohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/42240Manual sweep of !42231 (Fix read of uninitialized member)2021-04-06T08:53:55+02:00Nicolas KoehlerManual sweep of !42231 (Fix read of uninitialized member)Hi,
this is a manual sweep of https://gitlab.cern.ch/atlas/athena/-/merge_requests/42231 into ~"21.3" and ~"21.9".
Best, NicoHi,
this is a manual sweep of https://gitlab.cern.ch/atlas/athena/-/merge_requests/42231 into ~"21.3" and ~"21.9".
Best, Nicohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/42184Install RunDepProfileGenerator.py script2021-04-22T19:23:31+02:00Peter OnyisiInstall RunDepProfileGenerator.py scriptInstall a script so it's easier to run without having to build the package separately
Attn @jchapmanInstall a script so it's easier to run without having to build the package separately
Attn @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/42183TrigT1CaloFexPerf: Adding Phase II ffex trigger EM algorithm2021-05-10T08:55:37+02:00Julian BlumenthalTrigT1CaloFexPerf: Adding Phase II ffex trigger EM algorithmThis MR adds a first implementation of Phase II fFEX EM trigger algorithms to the TrigT1CaloFexPerf package. fFEX electron objects are written and stored in the fEleCluster container. For now it is in the same LVL1 namespace as the Phase...This MR adds a first implementation of Phase II fFEX EM trigger algorithms to the TrigT1CaloFexPerf package. fFEX electron objects are written and stored in the fEleCluster container. For now it is in the same LVL1 namespace as the Phase I algorithms.
The main steering class "FwdCellReader" runs the actual algorithm parts in "FFexEMFinder" relying on helper functions in the "FwdCell" class. The algorithm relies on cell level information.
A short overview of the actual algorithm and its variations can be found here:
https://indico.cern.ch/event/958613/contributions/4047461/attachments/2130709/3588481/ffex_EM.pdfhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/42079Manual sweep of !41099 (Muon reconstruction fix association of hit informatio...2021-04-06T13:25:34+02:00Nicolas KoehlerManual sweep of !41099 (Muon reconstruction fix association of hit information from the proper track)Hi,
since the automatic sweep of https://gitlab.cern.ch/atlas/athena/-/merge_requests/41099 into ~"21.3" and ~"21.9" failed, here the manual sweep.
Best, NicoHi,
since the automatic sweep of https://gitlab.cern.ch/atlas/athena/-/merge_requests/41099 into ~"21.3" and ~"21.9" failed, here the manual sweep.
Best, Nicohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/42039Fix for FastChainSkeleton.EVGENtoRDO.py after !390192021-03-28T03:05:12+02:00John Derek ChapmanFix for FastChainSkeleton.EVGENtoRDO.py after !39019As part of the changes for the ReSimulation workflow the CfgGetter
method for SimKernel no longer adds it to the AlgSequence automatically,
so this has to be done in the same way as it is for every other algorithm.
(!39019 was swept to...As part of the changes for the ReSimulation workflow the CfgGetter
method for SimKernel no longer adds it to the AlgSequence automatically,
so this has to be done in the same way as it is for every other algorithm.
(!39019 was swept to ~"21.3" as part of !41921)
This fixes failures seen in the `FastChainPileup` ART tests. FYI @tcuhadar.https://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/42021Add consistency check for doubletZ in RPC digi2021-03-30T11:40:00+02:00Nicolas KoehlerAdd consistency check for doubletZ in RPC digiHi,
I saw that this consistency check in RPC digi was present in ~master but not in ~"21.3"/~"21.9", adding it here for consistency and to avoid eventual problems for phase2 studies in ~"21.9".
Best, NicoHi,
I saw that this consistency check in RPC digi was present in ~master but not in ~"21.3"/~"21.9", adding it here for consistency and to avoid eventual problems for phase2 studies in ~"21.9".
Best, Nicohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/41927Update muon geometry tests to more recent Run3 baseline layout2021-03-26T10:43:46+01:00Nicolas KoehlerUpdate muon geometry tests to more recent Run3 baseline layoutHi,
this MR updates the muon geometry tests to start from a more recent ATLAS layout.
Best, NicoHi,
this MR updates the muon geometry tests to start from a more recent ATLAS layout.
Best, Nicohttps://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/41834Configure MM Peak Time in Calibration Tool2021-04-21T18:00:07+02:00Patrick ScholerConfigure MM Peak Time in Calibration ToolThis MR moves the configuration of the MM peak time to the calibration tool. With this change, it only needs to be set in the calibration and not in two places anymore.
cc @mcarnesa @rosatiThis MR moves the configuration of the MM peak time to the calibration tool. With this change, it only needs to be set in the calibration and not in two places anymore.
cc @mcarnesa @rosatihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/41794Protect phase2 RPC digi against crash2021-03-23T15:18:47+01:00Nicolas KoehlerProtect phase2 RPC digi against crashHi,
this MR adds a protection against a crash of the phase2 RPC digitisation if invalid Identifiers are found. The protection is needed to unblock phase2 reconstruction studies.
Best, NicoHi,
this MR adds a protection against a crash of the phase2 RPC digitisation if invalid Identifiers are found. The protection is needed to unblock phase2 reconstruction studies.
Best, Nicohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/41767Sweeping !41696 from 21.9 to 21.3.
Fix syntax in 21.3/9 muon ART geometry ove...2021-03-20T03:06:17+01:00Atlas NightlybuildSweeping !41696 from 21.9 to 21.3.
Fix syntax in 21.3/9 muon ART geometry overrideFix syntax in 21.3/9 muon ART geometry override
See merge request atlas/athena!41696Fix syntax in 21.3/9 muon ART geometry override
See merge request atlas/athena!41696https://gitlab.cern.ch/atlas/athena/-/merge_requests/41714L1 trigger tower reprocessing tools for legacy system2021-04-06T13:26:11+02:00Ben CarlsonL1 trigger tower reprocessing tools for legacy systemCopying changes from 21.1-dev back to 21.3 for trigger tower reprocessing
ATR-16373Copying changes from 21.1-dev back to 21.3 for trigger tower reprocessing
ATR-16373https://gitlab.cern.ch/atlas/athena/-/merge_requests/41712Fix error in SC emulation where cells were just out of the bin2021-03-22T17:14:11+01:00Jon BurrFix error in SC emulation where cells were just out of the binFix a rare error that happened when a cell was just outside of one of the bins.
Tagging @bcarlson for info.
ATR-22995Fix a rare error that happened when a cell was just outside of one of the bins.
Tagging @bcarlson for info.
ATR-22995https://gitlab.cern.ch/atlas/athena/-/merge_requests/41682Sweeping !41605 from 21.9 to 21.3.
Manual sweep of !41572 and !41597 (Enable ...2021-03-18T03:05:23+01:00Atlas NightlybuildSweeping !41605 from 21.9 to 21.3.
Manual sweep of !41572 and !41597 (Enable running full muon chain using phase2 layout and add ART test)Manual sweep of !41572 and !41597 (Enable running full muon chain using phase2 layout and add ART test)
See merge request atlas/athena!41605Manual sweep of !41572 and !41597 (Enable running full muon chain using phase2 layout and add ART test)
See merge request atlas/athena!41605