athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2018-12-20T03:02:58+01:00https://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/20005Propagate xAOD::EventInfo from digitization step onwards2020-10-07T15:12:36+02:00Tadej Novaktadej.novak@cern.chPropagate xAOD::EventInfo from digitization step onwards**Migrated from old repository MR 16270.**
Propagate xAOD::EventInfo from digitization step onwards:
- write it out after digi, overlay and trigger steps
- ensure we do a deep copy when needed so we remove the `const` requirement
I upd...**Migrated from old repository MR 16270.**
Propagate xAOD::EventInfo from digitization step onwards:
- write it out after digi, overlay and trigger steps
- ensure we do a deep copy when needed so we remove the `const` requirement
I updated all job options with the exception of the following:
_Followed-up separately:_
TileCalibAlgs/share/jobOptions_TileInfoDumpOFLP200.py
TileRecEx/share/jobOptions_TileCalibRec.py
_Not updated:_
AthenaPoolTools/EventCount_jobOptions.py — running on EVNT
CaloCondBlobAlgs/CaloNoiseDbExample_read.py
LArCafJobs/skeleton.LArCAF.py — data only
LArCafJobs/skeleton.LArNoise_fromraw.py — data only
LArCalibTools/LArPulseShapeRun.py — data only
LArExample/LArCalib_Delay_OFC_Cali_jobOptions.py — data only
LArExample/LArCalib_PedestalAutoCorr_jobOptions.py — data only
LArExample/LArCalib_Ramp_jobOptions.py — data only
LArROD/LArOFCIter2Ntuple.py — data only
MuonCalibJobTransforms/skeleton.mdt_calib_ntuple.py — data only
MuonCalibJobTransforms/skeleton.mdt_calib_ntuple_tf.py — data only
CaloD3PDMaker/MakeSCLArHitD3PD_topOptions.py — running on HITS
TileCalibAlgs/jobOptions_OFC2DBTest.py — data only
TileCalibAlgs/jobOptions_TileExpertDump.py — data only
TileCalibAlgs/jobOptions_TileInfoDump.py — data only
TileRec/jobOptions_TileEventFilter.py — I do not want to complicate it
TileSimEx/jobOptions_Tile_Dig.py — running on HITS
TileMonitoring/TileRec_topOptions.py — data only
TileMonitoring/jobOptions_TileLasMon.py — data only
TileMonitoring/jobOptions_TileTBMon.py — data only
TileRecAlgs/jobOptions_TileEventSelector.py — data only
TrigCostMonitor/readTrigCost.py — data only
TrigSteering/pureSteering_jobOptions.py — data only
TrigT1CaloCalibUtils/LArL1CaloRampMaker.py — data only
TrigT1CaloCalibUtils/TileL1CaloRampMaker.py — data only
This is slightly ~"frozen-tier0-violating", although it should not affect physics. Disabling sweep as we want to do this differently in master.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20008migrate PileUpEventInfo to xAOD::EvenInfo2019-02-13T03:02:35+01:00Marcin Nowakmigrate PileUpEventInfo to xAOD::EvenInfoMigrated PileUpEventInfo to xAOD::EvenInfo
Jira: https://its.cern.ch/jira/browse/ATLASSIM-2633Migrated PileUpEventInfo to xAOD::EvenInfo
Jira: https://its.cern.ch/jira/browse/ATLASSIM-2633https://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/20013Adds an option to turn on range cuts for gamma processes (conv, phot, compt)2019-02-15T14:07:13+01:00Miha Muskinjamiha.muskinja@cern.chAdds an option to turn on range cuts for gamma processes (conv, phot, compt)A simple preInclude that turns on range cuts for conv, phot, compt processes:
`--preInclude='SimulationJobOptions/preInclude.GammaRangeCuts.py'`A simple preInclude that turns on range cuts for conv, phot, compt processes:
`--preInclude='SimulationJobOptions/preInclude.GammaRangeCuts.py'`https://gitlab.cern.ch/atlas/athena/-/merge_requests/20014G4 passback working in ISF MT2019-12-11T03:02:02+01:00Benjamin Michael WynneG4 passback working in ISF MTAdded a mechanism for returning secondaries to SimKernelMT, rather than going through particle broker.
Currently returns identical results to the non-MT version, if you modify non-MT with the following postExec command:
```
--postEx...Added a mechanism for returning secondaries to SimKernelMT, rather than going through particle broker.
Currently returns identical results to the non-MT version, if you modify non-MT with the following postExec command:
```
--postExec "svcMgr.ISF_ParticleBrokerSvcNoOrdering.ParticleOrderingTool='ISF__EnergyParticleOrderingTool';svcMgr.ISF_ParticleBrokerSvcNoOrdering.AlwaysUseGeoIDSvc=True"
```
This command orders the particle queue in a predictable way.https://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/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)https://gitlab.cern.ch/atlas/athena/-/merge_requests/20106LArG4H6SD: Fix compilation warnings.2018-12-26T09:03:51+01:00Scott SnyderLArG4H6SD: Fix compilation warnings.Compilation warnings: Do not use std::move in a return statement.Compilation warnings: Do not use std::move in a return statement.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20113FastCaloSim: Add a basic test for FastShowerCellBuilderTool.2018-12-27T03:02:19+01:00Scott SnyderFastCaloSim: Add a basic test for FastShowerCellBuilderTool.Add a basic test for FastShowerCellBuilderTool.Add a basic test for FastShowerCellBuilderTool.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20131LArG4H6SD: Fix gcc9 warnings.2018-12-29T03:02:38+01:00Scott SnyderLArG4H6SD: 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/20132ISF_Algorithms: Fix clang warning.2018-12-29T03:02:10+01:00Scott SnyderISF_Algorithms: Fix clang warning.Clang warning: missing inconsistent use of override keyword.Clang warning: missing inconsistent use of override keyword.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20152FastCaloSim: Starting to make FastShowerCellBuilderTool const.2019-01-04T03:02:19+01:00Scott SnyderFastCaloSim: Starting to make FastShowerCellBuilderTool const.Make const a number of methods that can trivally be so changed.Make const a number of methods that can trivally be so changed.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20155BeamEffects: Fixes for unit test.2019-01-04T03:02:14+01:00Scott SnyderBeamEffects: Fixes for unit test.Lengthen timeout; ignore messages with filenames.
Allow overriding location of input file.
Fix unmerged component.Lengthen timeout; ignore messages with filenames.
Allow overriding location of input file.
Fix unmerged component.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20163BarcodeServices: Fix clang warnings.2019-01-05T03:02:19+01:00Scott SnyderBarcodeServices: Fix clang warnings.clang warnings: Missing override keywords.clang warnings: Missing override keywords.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20165MuonG4SD: Comply with ATLAS naming conventions.2019-01-05T03:02:14+01:00Scott SnyderMuonG4SD: Comply with ATLAS naming conventions.Private data members should start with m_.Private data members should start with m_.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20168Move OutputStream to output Sequence to help AthenaMT scheduling.2019-02-22T10:35:41+01:00Peter Van GemmerenMove OutputStream to output Sequence to help AthenaMT scheduling.This MR moves OutputStreams (that have the asAlg flag set, most of them) into the Athena Output Sequence to help with MT scheduling (@leggett , @tsulaia ).
It also adds a mutex for writing that is currently needed if more than one strea...This MR moves OutputStreams (that have the asAlg flag set, most of them) into the Athena Output Sequence to help with MT scheduling (@leggett , @tsulaia ).
It also adds a mutex for writing that is currently needed if more than one stream is used (because writing modifies the SG proxy of the objects in the ItemList, conversion service caches file name for object placement, to be fixed later).
Some tests for Registration Stream may need updating or they could be obsolete anyway (@cranshaw ).https://gitlab.cern.ch/atlas/athena/-/merge_requests/20172Add ISF config to run G4FastCalo in Athena MT (ATLASSIM-3958)2019-02-27T03:02:43+01:00Ahmed Hasiba.hasib@cern.chAdd ISF config to run G4FastCalo in Athena MT (ATLASSIM-3958)In order to run G4FastCalo in AthenaMT we need to define a kernel `G4FastCaloMT` in ISF_ConfigIn order to run G4FastCalo in AthenaMT we need to define a kernel `G4FastCaloMT` in ISF_Confighttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20176FastCaloSim: Working to make FastShowerCellBuilderTool const.2019-01-08T03:02:28+01:00Scott SnyderFastCaloSim: Working to make FastShowerCellBuilderTool const.Use handles to access StoreGate.Use handles to access StoreGate.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20185Digitization: Update expected output for addition of TileDQstatusAlg.2019-01-08T03:02:24+01:00Scott SnyderDigitization: Update expected output for addition of TileDQstatusAlg.Fixing test failure in master.Fixing test failure in master.