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/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/23855WIP: AthenaMonitoring: Add doExpressProcessing flag.2019-05-31T20:00:10+02:00Scott SnyderWIP: AthenaMonitoring: Add doExpressProcessing flag.Add doExpressProcessing configuration flag.
Needed for converting LuminosityTool to a conditions algorithm.Add doExpressProcessing configuration flag.
Needed for converting LuminosityTool to a conditions algorithm.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/24663WIP: Adjustments for LCG962019-07-17T12:57:48+02:00Walter LamplWIP: Adjustments for LCG96* Upgrade generator versions as needed
* Disable compilation of fReadCastor, castor libraries are deprecated
Still a compilation failure in Trigger (ATR-19993)
Tagging @akraszna and @emoyse for info.* Upgrade generator versions as needed
* Disable compilation of fReadCastor, castor libraries are deprecated
Still a compilation failure in Trigger (ATR-19993)
Tagging @akraszna and @emoyse for info.https://gitlab.cern.ch/atlas/athena/-/merge_requests/24812AthenaMonitoring: Don't fail if TrigHLTMonitoring is not present.2019-07-11T23:10:27+02:00Scott SnyderAthenaMonitoring: Don't fail if TrigHLTMonitoring is not present.We should be able to create the flags object even if some parts of the
release are missing. Be tolerant of TrigHLTMonitoring being not present.We should be able to create the flags object even if some parts of the
release are missing. Be tolerant of TrigHLTMonitoring being not present.https://gitlab.cern.ch/atlas/athena/-/merge_requests/25320Fix ATLASRECTS-50492019-08-02T18:32:19+02:00Peter OnyisiFix ATLASRECTS-5049Bring missing jO from 21.0 to master, adapt to new conditions accessBring missing jO from 21.0 to master, adapt to new conditions accesshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/26086TgcRawDataMonitoring: first skeleton for new offline DQ framework2019-09-24T11:00:08+02:00Masato AokiTgcRawDataMonitoring: first skeleton for new offline DQ frameworkI've set up a skeleton codes for TGC online DQ package, TgcRawDataMonitoring, in order to suit the new offline DQ framework.I've set up a skeleton codes for TGC online DQ package, TgcRawDataMonitoring, in order to suit the new offline DQ framework.https://gitlab.cern.ch/atlas/athena/-/merge_requests/26441Next step towards new style config of calo-reco2019-09-12T09:01:39+02:00Walter LamplNext step towards new style config of calo-recoSeveral fixes/improvements of CaloCellMakerConfig.
To do: Move Calo-flags from AllConfigFlags to dedicated file.Several fixes/improvements of CaloCellMakerConfig.
To do: Move Calo-flags from AllConfigFlags to dedicated file.https://gitlab.cern.ch/atlas/athena/-/merge_requests/26978Updating r22 JetTagging code: Ready_for_DQ_test2019-10-11T17:32:22+02:00Alessandro LapertosaUpdating r22 JetTagging code: Ready_for_DQ_testUpdate algorithm for b-tagging DQ in r22. One interested package: PhysicsAnalysis/JetTagging/JetTagMonitoringUpdate algorithm for b-tagging DQ in r22. One interested package: PhysicsAnalysis/JetTagging/JetTagMonitoringhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/27165MET Offline DQ2019-10-14T09:27:19+02:00Marianna TestaMET Offline DQFirst version of MET offline DQ for Run3First version of MET offline DQ for Run3https://gitlab.cern.ch/atlas/athena/-/merge_requests/27178Master egamma performance for Run 3 Athena MT rel 222020-02-29T17:49:41+01:00Bertrand LaforgeMaster egamma performance for Run 3 Athena MT rel 22This MR is to push a first version of the skeleton of Run3 monitoring for Egamma objects (photons, electrons).This MR is to push a first version of the skeleton of Run3 monitoring for Egamma objects (photons, electrons).Peter OnyisiMaarten BoonekampSong-Ming WangPeter Onyisihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/27179WIP:test2019-10-14T09:36:27+02:00Marianna TestaWIP:testFirst version of MET offline DQ monitoring for Run3First version of MET offline DQ monitoring for Run3https://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/28749WIP: Initialize RPCMonitorAlgorithm for RPC DQ monitoring for run32019-12-15T21:19:21+01:00Heng LiWIP: Initialize RPCMonitorAlgorithm for RPC DQ monitoring for run3o) Initialize RPCMonitorAlgorithm for Run3 DQ into the existing RpcRawDataMonitoring
RPCMonitorAlgorithm can now produce the denominator and numerator for RPC L1 muon trigger efficiency(threshold 1 for now) calculation.
o) Trying to add ...o) Initialize RPCMonitorAlgorithm for Run3 DQ into the existing RpcRawDataMonitoring
RPCMonitorAlgorithm can now produce the denominator and numerator for RPC L1 muon trigger efficiency(threshold 1 for now) calculation.
o) Trying to add switch doRPCMon for RPCMonitorAlgorithm to Global DQ driver but got KeyError: 'DQ.Steering.doRPCMon is not a known configuration flag'https://gitlab.cern.ch/atlas/athena/-/merge_requests/28921WIP: Initialize RPCMonitorAlgorithm for RPC DQ monitoring for run32020-01-21T17:31:21+01:00Kunlin Hankunlin.han@cern.chWIP: Initialize RPCMonitorAlgorithm for RPC DQ monitoring for run31. Initialize RPCMonitorAlgorithm for Run3 DQ into the existing RpcRawDataMonitoring RPCMonitorAlgorithm can now produce the denominator and numerator for RPC L1 muon trigger efficiency(threshold 1 for now) calculation.
2. Add steerin...1. Initialize RPCMonitorAlgorithm for Run3 DQ into the existing RpcRawDataMonitoring RPCMonitorAlgorithm can now produce the denominator and numerator for RPC L1 muon trigger efficiency(threshold 1 for now) calculation.
2. Add steering flag of RPC into MuonDQAMonitoring pacakgehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/29142PixelAthMonitoringBase : fix issue in recent CI2019-12-21T19:56:47+01:00Christos Anastopouloschristos.anastopoulos@cern.chPixelAthMonitoringBase : fix issue in recent CIIn a few recent CI one can see
```
raceback (most recent call last):
File "/build2/ci-builds/master/Athena/build/Athena/InnerDetector/InDetMonitoring/PixelMonitoring/CMakeFiles/PixelAthMonitoringBasepycGen.py", line 1, in <module>
...In a few recent CI one can see
```
raceback (most recent call last):
File "/build2/ci-builds/master/Athena/build/Athena/InnerDetector/InDetMonitoring/PixelMonitoring/CMakeFiles/PixelAthMonitoringBasepycGen.py", line 1, in <module>
import py_compile; py_compile.compile( '/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthMonitoringBase.py', cfile = '/build2/ci-builds/master/Athena/build/Athena/x86_64-centos7-gcc8-opt/python/PixelMonitoring/PixelAthMonitoringBase.pyc', doraise = True )
File "/cvmfs/sft.cern.ch/lcg/releases/LCG_96/Python/2.7.16/x86_64-centos7-gcc8-opt/lib/python2.7/py_compile.py", line 117, in compile
raise py_exc
py_compile.PyCompileError: File "/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthMonitoringBase.py", line 11
if “ServiceMgr†in dir():
```
This should fix it
i.e fixes
this issue
```
InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthMonitoringBase.py:11:4: E999 SyntaxError: invalid syntax
```
Mentiong @ponyisi @fwinkl @ssnyder @wlamplhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/29523Fix unit test (ATLASRECTS-5264)2020-01-16T10:13:11+01:00Soshi TsunoFix unit test (ATLASRECTS-5264)Unit test of SiSPSeededTracksStandaloneFromESD was failed.
This is due to missing conditions. Now it is updated in job option.Unit test of SiSPSeededTracksStandaloneFromESD was failed.
This is due to missing conditions. Now it is updated in job option.https://gitlab.cern.ch/atlas/athena/-/merge_requests/30425AthenaMonitoring - allow extraction of strings from collections2020-02-17T23:59:21+01:00Tomasz BoldAthenaMonitoring - allow extraction of strings from collectionsPer @rbielski request added feature to be able to extract strings from come objects and use them for monitoring. Related to ATLASDQ-727
The test was created in special way. The filling code is placed in a separate file to stand as docu...Per @rbielski request added feature to be able to extract strings from come objects and use them for monitoring. Related to ATLASDQ-727
The test was created in special way. The filling code is placed in a separate file to stand as documentation. Tagging @fwinkl, @ponyisi @cburton on that.
I (and an experienced colleague) spent today morning trying to use the feature of doxygen as it seems ideally suited for sharing code for UT and documentation:
http://www.doxygen.nl/manual/commands.html#cmdexample
However, I was not able to set EXAMPLE_PATH in the Doxygen config file our build uses.
I tried just setting the variable as documented here:
https://cmake.org/cmake/help/v3.9/module/FindDoxygen.html (ignored)
as well as a brute force injection of "EXAMPLE_PATH=bla" using "file(APPEND ..".
(I think the Doxyfile is generated to late and overwrites my "append").