athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-03-12T17:23:50+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/20388Merge tag 21.0.91-21.0.92 into 21.92021-03-12T17:23:50+01:00John Derek ChapmanMerge tag 21.0.91-21.0.92 into 21.9This merge request merges the changes from the ~"21.0" branch between [release/21.0.90](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.90)
and [release/21.0.91](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.92) into the ~"...This merge request merges the changes from the ~"21.0" branch between [release/21.0.90](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.90)
and [release/21.0.91](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.92) into the ~"21.9" branch. This is done via a merge of
[release/21.3.9](https://gitlab.cern.ch/atlas/athena/tags/release/21.3.9).
[release/21.0.91](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.91) is a Tier0 release. It's FT0-violating. It includes the FT0V MRs:
athenaprivate1!16171, athenaprivate1!15893, athenaprivate1!15117, athenaprivate1!16009, athenaprivate1!16049
[release/21.0.92](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.92) is a Tier0 release. It's FT0-violating. It includes the FT0V MRs:
athenaprivate1!15481, athenaprivate1!16537 The latter of which is the merge of ~"21.1" into ~"21.0"https://gitlab.cern.ch/atlas/athena/-/merge_requests/20578WIP: Rename SiPropertiesSvc package to SiPropertiesTool package (ATLASRECTS-4...2019-03-10T14:48:39+01:00Susumu OdaWIP: Rename SiPropertiesSvc package to SiPropertiesTool package (ATLASRECTS-4048)Rename SiPropertiesSvc package to SiPropertiesTool package because SiPropertiesSvc was converted to SiPropertiesTool.
https://its.cern.ch/jira/browse/ATLASRECTS-4048
RunTier0Tests.py was fine. [RunTier0Tests.log](/uploads/3598591b5...Rename SiPropertiesSvc package to SiPropertiesTool package because SiPropertiesSvc was converted to SiPropertiesTool.
https://its.cern.ch/jira/browse/ATLASRECTS-4048
RunTier0Tests.py was fine. [RunTier0Tests.log](/uploads/3598591b5227d560ddda6313dbcd0ac9/RunTier0Tests.log)
This will conflict with
https://gitlab.cern.ch/atlas/athena/merge_requests/20394
and
https://gitlab.cern.ch/atlas/athena/merge_requests/21026
I will put WIP until the MR is merged. Move the SiProtiesTool directories back, merge upstream/master, and move the directories again. https://gitlab.cern.ch/atlas/athena/-/merge_requests/20965Merge release/21.0.93 into 21.32019-02-15T14:07:46+01:00John Derek ChapmanMerge release/21.0.93 into 21.3This merge request merges the changes that went into the ~"21.0" branch between the [release/21.0.92](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.92) and [release/21.0.93](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.9...This merge request merges the changes that went into the ~"21.0" branch between the [release/21.0.92](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.92) and [release/21.0.93](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.93) tags into the ~"21.3" branch.
[release/21.0.93](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.93) contains the following ~"frozen\-tier0\-violating" merge requests:
- !20005
- !20021
- !20652
MRs in https://gitlab.cern.ch/atlas/athena/tags/nightly/21.0/2019-01-28T2159, accepted since https://gitlab.cern.ch/atlas/athena/tags/nightly/21.0/2019-01-06T2159:
- !20652: Adding variable HadronConeExclTruthLabelID to heavy-ion jet collections
- !20005: Propagate xAOD::EventInfo from digitization step onwards
- !20585: printing timestamp with the full list of arguments in a safe way (ATLINFR-2731)
- !20607: 21.0 fix nightly test2
- !20613: Sweeping !20595 from master to 21.0. Bugfix importing tools in RunTier0Test.py
- !20543: Sweeping !20514 from master to 21.0. Start versioning the CI reference files for the RunTier0Tests
- !20365: Sweeping !20318 from 21.3 to 21.0. Update art-include in TriggerTest
- !20364: Sweeping !20324 from 21.3 to 21.0. TriggerTest: add a few tests running on data
- !20323: Remove non-existing input file from HI build test
- !20321: update art include for RecExOnline
- !20262: PreStepPoint quantities in StepHistogramTool
- !20219: Updates for processing of G4Commands via the G4UImanager
- !20125: Sweeping !20078 from master to 21.0. Add script to summarise results of locally-ran trigger ART tests
- !20022: additional plotting option added
- !20021: Moving eta-phi correction for HIJetRec to calibration area (ATLHI-233 and ATLINFR-2834)
- !20013: Adds an option to turn on range cuts for gamma processes (conv, phot, compt)
- !20563: Changed permissions for m16e TCT test
- !20519: Removed mc16d TCT and replaced with mc16e
The full diff between [release/21.0.93](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.93) and [release/21.0.92](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.92) is available at https://gitlab.cern.ch/atlas/athena/compare/release/21.0.92...release/21.0.93https://gitlab.cern.ch/atlas/athena/-/merge_requests/21022Replace Services with Private Tools. First step2019-03-05T13:57:32+01:00Peter HansenReplace Services with Private Tools. First stepATR-18884. Replace the two Services, used by TRT_DriftFunctionTool and TRT_DriftCircleTool for conditions access, by Private Tools.
Hopefully it will fix the crash. The Services are still there and are used by many other clients. The TRT...ATR-18884. Replace the two Services, used by TRT_DriftFunctionTool and TRT_DriftCircleTool for conditions access, by Private Tools.
Hopefully it will fix the crash. The Services are still there and are used by many other clients. The TRT_RIOMaker should also speed up a bit by this change.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21340WIP: ComponentAccumulator configuration for SCT and Pixel digitization2019-03-15T11:57:27+01:00Rupert TombsWIP: ComponentAccumulator configuration for SCT and Pixel digitizationDefine new style replacements for SCT_DigitizationConfig.py and PixelDigitizationConfig.py
With ConfigFlags definitions utilities and dependencies, including *ToolSetup replacements
Also makes minor updates to BCM_Digitization.
...Define new style replacements for SCT_DigitizationConfig.py and PixelDigitizationConfig.py
With ConfigFlags definitions utilities and dependencies, including *ToolSetup replacements
Also makes minor updates to BCM_Digitization.
Questions:
SCT_ReadCalibChipDataConfig.py lines 22-25: ComponentAccumulator folder tools do not have the tag features previously used here. Are these okay to neglect?
SCT_DigitizationConfig.py lines 75-83: To avoid migrating the ExperimentalDigi flag, doDetailedSurfChargesGen has not been migrated here. Is this still needed?
PixelCablingConfigNew.py line 60: Is this DBM logic correct?
OverlayConfigFlags.py line 15: `Overlay.EventStore` flag is questionable.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21371Digitization: Update expected test results.2019-03-05T20:57:46+01:00Scott SnyderDigitization: Update expected test results.Fix failures in master.Fix failures in master.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21600pseudomerge of TrigEgammaAnalysisTools packages from rel 21 to master2019-03-04T16:23:09+01:00Joao Victor Da Fonseca Pintopseudomerge of TrigEgammaAnalysisTools packages from rel 21 to masterCommand used to build the workspace:
setupATLAS
asetup Athena,master,latest
git clone https://:@gitlab.cern.ch:8443/jodafons/athena.git
cd athena
git remote add upstream https://:@gitlab.cern.ch:8443/atlas/athena.git
git-packag...Command used to build the workspace:
setupATLAS
asetup Athena,master,latest
git clone https://:@gitlab.cern.ch:8443/jodafons/athena.git
cd athena
git remote add upstream https://:@gitlab.cern.ch:8443/atlas/athena.git
git-package-pseudomerge.py \
--packages Trigger/TrigAnalysis/TrigEgammaAnalysisTools \
--source archive/21.0-TrigMC \
--target upstream/master \
--stage 1
All conflicts were solved comparing the master and TrigMC. Most part of AcceptData strategy are taken from the master branch. Used the ctest and some trigger monitoring scripts (my script) to test everything.
This MR fixed the problem related in ATR-19448
See the discussion about the pseudo merge in: ATR-19005
Tagging: @fernando and @thrynova (ringer MT task) and @wsfreundJoao Victor Da Fonseca PintoJoao Victor Da Fonseca Pintohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/21639Update packages:TrigEgammaAnalysisTools from archive/21.0-TrigMC to...2019-03-06T10:29:05+01:00Joao Victor Da Fonseca PintoUpdate packages:TrigEgammaAnalysisTools from archive/21.0-TrigMC to...Command used to build the workspace:
setupATLAS
lsetup git
asetup Athena,master,latest
git clone https://:@gitlab.cern.ch:8443/jodafons/athena.git
cd athena
git remote add upstream https://:@gitlab.cern.ch:8443/atlas/athena.git
git-pack...Command used to build the workspace:
setupATLAS
lsetup git
asetup Athena,master,latest
git clone https://:@gitlab.cern.ch:8443/jodafons/athena.git
cd athena
git remote add upstream https://:@gitlab.cern.ch:8443/atlas/athena.git
git-package-pseudomerge.py
--packages Trigger/TrigAnalysis/TrigEgammaAnalysisTools
--source archive/21.0-TrigMC
--target upstream/master
--stage 1 (and 2 after fix all conflicts)
All conflicts were solved comparing the master and TrigMC. Most part of AcceptData strategy are taken from the master branch. Used the ctest and some trigger monitoring scripts (my script) to test everything.
This MR fixed the problem related in ATR-19448
See the discussion about the pseudo merge in: ATR-19005
Tagging: @fernando and @thrynova (ringer MT task) and @wsfreundhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/22643MdtCalibrationDbSvc MT migration v32019-06-22T20:55:03+02:00Chikuma KatoMdtCalibrationDbSvc MT migration v3Callback functions and member data cache are removed from `MdtCalibrationDbSvc` using `ReadCondHandle`. For example derived data in `"RtKey"` was originally recorded by `MdtCalibDbCoolStrTool` reading raw data from `"/MDT/RTBLOB"`. And t...Callback functions and member data cache are removed from `MdtCalibrationDbSvc` using `ReadCondHandle`. For example derived data in `"RtKey"` was originally recorded by `MdtCalibDbCoolStrTool` reading raw data from `"/MDT/RTBLOB"`. And the data was provided via detector store, removing previous IoV data. But in AthenaMT, derived data must be provided by an Alg via the condition store. So a new Alg with `WriteCondhandle` (`MdtCalibDbAlg`) is added to the condition sequence.
To schedule the derived data in the AthenaMT scheduler (--threads=1), the parent Svc and DbSvc are changed in to Tool and DbTool. And the private tools and condition handles are declared as properties either using auto-declaring initializer or declareProperty(). This should fix the read error found in a trigger test [https://gitlab.cern.ch/atlas/athena/merge_requests/21313] after merging the first MR [https://gitlab.cern.ch/atlas/athena/merge_requests/21512]. Since the same trigger test (test_mu_menu.sh) was not running in master (master,x86_64,centos7,gcc8,opt,2019-04-05T2141,Athena), I used another trigger test (test_mu_run_data.sh).
The trigger test, q221 and q431 output ESD was ok [[diff-root-run09-q431.txt](/uploads/5fa4ccd6a9027c55e095d93ab5087c71/diff-root-run09-q431.txt)[diff-root-run09-mu_run_data.txt](/uploads/8c71d577c2be75333d4a2eb38078a18f/diff-root-run09-mu_run_data.txt)[diff-root-run09-q221.txt](/uploads/ca29fd418dce30d2fdbed61d00cb16d4/diff-root-run09-q221.txt)]. The tier0 test was also ok [[RunTier0Tests.log](/uploads/1077eeda6f70af55d959fc082aa93bf2/RunTier0Tests.log)]. Thanks a lot for feedback from @wleight @rosati @diehl @oda .https://gitlab.cern.ch/atlas/athena/-/merge_requests/22675Clean-up public Tile Conditions Tools in Digitization jobs2019-04-17T11:14:58+02:00John Derek ChapmanClean-up public Tile Conditions Tools in Digitization jobsPublic verions of `TileCondToolPulseShape`, `TileCondToolNoiseSample`,
`TileCondToolEmscale`, `TileCondToolTiming` and `TileCondToolOfcCool`
are not used in digitization jobs, so protecting against them being
created. Only doing this for...Public verions of `TileCondToolPulseShape`, `TileCondToolNoiseSample`,
`TileCondToolEmscale`, `TileCondToolTiming` and `TileCondToolOfcCool`
are not used in digitization jobs, so protecting against them being
created. Only doing this for digitization jobs, in case there are
other clients in reconstruction.https://gitlab.cern.ch/atlas/athena/-/merge_requests/23047WIP: Add OutputStreamCfg to digitization modules2019-05-02T17:06:31+02:00Rupert TombsWIP: Add OutputStreamCfg to digitization modulesMerge the required OutputStreamCfg in each alg function, rather than at test file level.
Add MOD_ItemList() functions to provide required item names in each module.
Remove unnecessary imports and redundant tests.Merge the required OutputStreamCfg in each alg function, rather than at test file level.
Add MOD_ItemList() functions to provide required item names in each module.
Remove unnecessary imports and redundant tests.https://gitlab.cern.ch/atlas/athena/-/merge_requests/23454WIP: Sweeping !22050 from 21.3 to master.Propagate the correct track link to ...2021-03-02T14:34:44+01:00Atlas NightlybuildWIP: Sweeping !22050 from 21.3 to master.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/26297WIP: Route IdHelper access through MuonIdHelperTool2019-10-03T15:22:21+02:00Pascal BoeschotenWIP: Route IdHelper access through MuonIdHelperToolAs part of the effort to migrate MuonIdHelperTool to a service, this MR changes access to the Muon IdHelpers (RpcIdHelper etc) to go through MuonIdHelperTool instead of the detStore. The MR does not cover 100% of the cases, there are a f...As part of the effort to migrate MuonIdHelperTool to a service, this MR changes access to the Muon IdHelpers (RpcIdHelper etc) to go through MuonIdHelperTool instead of the detStore. The MR does not cover 100% of the cases, there are a few left that need some discussion about how to handle them. But this set of changes is big enough already.https://gitlab.cern.ch/atlas/athena/-/merge_requests/27075WIP: Enable writing of mini-EventInfo in RDO in Digitization.py2020-04-14T12:24:51+02:00Marcin NowakWIP: Enable writing of mini-EventInfo in RDO in Digitization.pyThis was temporarily disabled during PileUpEventInfo migration for some reason. I think it can be turned on again now.This was temporarily disabled during PileUpEventInfo migration for some reason. I think it can be turned on again now.https://gitlab.cern.ch/atlas/athena/-/merge_requests/27182WIP: Remove duplicate LArADC2MeV config2019-11-06T13:57:46+01:00Rupert TombsWIP: Remove duplicate LArADC2MeV configRemove duplicated LArADC2MeVCondAlgCfg and redirect all calls to its definition in LArADC2MeVCondAlgConfig.pyRemove duplicated LArADC2MeVCondAlgCfg and redirect all calls to its definition in LArADC2MeVCondAlgConfig.pyhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/27722WIP: Match new style LAr Digitization config to old2019-11-10T13:51:11+01:00Rupert TombsWIP: Match new style LAr Digitization config to oldModify ComponentAccumulator configuration for LAr Digitization with to match old style outputs.
Results are testable by `Simulation/Digitization/test/LArConfigNewOld_test.sh`.
Also:
Introduce config scripts for `MergeRecoTimingObjToo...Modify ComponentAccumulator configuration for LAr Digitization with to match old style outputs.
Results are testable by `Simulation/Digitization/test/LArConfigNewOld_test.sh`.
Also:
Introduce config scripts for `MergeRecoTimingObjTool`, `LArDigitThinner`, and `AthenaPoolCnvSvc` writing settings.
Remove semi-duplicated configuration for `LArADC2MeVCondAlgCfg`.
Teach `LArRawChannelBuilderAlgCfg` to handle MC input, and update its test ref for updated `LArADC2MeVCondAlgCfg`.
Fix minor style issues.
TODO what to do about EventInfo in OutputStreamCfg?https://gitlab.cern.ch/atlas/athena/-/merge_requests/28016Muon track building: more private tools2019-11-15T17:32:32+01:00Edward MoyseMuon track building: more private toolsMake more muon tools private, and move to the new gaudi property declaration.
Add some more configuration to MooCandidateMatchingTool, now that tools are private.
MuPatCandidateTool - the segmentExtender points to a tool which appare...Make more muon tools private, and move to the new gaudi property declaration.
Add some more configuration to MooCandidateMatchingTool, now that tools are private.
MuPatCandidateTool - the segmentExtender points to a tool which apparently doesn't exist! It is always disabled in jobOpts (for obvious reasons) so I just removed it.https://gitlab.cern.ch/atlas/athena/-/merge_requests/28453RPC digitization for fractional charged particles2019-12-03T14:22:54+01:00Quanyin LiRPC digitization for fractional charged particlesAdd a correction factor of RPC efficiency for fractional charged particles.Add a correction factor of RPC efficiency for fractional charged particles.https://gitlab.cern.ch/atlas/athena/-/merge_requests/28731: add radiation damage effects in fast pixel digitization2020-11-04T17:30:35+01:00Tommaso Lari: add radiation damage effects in fast pixel digitizationAdd radiation damage effects as a scaling in the charge in the fast pixel digitization, before comparing to threshold values (so pixel cells or entire clusters might be lost). The scaling factors are derived from full digitization or mea...Add radiation damage effects as a scaling in the charge in the fast pixel digitization, before comparing to threshold values (so pixel cells or entire clusters might be lost). The scaling factors are derived from full digitization or measurements, values for end of 2017, end of run2, and a couple end of run3 scenarios are available. The default is no radiation damage though, it can be changed from job option. Also revising the charge to TOT conversion and the amount of energy loss fluctuations. The default position smearing is changed so that cluster size and other observable are very close to previous output.https://gitlab.cern.ch/atlas/athena/-/merge_requests/29085TRT modification for fractional charged particles2019-12-19T16:52:32+01:00Quanyin LiTRT modification for fractional charged particlesModify the charge dependence of TRT for fractional charged particlesModify the charge dependence of TRT for fractional charged particles