athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2018-12-21T03:02:37+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/20069SCT_RawDataByteStreamCnv: Fix compilation warning.2018-12-21T03:02:37+01:00Scott SnyderSCT_RawDataByteStreamCnv: Fix compilation warning.Compilation warning: superfluous const qualifier.Compilation warning: superfluous const qualifier.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20070InDetTrigRecExample: Protect against duplicating PixelConfigCondAlg.2018-12-21T03:03:05+01:00Scott SnyderInDetTrigRecExample: Protect against duplicating PixelConfigCondAlg.Fixes failure in TriggerMenu test.Fixes failure in TriggerMenu test.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20071Cleanup of SCTCalib for ATLASRECTS-45752018-12-31T03:02:16+01:00Susumu OdaCleanup of SCTCalib for ATLASRECTS-4575Code cleanup of SCTCalib algorithm only for the SCT Calibration Loop.
For https://its.cern.ch/jira/browse/ATLASRECTS-4575Code cleanup of SCTCalib algorithm only for the SCT Calibration Loop.
For https://its.cern.ch/jira/browse/ATLASRECTS-4575https://gitlab.cern.ch/atlas/athena/-/merge_requests/20072fix xrdcp in 21.62018-12-20T14:40:12+01:00Tulay Cuhadar Donszelmannfix xrdcp in 21.6xrdcp version in 21.6 is different than other branches and copy command works differently. Use xrdcp from /usr/bin/xrdcp.xrdcp version in 21.6 is different than other branches and copy command works differently. Use xrdcp from /usr/bin/xrdcp.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20073DFSUSY: drop tau seed jet width and cleanup2019-01-11T09:03:13+01:00Bertrand Martin Dit LatourDFSUSY: drop tau seed jet width and cleanupHello,
This MR drops what had been implemented in https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/16344, namely the decoration of taus with the seed jet width, because this functionality is being migrated to DerivationFramewo...Hello,
This MR drops what had been implemented in https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/16344, namely the decoration of taus with the seed jet width, because this functionality is being migrated to DerivationFrameworkTau by @lfiorini in !20048 .
I also made some cleanup of old comments and the 'AppendToDict' dictionary, because most collections are now declared in
https://gitlab.cern.ch/atlas/athena/blob/21.2/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/ContainersOnTheFly.py
and no longer need to be declared in each format.
Thanks.
Bertrandhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20074TileRecUtils: Decrease dependency on TileInfo2018-12-29T03:02:30+01:00Siarhei HarkushaTileRecUtils: Decrease dependency on TileInfoTileInfo is used to return any detector-dependent constants
or information regarding the Tile Calorimeter,
including conditions data via different conditions tools.
It is not good for AthenaMT.
So functionality of TileInfo which is pro...TileInfo is used to return any detector-dependent constants
or information regarding the Tile Calorimeter,
including conditions data via different conditions tools.
It is not good for AthenaMT.
So functionality of TileInfo which is provided via tools
will be removed and clients will be migrated to use tools directly.
It is supposed that TileInfo will keep and provide only constants
which will be initialized during initialization of job.
TileRecUtils package has been migrated to use tools directly.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20075Add Muon ART Tests for Standalone Setup and NSW2019-01-09T01:50:13+01:00Zhidong ZhangAdd Muon ART Tests for Standalone Setup and NSWThree ART tests are added into MuonRecRTT:
test_muonrec_sa_setup_normal.sh: normal test for standalone muon setup;
test_muonrec_sa_setup_simple.sh: simplest test for standalone muon setup;
test_nsw_singlemuon_recon.sh: muon reconst...Three ART tests are added into MuonRecRTT:
test_muonrec_sa_setup_normal.sh: normal test for standalone muon setup;
test_muonrec_sa_setup_simple.sh: simplest test for standalone muon setup;
test_nsw_singlemuon_recon.sh: muon reconstruction test for New Small Wheel.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20076Removing Atlantis, as this is not part of Athena2019-03-21T03:02:10+01:00Edward MoyseRemoving Atlantis, as this is not part of AthenaSince we don't build Atlantis as part of athena, and it is now hosted on https://gitlab.cern.ch/atlas/atlantis, it doesn't really belong in this repository.
@bwaughSince we don't build Atlantis as part of athena, and it is now hosted on https://gitlab.cern.ch/atlas/atlantis, it doesn't really belong in this repository.
@bwaughhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20077Minor PRW algorithm improvements2019-01-09T03:03:27+01:00Tadej Novaktadej.novak@cern.chMinor PRW algorithm improvementsMinor PRW algorithm improvements:
- add some additional EventInfo decorations that are not done with `apply`
- use default PRW tool settings for data scale factors (current ones were for MC15)Minor PRW algorithm improvements:
- add some additional EventInfo decorations that are not done with `apply`
- use default PRW tool settings for data scale factors (current ones were for MC15)https://gitlab.cern.ch/atlas/athena/-/merge_requests/20078Add script to summarise results of locally-ran trigger ART tests2019-02-15T14:07:13+01:00Rafal Bielskirafal.bielski@cern.chAdd script to summarise results of locally-ran trigger ART testsThe script is used to return a status code from a locally-ran ART tests. We need this to make use of the ART test shell scripts in CI, as they always return zero.
Example usage:
```
test_physics_pp_v7_build.sh > stdout.txt
retcode=`trig...The script is used to return a status code from a locally-ran ART tests. We need this to make use of the ART test shell scripts in CI, as they always return zero.
Example usage:
```
test_physics_pp_v7_build.sh > stdout.txt
retcode=`trig-art-result-parser.sh stdout.txt "athena CheckLog"`
echo "test_physics_pp_v7_build final result is $retcode"
```
where in CI we would actually return `retcode` to the CI driver.
This script is already added in the branch 21.3 but in a simpler form. This updated version is targeting all branches as we intend to use it in CI.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20080athenaHLT: Write histograms into their own directory for child processes2018-12-29T03:02:34+01:00Frank WinklmeierathenaHLT: Write histograms into their own directory for child processesWe were getting basically empty histogram files when running in `athenaHLT.py` because the mother overwrote the ROOT file of the children. This MR fixes this by placing the ROOT files into their own directory when running with the offlin...We were getting basically empty histogram files when running in `athenaHLT.py` because the mother overwrote the ROOT file of the children. This MR fixes this by placing the ROOT files into their own directory when running with the offline `THistSvc`.
- Add the missing call to `updateDFProps` after the fork to
individualize the child properties (e.g. app name).
- Use the `IoComponentMgr` to mange the I/O for child processes as done in
athenaMP. This creates a sub-directory for each child into which histogram
files are being written.
- With the above we can run also in `athenaHLT.py` using the offline
`THistSvc`.
TODO: It's not nice that we are creating empty directories in case the
online `THistSvc` is used. Can probably add a check on the number of
registered files and if zero, don't bother with the I/O component
manager. But this is for a future MR.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20081Fix decision creating in MTCalibPebHypoAlg2018-12-26T03:02:13+01:00Rafal Bielskirafal.bielski@cern.chFix decision creating in MTCalibPebHypoAlgMTCalibPebHypoAlg was broken by recent updates in TrigCompositeUtils in [!13561](athenaprivate1!13561) - it was missed in updating the clients. This commit updates the alg to the new TrigCompositeUtils interface.MTCalibPebHypoAlg was broken by recent updates in TrigCompositeUtils in [!13561](athenaprivate1!13561) - it was missed in updating the clients. This commit updates the alg to the new TrigCompositeUtils interface.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20083CLIDSvc: Delete this obsolete package.2018-12-24T03:02:14+01:00Scott SnyderCLIDSvc: Delete this obsolete package.Should no longer be used from anywhere.Should no longer be used from anywhere.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20084DataModelTestDataCommon: SGTools -> AthenaKernel2018-12-22T03:02:26+01:00Scott SnyderDataModelTestDataCommon: SGTools -> AthenaKernelUpdate for headers moved from SGTools to AthenaKernel.Update for headers moved from SGTools to AthenaKernel.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20085AthContainers: SGTools -> AthenaKernel2018-12-23T03:02:18+01:00Scott SnyderAthContainers: SGTools -> AthenaKernelUpdate for headers moved from SGTools to AthenaKernel.Update for headers moved from SGTools to AthenaKernel.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20086AthenaPython: SGTools -> AthenaKernel2018-12-22T03:02:31+01:00Scott SnyderAthenaPython: SGTools -> AthenaKernelUpdate for headers moved from SGTools to AthenaKernel.Update for headers moved from SGTools to AthenaKernel.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20087SGComps: SGTools -> AthenaKernel2018-12-22T03:02:21+01:00Scott SnyderSGComps: SGTools -> AthenaKernelUpdate for headers moved from SGTools to AthenaKernel.Update for headers moved from SGTools to AthenaKernel.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20088add print statements and use art from the nightly2018-12-21T11:10:00+01:00Tulay Cuhadar Donszelmannadd print statements and use art from the nightlyadd print statements and use art from the nightlyadd print statements and use art from the nightlyhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20090ATR-19014 Pseudomerge muon trigger 21.0-TrigMC to master2018-12-31T03:02:14+01:00Marcus Matthias MorgensternATR-19014 Pseudomerge muon trigger 21.0-TrigMC to masterPseudomerge for muon trigger
Started from scratch and all test passing now.
Update packages:TrigmuComb TrigmuIso TrigMuonEF TrigmuRoI TrigMuSuperEF TrigTileMuId TrigMuonCoinHierarchy TrigMuonMatching muon from upstream/21.0-TrigMC...Pseudomerge for muon trigger
Started from scratch and all test passing now.
Update packages:TrigmuComb TrigmuIso TrigMuonEF TrigmuRoI TrigMuSuperEF TrigTileMuId TrigMuonCoinHierarchy TrigMuonMatching muon from upstream/21.0-TrigMC to upstream/master via pseudo-mergehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20091Indet sync 21.0 trig mc to master2019-01-12T03:02:24+01:00Jiri MasikIndet sync 21.0 trig mc to mastersynchronize merge requests from the InnerDetector domain made in 21.1/21.0-TrigMC
related to ATR-19009
The request is a cherry-pick of several merge requests which are present in the 21.1 releases but did not make it into the master....synchronize merge requests from the InnerDetector domain made in 21.1/21.0-TrigMC
related to ATR-19009
The request is a cherry-pick of several merge requests which are present in the 21.1 releases but did not make it into the master. They were identified as having InnerDetector label and were not related to the P1 ID monitoring.
There are also some further updates mostly to remove compilation warnings (variable naming convention)