athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2019-01-09T21:14:42+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/20255Update G4PhysicsRegionConfig.py according to ATLASSIM-39612019-01-09T21:14:42+01:00Leszek AdamczykUpdate G4PhysicsRegionConfig.py according to ATLASSIM-3961Update G4PhysicsRegionConfig.py according to ATLASSIM-3961Update G4PhysicsRegionConfig.py according to ATLASSIM-3961https://gitlab.cern.ch/atlas/athena/-/merge_requests/21107Update reference file for frozen simulation tests for gcc62->gcc8 transition2019-02-13T17:09:48+01:00John Derek ChapmanUpdate reference file for frozen simulation tests for gcc62->gcc8 transitionThe switch of the CI plaform from `x86_64-slc6-gcc62-opt` to `x86_64-slc6-gcc8-opt`
changes the output of simulation jobs, so the reference files have to be updated accordingly.The switch of the CI plaform from `x86_64-slc6-gcc62-opt` to `x86_64-slc6-gcc8-opt`
changes the output of simulation jobs, so the reference files have to be updated accordingly.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/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/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/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/21683Optimization of CPU time of FastCaloSimV2 (ATLASSIM-3980)2019-03-07T10:54:26+01:00Xiaozhong HuangOptimization of CPU time of FastCaloSimV2 (ATLASSIM-3980)Cherry pick to masterCherry pick to masterhttps://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/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/22134Sweeping !22083 from 21.3 to 21.9.
Manual sweep of !22078 from 21.0 to 21.3 ...2019-04-18T16:03:38+02:00Atlas NightlybuildSweeping !22083 from 21.3 to 21.9.
Manual sweep of !22078 from 21.0 to 21.3 Add MC16 Simulation ART jobsManual sweep of !22078 from 21.0 to 21.3 Add MC16 Simulation ART jobs
See merge request atlas/athena!22083Manual sweep of !22078 from 21.0 to 21.3 Add MC16 Simulation ART jobs
See merge request atlas/athena!22083https://gitlab.cern.ch/atlas/athena/-/merge_requests/22455WIP: Sweeping !22392 from 21.3 to 21.9.Manual sweep to 21.32019-04-29T10:52:19+02:00Atlas NightlybuildWIP: Sweeping !22392 from 21.3 to 21.9.Manual sweep to 21.3Manual sweep to 21.3
See merge request atlas/athena!22392Manual sweep to 21.3
See merge request atlas/athena!22392https://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/23154FastCaloSim: Update test reference file.2019-05-13T20:42:52+02:00Scott SnyderFastCaloSim: Update test reference file.Fix failure in master.Fix failure in master.https://gitlab.cern.ch/atlas/athena/-/merge_requests/23898WIP: ISF_FatrasToolsMS: Fix compilation warning.2019-06-06T14:35:37+02:00Scott SnyderWIP: ISF_FatrasToolsMS: Fix compilation warning.Compilation warning: Member initialization ordering.Compilation warning: Member initialization ordering.https://gitlab.cern.ch/atlas/athena/-/merge_requests/24215Machine learning based score in InDet Ambisolver2019-06-26T21:02:25+02:00Robin Newhouserobin.newhouse@cern.chMachine learning based score in InDet AmbisolverThis implements a new machine-learning-based scoring function to order the priority of tracks to be reconstructed in dense tracking environments. This scoring function will be dormant for now and can be activated with an InDetFlag set in...This implements a new machine-learning-based scoring function to order the priority of tracks to be reconstructed in dense tracking environments. This scoring function will be dormant for now and can be activated with an InDetFlag set in the jobOptions file. Tools developed to train and evaluate different network configurations will be stored in a [separate repository](https://gitlab.cern.ch/Atlas-Inner-Tracking/AmbiSolverScoreML) in the Atlas-Inner-Tracking workspace.Robin Newhouserobin.newhouse@cern.chRobin Newhouserobin.newhouse@cern.chhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/25872WIP: Workaround constness issues in FastCaloSimTool2019-08-15T10:42:26+02:00John Derek ChapmanWIP: Workaround constness issues in FastCaloSimToolHad to make TRandom member variable mutable to fix compilation.
Should fix ATLASSIM-4285.Had to make TRandom member variable mutable to fix compilation.
Should fix ATLASSIM-4285.https://gitlab.cern.ch/atlas/athena/-/merge_requests/24732Sweeping !24567 from 21.0 to master.
Extra SM mesons2019-08-26T13:27:37+02:00Atlas NightlybuildSweeping !24567 from 21.0 to master.
Extra SM mesonsExtra SM mesons
See merge request atlas/athena!24567Extra SM mesons
See merge request atlas/athena!24567https://gitlab.cern.ch/atlas/athena/-/merge_requests/26486Fixing newly introduced warning in FastCaloSim2019-09-11T14:46:51+02:00Pavol StrizenecFixing newly introduced warning in FastCaloSimThis should fix the flake8 warning introduced by mistake in the recent MR !26383This should fix the flake8 warning introduced by mistake in the recent MR !26383https://gitlab.cern.ch/atlas/athena/-/merge_requests/26366WIP: Test zdc pixel sd2019-09-15T17:37:40+02:00Liangliang HanWIP: Test zdc pixel sdhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/26370WIP: Test afp td sensitive detector2019-09-15T17:38:18+02:00Liangliang HanWIP: Test afp td sensitive detector