athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2022-08-16T20:42:35+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/55895TileCalibAlgs: Update h3000 ntuple for Tile laser calibration runs,2022-08-16T20:42:35+02:00Marie-Helene CarronTileCalibAlgs: Update h3000 ntuple for Tile laser calibration runs,4 branches added: 2 branches for the average of ratios of photodiodes (low & high gains),
2 branches for their standard deviation4 branches added: 2 branches for the average of ratios of photodiodes (low & high gains),
2 branches for their standard deviationMarie-Helene CarronMarie-Helene Carronhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/559242022-08-15: Daily merge of 22.0 into master2022-08-17T03:43:20+02:00Tadej Novaktadej.novak@cern.ch2022-08-15: Daily merge of 22.0 into masterMerging `nightly/22.0/2022-08-15T2101` into ~master.
Conflicts (always taken newest):
- `MuonSpectrometer/MuonCnv/MuonByteStream/src/MuonCacheCreator.cxx`
- `MuonSpectrometer/MuonCnv/MuonRdoToPrepData/src/MuonPRDCacheCreator.cxx`
- `Muo...Merging `nightly/22.0/2022-08-15T2101` into ~master.
Conflicts (always taken newest):
- `MuonSpectrometer/MuonCnv/MuonByteStream/src/MuonCacheCreator.cxx`
- `MuonSpectrometer/MuonCnv/MuonRdoToPrepData/src/MuonPRDCacheCreator.cxx`
- `MuonSpectrometer/MuonValidation/MuonTesterTree/MuonTesterTree/MuonTesterBranch.h`
- `MuonSpectrometer/MuonValidation/MuonTesterTree/Root/MuonTesterBranch.cxx`
- `Simulation/Digitization/python/DigitizationSteering.py`
Fixed compilation issues:
- `Simulation/ISF/ISF_Core/ISF_Event/test/ISFTruthIncident_test.cxx`
/cc @jchapman @jojungge @lmijovicTadej Novaktadej.novak@cern.chTadej Novaktadej.novak@cern.chhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/559492022-08-16: Daily merge of 22.0 into master2022-08-17T09:42:36+02:00Tadej Novaktadej.novak@cern.ch2022-08-16: Daily merge of 22.0 into masterMerging `nightly/22.0/2022-08-16T2101` into ~master. No conflicts!
Reverted !55921 due to compilation errors as sweep was not done properly (so not really needed).Merging `nightly/22.0/2022-08-16T2101` into ~master. No conflicts!
Reverted !55921 due to compilation errors as sweep was not done properly (so not really needed).Tadej Novaktadej.novak@cern.chTadej Novaktadej.novak@cern.chhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/55783TileMonitoring: update of Tile Jet monitoring by adding histograms per radial...2022-08-17T18:35:42+02:00Tomas DavidekTileMonitoring: update of Tile Jet monitoring by adding histograms per radial layerThe energy and time information originally stored in histograms per partition
is now introduced per partition and per radial layer. The overall
histograms/profiles per partition are removed since they can be obtained by
adding the per la...The energy and time information originally stored in histograms per partition
is now introduced per partition and per radial layer. The overall
histograms/profiles per partition are removed since they can be obtained by
adding the per layer information.Tomas DavidekTomas Davidekhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/55879CaloRec+TileRecUtils: Do not produce MBTS and E4pr containers in Run4 (ATLASR...2022-08-17T18:37:47+02:00Siarhei HarkushaCaloRec+TileRecUtils: Do not produce MBTS and E4pr containers in Run4 (ATLASRECTS-7151)CA based Tile cell builder configuration has been updated
to produce MBTS containers only for RUN1,RUN2,RUN3
and E4prime container only for RUN2.CA based Tile cell builder configuration has been updated
to produce MBTS containers only for RUN1,RUN2,RUN3
and E4prime container only for RUN2.Siarhei HarkushaSiarhei Harkushahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/55938Sweeping !55879 from master to 22.0.
CaloRec+TileRecUtils: Do not produce MBT...2022-08-17T18:37:47+02:00Atlas NightlybuildSweeping !55879 from master to 22.0.
CaloRec+TileRecUtils: Do not produce MBTS and E4pr containers in Run4 (ATLASRECTS-7151)CaloRec+TileRecUtils: Do not produce MBTS and E4pr containers in Run4 (ATLASRECTS-7151)
See merge request atlas/athena!55879CaloRec+TileRecUtils: Do not produce MBTS and E4pr containers in Run4 (ATLASRECTS-7151)
See merge request atlas/athena!55879https://gitlab.cern.ch/atlas/athena/-/merge_requests/5595823.0-cppcheck-TileRecUtils2022-08-17T21:42:43+02:00Shaun Roe23.0-cppcheck-TileRecUtils[minor] Solving the last of the cppcheck defects for the TileCalorimeter in the categories Error, Warning, Portability. Mostly uninitialised variables.
Minor header cleanup also.[minor] Solving the last of the cppcheck defects for the TileCalorimeter in the categories Error, Warning, Portability. Mostly uninitialised variables.
Minor header cleanup also.Shaun RoeShaun Roehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/559812022-08-17: Daily merge of 22.0 into master2022-08-18T09:43:24+02:00Tadej Novaktadej.novak@cern.ch2022-08-17: Daily merge of 22.0 into masterMerging `nightly/22.0/2022-08-17T2101` into ~master.
The only conflicts were `version.txt` files.Merging `nightly/22.0/2022-08-17T2101` into ~master.
The only conflicts were `version.txt` files.Tadej Novaktadej.novak@cern.chTadej Novaktadej.novak@cern.chhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/55993TileConditions+TileConfiguration+TileRecUtils: Add Tile Wiener raw channel...2022-08-19T15:48:33+02:00Siarhei HarkushaTileConditions+TileConfiguration+TileRecUtils: Add Tile Wiener raw channel...TileConditions+TileConfiguration+TileRecUtils: Add Tile Wiener raw channel builder configuration for Run3
CA-based configuration of Tile raw channel builder using Wiener method has been added for Run 3.
Test for Tile Wiener raw channel...TileConditions+TileConfiguration+TileRecUtils: Add Tile Wiener raw channel builder configuration for Run3
CA-based configuration of Tile raw channel builder using Wiener method has been added for Run 3.
Test for Tile Wiener raw channel builder configuration has been added.Siarhei HarkushaSiarhei Harkushahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/56043AtlasDetectorIDHelper: use AthMessaging for logging2022-08-24T09:42:09+02:00Frank WinklmeierAtlasDetectorIDHelper: use AthMessaging for loggingUsing `AthMessaging` for logging in `AtlasDetectorIDHelper`. This demotes the following messages to DEBUG that were never meant to appear in the output in the first place and requires several unit test reference updates:
```
AtlasDetecto...Using `AthMessaging` for logging in `AtlasDetectorIDHelper`. This demotes the following messages to DEBUG that were never meant to appear in the output in the first place and requires several unit test reference updates:
```
AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
```Frank WinklmeierFrank Winklmeierhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/560722022-08-22: Weekend merge of 22.0 into master2022-08-24T09:42:34+02:00Tadej Novaktadej.novak@cern.ch2022-08-22: Weekend merge of 22.0 into masterMerging `nightly/22.0/2022-08-22T2101` into ~master (includes also `r19`, `r20` and `r21`).
Conflicts:
- `version.txt`
- `PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/src/JpsiPlusV0Cascade.cxx` (kept ~master version)
- `...Merging `nightly/22.0/2022-08-22T2101` into ~master (includes also `r19`, `r20` and `r21`).
Conflicts:
- `version.txt`
- `PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/src/JpsiPlusV0Cascade.cxx` (kept ~master version)
- `Reconstruction/RecJobTransforms/python/RecoConfigFlags.py` (kept ~master version)
- `Reconstruction/VKalVrt/VrtSecInclusive/python/VrtSecInclusiveConfig.py` (made sure imports are properly updated)
- `Tools/WorkflowTestRunner/python/References.py` (copied references to master and bumped revisions)Tadej Novaktadej.novak@cern.chTadej Novaktadej.novak@cern.chhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/56242Clean up TrackingVolumes un-needlessy declared as const2022-08-29T14:37:46+02:00Christos Anastopouloschristos.anastopoulos@cern.chClean up TrackingVolumes un-needlessy declared as constClean up TrackingVolume un-needlessy declared as const
In various places we were declaring TrackingVolumes as const, and then we were manipulating them later on in the call chain.
We do no need to create new Tracking Volumes as const a...Clean up TrackingVolume un-needlessy declared as const
In various places we were declaring TrackingVolumes as const, and then we were manipulating them later on in the call chain.
We do no need to create new Tracking Volumes as const as a starting point.
Especially if the next step is manipulate/fill them by passing them to relevant tools ....
So the proper idea seems to be (done in other MT related migrations) :
- Let's create them as non-const
- manipulate/ add to them/ glue them together,
- when we are done access them later on ``as const`` via proper ``const correct`` interfaces.
This MR is step 0, the basic prequisite for cleaning up of all the helpers/processors etc etc.
It avoids a few ``const_cast`` and marks back some methods as ``THREAD_SAFE`` already.
But as this became large on its own the next steps will be separate MRs .
Some of them already open and pending on this one
[https://gitlab.cern.ch/atlas/athena/-/merge_requests/56293]
[https://gitlab.cern.ch/atlas/athena/-/merge_requests/56287]
[https://gitlab.cern.ch/atlas/athena/-/merge_requests/56306]Christos Anastopouloschristos.anastopoulos@cern.chChristos Anastopouloschristos.anastopoulos@cern.chhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/56337TileTBRec: thread-checker fixes2022-08-30T15:42:18+02:00Frank WinklmeierTileTBRec: thread-checker fixesVarious const and thread-safety fixes to make this ancient code pass the
thread-checker. This code is certainly never used in athenaMT though.Various const and thread-safety fixes to make this ancient code pass the
thread-checker. This code is certainly never used in athenaMT though.Frank WinklmeierFrank Winklmeierhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/56354TrackingVolume/TrackingGeometry more const fixes2022-08-30T15:42:24+02:00Christos Anastopouloschristos.anastopoulos@cern.chTrackingVolume/TrackingGeometry more const fixesTrackingVolume/TrackingGeometry more const fixes
We can get rid of a few more ``const_cast`` and make a few more methods ``SAFE``
Ping @fwinkl , @ssnyder , @sroe .TrackingVolume/TrackingGeometry more const fixes
We can get rid of a few more ``const_cast`` and make a few more methods ``SAFE``
Ping @fwinkl , @ssnyder , @sroe .Christos Anastopouloschristos.anastopoulos@cern.chChristos Anastopouloschristos.anastopoulos@cern.chhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/56314Improve truth handling in digitization configuration2022-08-30T20:50:37+02:00Tadej Novaktadej.novak@cern.chImprove truth handling in digitization configurationImprove truth handling in digitization configuration:
- rename `Digitization.TruthOutput` to `Digitization.EnableTruth` to also use it for algorithm scheduling
- disable some algorithms/tools when running with this flag disabled (similar...Improve truth handling in digitization configuration:
- rename `Digitization.TruthOutput` to `Digitization.EnableTruth` to also use it for algorithm scheduling
- disable some algorithms/tools when running with this flag disabled (similar to what is done in legacy config)
- rename `Digitization.DoDigiTruth` to `Digitization.DoHardScatterTruth`
/cc @jchapman @tlari @tcuhadarTadej Novaktadej.novak@cern.chTadej Novaktadej.novak@cern.chhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/56371TileMonitoring: Produce Tile channel occupancy maps per gain with different t...2022-08-31T14:16:23+02:00Siarhei HarkushaTileMonitoring: Produce Tile channel occupancy maps per gain with different thresholdsTile Cell monitoring has been updated to add possibility to use different energy thresholds for gains for
occupancy maps over threshold per gain and energy threshold for low gain has been increased up to 10 GeV.Tile Cell monitoring has been updated to add possibility to use different energy thresholds for gains for
occupancy maps over threshold per gain and energy threshold for low gain has been increased up to 10 GeV.Siarhei HarkushaSiarhei Harkushahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/563892022-08-31: daily merge of 22.0 into master2022-08-31T15:43:19+02:00Frank Winklmeier2022-08-31: daily merge of 22.0 into masterDisabled AOD output checks in q449.Disabled AOD output checks in q449.https://gitlab.cern.ch/atlas/athena/-/merge_requests/56213AthMessaging: do lazy MessageSvc retrieval2022-08-31T21:42:47+02:00Frank WinklmeierAthMessaging: do lazy MessageSvc retrievalDelay the `MessageSvc` retrieval until the first message is being
printed. Often `AthMessaging` is used for small data-like classes that
rarely print (e.g. only when there is an error). This avoids paying the
cost of the service retrieva...Delay the `MessageSvc` retrieval until the first message is being
printed. Often `AthMessaging` is used for small data-like classes that
rarely print (e.g. only when there is an error). This avoids paying the
cost of the service retrieval already during construction.Frank WinklmeierFrank Winklmeierhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/56414LArTrackingGeometry, TileTrackingGeometry pass the ATLAS THREAD CHECKER2022-09-01T15:44:00+02:00Christos Anastopouloschristos.anastopoulos@cern.chLArTrackingGeometry, TileTrackingGeometry pass the ATLAS THREAD CHECKERLArTrackingGeometry, TileTrackingGeometry pass the ATLAS THREAD CHECKER
ping @fwinkl that had fixed some of the issues before.
The TrkGeometry cleanup (last ones) seems to have fixed the last ones.LArTrackingGeometry, TileTrackingGeometry pass the ATLAS THREAD CHECKER
ping @fwinkl that had fixed some of the issues before.
The TrkGeometry cleanup (last ones) seems to have fixed the last ones.https://gitlab.cern.ch/atlas/athena/-/merge_requests/564332022-09-01: daily merge of 22.0 into master2022-09-01T21:42:38+02:00Frank Winklmeier2022-09-01: daily merge of 22.0 into masterDaily merge. No conflicts.Daily merge. No conflicts.