athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2018-12-20T03:02:46+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/20020Delete obsolete CMT-related packages2018-12-20T03:02:46+01:00Frank WinklmeierDelete obsolete CMT-related packagesThe following packages were only relevant for CMT-based releases and can be removed:
- LCG_Interfaces/Boost
- LCG_Interfaces/CLHEP
- PackDist
- ReleaseTests
This has been discussed with @obreshko and @akraszna.The following packages were only relevant for CMT-based releases and can be removed:
- LCG_Interfaces/Boost
- LCG_Interfaces/CLHEP
- PackDist
- ReleaseTests
This has been discussed with @obreshko and @akraszna.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20003Updating copyright and private licences2018-12-20T03:02:58+01:00Edward MoyseUpdating copyright and private licencesThis should remove the mistakes that crept back in. Need to compile before accepting.This should remove the mistakes that crept back in. Need to compile before accepting.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20012Remove athena-app2018-12-20T03:02:53+01:00Stewart Martin-HaughRemove athena-appathena-app appears not to have been used for a while, and it cannot run AthExHelloWorld without crashing.athena-app appears not to have been used for a while, and it cannot run AthExHelloWorld without crashing.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20009Add Tau slice for Physics Validation ART2018-12-20T03:03:36+01:00Alexander MannAdd Tau slice for Physics Validation ARTAdding Tau slice (and Summary) for weekly PhysVal tests in ART.Adding Tau slice (and Summary) for weekly PhysVal tests in ART.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20026removing problematic collection from ESD in egammaRun trigger test2018-12-20T03:03:00+01:00Tomasz Boldremoving problematic collection from ESD in egammaRun trigger testThis is a quick fix for the CI egammaRun test. One collection seems to be incorrectly stored.
The cause will be investigated. The fix here is about getting CI back in shape.
Tagging @tamartinThis is a quick fix for the CI egammaRun test. One collection seems to be incorrectly stored.
The cause will be investigated. The fix here is about getting CI back in shape.
Tagging @tamartinhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20025add dynamic variables for monitoring L2StandAloneMuon2018-12-20T03:02:50+01:00Yohei Yamaguchiadd dynamic variables for monitoring L2StandAloneMuonAdding variables in TrigL2MuonSA for monitoring L2StandAloneMuon as dynamic variables.
Also modifying TriggerEDM config to store them into AODSLIM.Adding variables in TrigL2MuonSA for monitoring L2StandAloneMuon as dynamic variables.
Also modifying TriggerEDM config to store them into AODSLIM.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20019Fix two problems with thread/slot safety in the CutFlowSvc2018-12-21T03:02:48+01:00Jack CranshawFix two problems with thread/slot safety in the CutFlowSvcFix two problems with thread/slot safety in the CutFlowSvc
- Move the reading of EventInfo weights from the service to the only client
AthFilterAlgorithm
- add a mutex to the addEvent method called by AthFilterAlgorithm
...Fix two problems with thread/slot safety in the CutFlowSvc
- Move the reading of EventInfo weights from the service to the only client
AthFilterAlgorithm
- add a mutex to the addEvent method called by AthFilterAlgorithm
https://its.cern.ch/jira/browse/ATLASRECTS-4693https://gitlab.cern.ch/atlas/athena/-/merge_requests/20027SCT alg code cleanup for ATLASRECTS-45752018-12-21T03:02:13+01:00Susumu OdaSCT alg code cleanup for ATLASRECTS-4575SCT algorithm code cleanup for
https://its.cern.ch/jira/browse/ATLASRECTS-4575
* InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/SCT_TestDistortionsTool.h
* InnerDetector/InDetValidation/InDetTrackValidation/InDetTrackValidation/...SCT algorithm code cleanup for
https://its.cern.ch/jira/browse/ATLASRECTS-4575
* InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/SCT_TestDistortionsTool.h
* InnerDetector/InDetValidation/InDetTrackValidation/InDetTrackValidation/SCT_ClusterValidationNtupleWriter.h
* Simulation/Tools/RDOAnalysis/src/SCT_FastRDOAnalysis.h
* Simulation/Tools/RDOAnalysis/src/SCT_RDOAnalysis.hhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20011manual sweep into master of 16464 from athenaprivate12018-12-21T03:03:01+01:00Miha Muskinjamiha.muskinja@cern.chmanual sweep into master of 16464 from athenaprivate1This is a manual sweep of https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/16464#note_2176697 from the old repo into master.
The base class of StepHistogramTool needed to be migrated to `UserActionToolBase` from `ActionToolBas...This is a manual sweep of https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/16464#note_2176697 from the old repo into master.
The base class of StepHistogramTool needed to be migrated to `UserActionToolBase` from `ActionToolBaseReport`. This had some consequences, namely:
- StepHistogramTool.h has now much less lines of code
- results are accumulated in a different way: https://gitlab.cern.ch/atlas/athena/blob/91ab1c0d7b87e1cae72df085639ee5b1c94592b9/Simulation/G4Utilities/G4DebuggingTools/src/StepHistogramTool.cxx#L58 compared to previously used
`mergeReports();`
- preInclude does not longer specify ['Step']: https://gitlab.cern.ch/atlas/athena/blob/91ab1c0d7b87e1cae72df085639ee5b1c94592b9/Simulation/G4Utilities/G4DebuggingTools/share/preInclude.StepHistogram.py#L11 like in the 21.0 code:
`simFlags.OptionalUserActionList.addAction('G4UA::StepHistogramTool', ['Step'])`https://gitlab.cern.ch/atlas/athena/-/merge_requests/20037More ID trigger configuration2018-12-21T03:02:30+01:00Stewart Martin-HaughMore ID trigger configurationRefactor ID configuration into GeoModel, conditions and algorithms. Add GeoModel and conditions to newJOtestRefactor ID configuration into GeoModel, conditions and algorithms. Add GeoModel and conditions to newJOtesthttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20051TileByteStream: Update reference files.2018-12-21T03:02:52+01:00Scott SnyderTileByteStream: Update reference files.Fix failures in master.Fix failures in master.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20056AthExHive: Fix gcc9 warnings.2018-12-21T03:02:34+01:00Scott SnyderAthExHive: Fix gcc9 warnings.In C++11, implicit declarations of copy and assignment are deprecated if the
class has a user defined destructor or copy or assignment. gcc9 now warns
about this by default.
Adjust to avoid the warning.In C++11, implicit declarations of copy and assignment are deprecated if the
class has a user defined destructor or copy or assignment. gcc9 now warns
about this by default.
Adjust to avoid the warning.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20043Uniqueness checking fixes for typeless TC adds2018-12-21T03:02:39+01:00Benjamin Michael WynneUniqueness checking fixes for typeless TC addsSpotted by @tamartin on old MR, but was pre-cleanup. Fixing now.
Added ctests for the typeless add method as well.Spotted by @tamartin on old MR, but was pre-cleanup. Fixing now.
Added ctests for the typeless add method as well.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20053TileRecUtils: Update reference files.2018-12-21T03:03:00+01:00Scott SnyderTileRecUtils: Update reference files.Fix failures in master.Fix failures in master.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20054LArMonTools: Fix LArRawChannelMonTool configuration.2018-12-21T03:02:26+01:00Scott SnyderLArMonTools: Fix LArRawChannelMonTool configuration.The ATLASReadFilterTool tools in LArRawChannelMonTool are still public,
so need to be added to TooSvc.
Needed to fix failures in q220 in master.The ATLASReadFilterTool tools in LArRawChannelMonTool are still public,
so need to be added to TooSvc.
Needed to fix failures in q220 in master.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20040Configuration cleanup for athenaHLT2018-12-21T03:02:51+01:00Frank WinklmeierConfiguration cleanup for athenaHLT- Move all configuration of athenaHLT services to `TriggerUnixStandardSetup.py`. Remove the use of includes as much as possible (apart from user job options).
- Replace the `OfflineTHistSvc.py` include with a simple flag
- Add an error...- Move all configuration of athenaHLT services to `TriggerUnixStandardSetup.py`. Remove the use of includes as much as possible (apart from user job options).
- Replace the `OfflineTHistSvc.py` include with a simple flag
- Add an error in case the offline THistSvc is used with more than one child process
- Move the configuration of `HLTResultMTMaker` to its own module
- Remove the copy of `hadd` in TrigServices
https://gitlab.cern.ch/atlas/athena/-/merge_requests/20045AthContainersInterfaces,etc: Change getSelectedAuxIDs to return by value.2018-12-21T03:02:17+01:00Scott SnyderAthContainersInterfaces,etc: Change getSelectedAuxIDs to return by value.getSelectedAuxIDs() was returning a value by const reference, which was
problematic for thread-safety, since that requires saving a copy of the
set in the AuxSelector object. Change to returning by value.
Now that auxid_set_t is represe...getSelectedAuxIDs() was returning a value by const reference, which was
problematic for thread-safety, since that requires saving a copy of the
set in the AuxSelector object. Change to returning by value.
Now that auxid_set_t is represented by a bitmap with a move operator,
that should not be very expensive.
Also change AuxDiscoverySvc::getauxIDs() to return by value.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20052LArRecUtils: Fix reference to LArHVDB.2018-12-21T03:02:43+01:00Scott SnyderLArRecUtils: Fix reference to LArHVDB.LArHVDB from LArConditionsCommon should be imported, not included.
Needed to get q220 running again.LArHVDB from LArConditionsCommon should be imported, not included.
Needed to get q220 running again.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20055TileRecEx: Adjust for tools moved from CaloD3PDMaker to CaloSysD3PDMaker.2018-12-21T03:03:03+01:00Scott SnyderTileRecEx: Adjust for tools moved from CaloD3PDMaker to CaloSysD3PDMaker.Adjust for tools moved from CaloD3PDMaker to CaloSysD3PDMaker.Adjust for tools moved from CaloD3PDMaker to CaloSysD3PDMaker.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20049EventContainers: Revert gcc9 warning change.2019-02-12T17:49:45+01:00Scott SnyderEventContainers: Revert gcc9 warning change.The const_iterator change is suspected of causing performance problems
(ATLASRECTS-4808). Revert for now, pending further analysis.The const_iterator change is suspected of causing performance problems
(ATLASRECTS-4808). Revert for now, pending further analysis.