athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-07-15T03:02:42+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/42124New IBL Charge calibration (ATLASRECTS-5146)2021-07-15T03:02:42+02:00Soshi TsunoNew IBL Charge calibration (ATLASRECTS-5146)Since the RUN3 IOV is defined recently, we activate new IBL charge calibration from RUN3.
Therefore, this MR will not change the q-tests based on RUN2/RUN1.Since the RUN3 IOV is defined recently, we activate new IBL charge calibration from RUN3.
Therefore, this MR will not change the q-tests based on RUN2/RUN1.https://gitlab.cern.ch/atlas/athena/-/merge_requests/42122Sweeping !42021 from 21.3 to 21.9.
Add consistency check for doubletZ in RPC ...2021-03-31T03:06:30+02:00Atlas NightlybuildSweeping !42021 from 21.3 to 21.9.
Add consistency check for doubletZ in RPC digiAdd consistency check for doubletZ in RPC digi
See merge request atlas/athena!42021Add consistency check for doubletZ in RPC digi
See merge request atlas/athena!42021https://gitlab.cern.ch/atlas/athena/-/merge_requests/42028Configuring Pile-up Digitization to run in AthenaMT should cause the job to bail2021-03-31T03:04:51+02:00John Derek ChapmanConfiguring Pile-up Digitization to run in AthenaMT should cause the job to bailDigitization configuration should throw a RuntimeError if a pile-up digitization
job is configured to be run with AthenaMT. This configuration is not currently
supported. See discussion in ATLASRECTS-6129.
Closes ATLASRECTS-6129Digitization configuration should throw a RuntimeError if a pile-up digitization
job is configured to be run with AthenaMT. This configuration is not currently
supported. See discussion in ATLASRECTS-6129.
Closes ATLASRECTS-6129https://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/41963Adapt diff-root script to work with presampled pile-up RDOs2021-03-26T03:02:57+01:00John Derek ChapmanAdapt diff-root script to work with presampled pile-up RDOsThe container names in presampled pile-up RDOs differ from standard
RDO files. In order for the `--order-trees` option to work, then the
script has to be made aware of `xAOD::EventAuxInfo_v2_Bkg_EventInfoAux.`
rather than just looking fo...The container names in presampled pile-up RDOs differ from standard
RDO files. In order for the `--order-trees` option to work, then the
script has to be made aware of `xAOD::EventAuxInfo_v2_Bkg_EventInfoAux.`
rather than just looking for the standard container name.
FYI @amete, @tadejhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/41960split enableL1Phase1 flag (ATR-23110)2021-04-06T03:02:57+02:00Daniele Zanzisplit enableL1Phase1 flag (ATR-23110)This is to split the `enableL1Phase1` flag into `enableL1MuonPhase1` and `enableL1CaloPhase1` to allow the phase1 development in parallel.
Also related to ATR-19328, ATR-23071
@fwinkl @rbielski @wiedenma @smh @stelzer @masato @armbrust ...This is to split the `enableL1Phase1` flag into `enableL1MuonPhase1` and `enableL1CaloPhase1` to allow the phase1 development in parallel.
Also related to ATR-19328, ATR-23071
@fwinkl @rbielski @wiedenma @smh @stelzer @masato @armbrust , can you please check these changes are OK?https://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/4191921.9 initialization of hgtd digitization classes2021-08-18T13:28:25+02:00Tao Wang21.9 initialization of hgtd digitization classesThis Merge Request aims to provide the basic structure for HGTD Digitization Tool so that the tool can be run from `Reco_tf.py` script.
This can provide the basis for future digitization and reconstruction development for HGTD.
This is...This Merge Request aims to provide the basic structure for HGTD Digitization Tool so that the tool can be run from `Reco_tf.py` script.
This can provide the basis for future digitization and reconstruction development for HGTD.
This is a recreation of https://gitlab.cern.ch/atlas/athena/-/merge_requests/39242.
ATLSWUPGR-86Tao WangTao Wanghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/41917Add configuration to add a pseudo random offset into the high pT minbias pile...2021-07-13T14:58:55+02:00Michael Duehrssen-DeblingAdd configuration to add a pseudo random offset into the high pT minbias pileup sampleChecks on the re-use of high pT minbias events in pileup have shown that a random offset into the high pT minbias events would help to ensure an equal re-use of the existing events. This MR adds a pseudo-random offset into the high pT mi...Checks on the re-use of high pT minbias events in pileup have shown that a random offset into the high pT minbias events would help to ensure an equal re-use of the existing events. This MR adds a pseudo-random offset into the high pT minbias events based on the jobNumberhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/41904Sweeping !41834 from 21.3 to 21.9.
Configure MM Peak Time in Calibration Tool2021-03-25T03:06:10+01:00Atlas NightlybuildSweeping !41834 from 21.3 to 21.9.
Configure MM Peak Time in Calibration ToolConfigure MM Peak Time in Calibration Tool
See merge request atlas/athena!41834Configure MM Peak Time in Calibration Tool
See merge request atlas/athena!41834https://gitlab.cern.ch/atlas/athena/-/merge_requests/41899Add preliminary NSW digi and overlay ART tests2021-03-25T03:03:42+01:00Tadej Novaktadej.novak@cern.chAdd preliminary NSW digi and overlay ART testsAdd preliminary NSW digi and overlay ART tests:
- standard digi with MC16a-like pile-up
- presampling for MT with MC16a-like pile-up
- presampling for legacy overlay with MC16a-like pile-up
- legacy and MT-ready overlay comparison (s...Add preliminary NSW digi and overlay ART tests:
- standard digi with MC16a-like pile-up
- presampling for MT with MC16a-like pile-up
- presampling for legacy overlay with MC16a-like pile-up
- legacy and MT-ready overlay comparison (serial)
Also fixing a comparison for an equivalent MC16 legacy vs MT-ready overlay test.
Regression tests between nightlies are currently disabled as I suspect things will still change often.
/cc @jchapman @alaurier @nkoehler @jojunggehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/41886Add test digitisation command to be used with VTune2021-03-25T03:02:29+01:00Tadej Novaktadej.novak@cern.chAdd test digitisation command to be used with VTuneAdd test digitisation command to be used with VTune.
/cc @jchapman @ameteAdd test digitisation command to be used with VTune.
/cc @jchapman @ametehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/41865Manual sweep of !41794 (Protect phase2 RPC digi against crash)2021-03-24T03:03:40+01:00Nicolas KoehlerManual sweep of !41794 (Protect phase2 RPC digi against crash)Hi,
this is a manual sweep of https://gitlab.cern.ch/atlas/athena/-/merge_requests/41794 into ~master.
Best, NicoHi,
this is a manual sweep of https://gitlab.cern.ch/atlas/athena/-/merge_requests/41794 into ~master.
Best, Nicohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/41859Sweeping !41794 from 21.3 to 21.9.
Protect phase2 RPC digi against crash2021-03-24T03:06:23+01:00Atlas NightlybuildSweeping !41794 from 21.3 to 21.9.
Protect phase2 RPC digi against crashProtect phase2 RPC digi against crash
See merge request atlas/athena!41794Protect phase2 RPC digi against crash
See merge request atlas/athena!41794https://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/4178622.0-remove_duplicate_code-SCT_ConditionsTools2021-03-23T03:02:30+01:00Shaun Roe22.0-remove_duplicate_code-SCT_ConditionsToolsAs reported in the SW coordination meeting
https://indico.cern.ch/event/1016367/
and followed up in ATLIDTRKCP-334, there was a significant block of duplicated code (2113 lines) which should be removed in this MR.As reported in the SW coordination meeting
https://indico.cern.ch/event/1016367/
and followed up in ATLIDTRKCP-334, there was a significant block of duplicated code (2113 lines) which should be removed in this MR.https://gitlab.cern.ch/atlas/athena/-/merge_requests/41542Simple root script to calculate the amount of re-use of high pT minbias and p...2021-03-17T03:05:04+01:00Michael Duehrssen-DeblingSimple root script to calculate the amount of re-use of high pT minbias and pre-sampled RDOAdd simple root script to calculate the amount of re-use of high pT minbias for the production of pre-sampled RDO and pre-sampled RDO files for the use in MC-MC overlayAdd simple root script to calculate the amount of re-use of high pT minbias for the production of pre-sampled RDO and pre-sampled RDO files for the use in MC-MC overlayhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/41521Master fix ptonly container2021-03-13T03:04:44+01:00Edson Carquin LopezMaster fix ptonly containerChange container used to monitor ptonly chainChange container used to monitor ptonly chainhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/41514Migrate Forward Detector Digitization code to use thread-safe random number s...2021-03-13T03:03:26+01:00John Derek ChapmanMigrate Forward Detector Digitization code to use thread-safe random number serviceThis is part of a broader migration of simulation and digitization code away from the thread-unsafe Services implementing the `IAtRndmGenSvc` interface to the thread-safe version implementing the `IAthRNGSvc` interface. Other code update...This is part of a broader migration of simulation and digitization code away from the thread-unsafe Services implementing the `IAtRndmGenSvc` interface to the thread-safe version implementing the `IAthRNGSvc` interface. Other code updates are still required for the Foward Detector PileUpTools to be made thread-safe, but this is a necessary step.