athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2020-10-07T15:12:36+02:00https://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/20029Update SCT digitization tool to directly load SCT hits (ATLASSIM-3946)2018-12-26T03:02:26+01:00Tadej Novaktadej.novak@cern.chUpdate SCT digitization tool to directly load SCT hits (ATLASSIM-3946)Moving away from pile-up merge service for overlay. Adds an optional read handle for SCT hits to bypass the service directly. For simplicity I kept the service enabled for now.
/cc @odaMoving away from pile-up merge service for overlay. Adds an optional read handle for SCT hits to bypass the service directly. For simplicity I kept the service enabled for now.
/cc @odahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20167TileRecUtils, etc: Switch to using TileDQstatusAlg.2019-01-05T03:02:27+01:00Scott SnyderTileRecUtils, etc: Switch to using TileDQstatusAlg.Change from (MT-unsafe) TileBeamInfoProvider to using TileDQstatusAlg
for TileCellBuilder, TileRawChannelBuilder, TileRawChannelNoiseFilter,
and TileDigitsMaker.
Still have some references to TileBeamInfoProvider from job configuration...Change from (MT-unsafe) TileBeamInfoProvider to using TileDQstatusAlg
for TileCellBuilder, TileRawChannelBuilder, TileRawChannelNoiseFilter,
and TileDigitsMaker.
Still have some references to TileBeamInfoProvider from job configuration
(will be cleaned up in a subsequent merge).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/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.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20213SCT RDO updates to reduce size for overlay MC (ATLASSIM-3903)2019-01-21T01:53:42+01:00Susumu OdaSCT RDO updates to reduce size for overlay MC (ATLASSIM-3903)SCT RDO updates to reduce size for overlay MC
https://its.cern.ch/jira/browse/ATLASSIM-3903
* SCT3_RawData_p4 was created to have an unsigned short for a data word and a unsigned short for strip (<=13 bits) and row (<=3 bits) numb...SCT RDO updates to reduce size for overlay MC
https://its.cern.ch/jira/browse/ATLASSIM-3903
* SCT3_RawData_p4 was created to have an unsigned short for a data word and a unsigned short for strip (<=13 bits) and row (<=3 bits) numbers.
* SCT_RawDataContainer_p4 was created to drop the unused error words.
* The packing of fired strips in digitization with the Expanded mode was changed in SCT_FrontEnd and SCT_ClusteringTool.
RunTier0Tests.py did not find unexpected differences. [RunTier0Tests.log](/uploads/c6e9837b908c6b8390e8aa6efce35dca/RunTier0Tests.log)
https://gitlab.cern.ch/atlas/athena/merge_requests/20374 is the corresponding MR for the 21.3 branch.
https://gitlab.cern.ch/atlas/athena/merge_requests/20456 is the corresponding MR for the 21.0 branch.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20214PixelRadDamDigitization: Algorithm for interpolation of irraditaed E fields2019-06-06T15:52:50+02:00Lennart AdamPixelRadDamDigitization: Algorithm for interpolation of irraditaed E fieldsThe radiation damage digitization code uses a series of maps of the E-field (and other quantities) inside the sensor to incorporate radiation damage effects. The E field maps maps are .dat (plain text) files and available for certain be...The radiation damage digitization code uses a series of maps of the E-field (and other quantities) inside the sensor to incorporate radiation damage effects. The E field maps maps are .dat (plain text) files and available for certain benchmark values of the radiation dose (fluence) and bias voltage applied to the sensors. As the fluence is a continuous variable it is not possible to precompute all E field maps of interest.
The newly added ATHENA algorithm EfieldInterpolator creates E field maps for any fluence or bias voltage value of interest by interpolation of the precomputed maps (.dat files) available. The interpolation uses cubic splines, but other methods can be set as well e.g. linear interpolation. The consistency of the creation of maps was tested with a closure test.
The default behaviour of the Digitization code is preserved, i.e. if benchmark values are requested the precomputed maps will be used. In case reasonable values (within the range of the precomputed maps) for bias voltage and fluence for all four layers are set the interpolation will be used to create an irradiated E field. All other maps are produced based on the interpolated E fields.
The MR is also planned for rel22.
Test RunTier0Tests.py passed without warnings.
Tagging @bnachman and @mbombenhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20228Merge 21.0.91 into 21.32019-01-10T12:56:11+01:00John Derek ChapmanMerge 21.0.91 into 21.3This merge request merges the changes that went into the ~"21.0" branch between the [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....This merge request merges the changes that went into the ~"21.0" branch between the [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.91) tags into the ~"21.3" branch.
[release/21.0.91](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.91) contains the following ~"frozen\-tier0\-violating" merge requests:
- https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/16171
- https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/15893
- https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/15117
- https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/16009
- https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/16049
[release/21.0.91](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.91) contains one merge request which changes Geant4 simulation output:
https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/16126
Full details of the individual merge requests that went into [release/21.0.91](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.91) were lost in the repository clean-up, but the full diff between [release/21.0.91](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.91) and
[release/21.0.90](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.90)
is available at
https://gitlab.cern.ch/atlas/athena/compare/release/21.0.90...release/21.0.91https://gitlab.cern.ch/atlas/athena/-/merge_requests/20271Remove references to (now unused) TileBeamInfoProvider from most JO files.2019-01-11T03:02:50+01:00Scott SnyderRemove references to (now unused) TileBeamInfoProvider from most JO files.We previously changed from using the non-MT-safe TileBeamInfoProvider to TileDQstatusAlg.
Now working on removing the remaining references to TileBeamInfoProvider from job configuration.We previously changed from using the non-MT-safe TileBeamInfoProvider to TileDQstatusAlg.
Now working on removing the remaining references to TileBeamInfoProvider from job configuration.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20280FastTRT_Digitization : configuration cleanup2019-01-16T03:34:42+01:00Tommaso LariFastTRT_Digitization : configuration cleanupRemoving the reference to two TRT database folders which do no longer exist (ATLASSIM-2698).
I compiled and run a fast TRT digitization job on a few events and found identical results to those before my changes (as expected, those line...Removing the reference to two TRT database folders which do no longer exist (ATLASSIM-2698).
I compiled and run a fast TRT digitization job on a few events and found identical results to those before my changes (as expected, those lines in the configuration were not supposed to be used in any way)https://gitlab.cern.ch/atlas/athena/-/merge_requests/20286Switch BCM_DigitizationTool to use IAthRNGSvc2019-01-25T03:02:39+01:00John Derek ChapmanSwitch BCM_DigitizationTool to use IAthRNGSvcIn order for digitization output to be reproducible in AthenaMT the digitization code must be migrated to use the thread-safe random number service. Sub-system digitization code can be migrated one sub-system at a time. Decided to start ...In order for digitization output to be reproducible in AthenaMT the digitization code must be migrated to use the thread-safe random number service. Sub-system digitization code can be migrated one sub-system at a time. Decided to start with BCM as this is the simplest case.
Local tests show that the digitization jobs run OK.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20291Migrate SCT_DigitizationTool to use IAtRNGSvc for AthenaMT2019-01-18T03:02:14+01:00John Derek ChapmanMigrate SCT_DigitizationTool to use IAtRNGSvc for AthenaMTIn order to make the output of MT MC Overlay (and digitization) reproducible then we need to use the thread-safe random number service (via `IAtRNGSvc`) in all digitization code. This merge request does this for the SCT Digitization code...In order to make the output of MT MC Overlay (and digitization) reproducible then we need to use the thread-safe random number service (via `IAtRNGSvc`) in all digitization code. This merge request does this for the SCT Digitization code.
The approach taken is to retrieve the `CLHEP::HepRandomEngine` instance re-seeded for the current event in a method of the `PileUpTool` which is called once per event, this is then as an argument in calls to other methods where random numbers are required. This helps to make those tools (more) const.
Due to the slightly different way that the random number seeding is done in the MT service, the output is slightly different, but this should just be statistical.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20297Migrate PixelDigitization to use IAtRNGSvc for AthenaMT2019-01-22T20:30:09+01:00John Derek ChapmanMigrate PixelDigitization to use IAtRNGSvc for AthenaMTIn order to make the output of MT MC Overlay (and digitization) reproducible then we need to use the thread-safe random number service (via `IAtRNGSvc`) in all digitization code. This merge request does this for the Pixel Digitization co...In order to make the output of MT MC Overlay (and digitization) reproducible then we need to use the thread-safe random number service (via `IAtRNGSvc`) in all digitization code. This merge request does this for the Pixel Digitization code.
The approach taken is to retrieve the `CLHEP::HepRandomEngine` instance re-seeded for the current event in a method of the `PileUpTool` which is called once per event, this is then as an argument in calls to other methods where random numbers are required. This helps to make those tools (more) const.
Due to the slightly different way that the random number seeding is done in the MT service, the output is slightly different, but this should just be statistical.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20306New style python configuration for RngComps and BCM_Digitization2019-03-15T11:02:11+01:00Rupert TombsNew style python configuration for RngComps and BCM_DigitizationAdd ComponentAccumulator styled services for RngComps core pseudo-random number generation services.
Modify UnifyProperties.py to allow combination of seeds.
Add ConfigFlags styled configuration in BCM_DigitizationConfigFlags.py.
Add ...Add ComponentAccumulator styled services for RngComps core pseudo-random number generation services.
Modify UnifyProperties.py to allow combination of seeds.
Add ConfigFlags styled configuration in BCM_DigitizationConfigFlags.py.
Add ComponentAccumulator styled tools and algorithms for BCM_Digitization in BCM_DigitizationConfigNew.py.
-New appended to avoid collision with old style code.
Add tests for RandomServices.py and BCM_DigitizationConfigNew.py (which depends on BCM_DigitizationConfigFlags.py).https://gitlab.cern.ch/atlas/athena/-/merge_requests/20345Migrate TRTDigitizationTool to use IAtRNGSvc for AthenaMT2019-01-30T03:01:57+01:00John Derek ChapmanMigrate TRTDigitizationTool to use IAtRNGSvc for AthenaMTIn order to make the output of MT MC Overlay (and digitization) reproducible then we need to use the thread-safe random number service (via `IAtRNGSvc`) in all digitization code. This merge request does this for the TRT Digitization code...In order to make the output of MT MC Overlay (and digitization) reproducible then we need to use the thread-safe random number service (via `IAtRNGSvc`) in all digitization code. This merge request does this for the TRT Digitization code.
The approach taken is to retrieve the `CLHEP::HepRandomEngine` instance re-seeded for the current event in a method of the `PileUpTool` which is called once per event, this is then as an argument in calls to other methods where random numbers are required. This helps to make those tools (more) const.
Due to the slightly different way that the random number seeding is done in the MT service, the output is slightly different, but this should just be statistical.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20360Sweeping !20280 from 21.3 to 21.9.
FastTRT_Digitization : configuration cleanup2019-01-16T03:34:39+01:00Atlas NightlybuildSweeping !20280 from 21.3 to 21.9.
FastTRT_Digitization : configuration cleanupFastTRT_Digitization : configuration cleanup
See merge request atlas/athena!20280FastTRT_Digitization : configuration cleanup
See merge request atlas/athena!20280https://gitlab.cern.ch/atlas/athena/-/merge_requests/20374SCT RDO updates to reduce size for overlay MC (ATLASSIM-3903)2019-09-27T21:13:43+02:00Susumu OdaSCT RDO updates to reduce size for overlay MC (ATLASSIM-3903)SCT RDO updates to reduce size for overlay MC
https://its.cern.ch/jira/browse/ATLASSIM-3903
- SCT3_RawData_p4 was created to have an unsigned short for a data word and a unsigned short for strip (<=13 bits) and row (<=3 bits) numbe...SCT RDO updates to reduce size for overlay MC
https://its.cern.ch/jira/browse/ATLASSIM-3903
- SCT3_RawData_p4 was created to have an unsigned short for a data word and a unsigned short for strip (<=13 bits) and row (<=3 bits) numbers.
- SCT_RawDataContainer_p4 was created to drop the unused error words.
- The packing of fired strips in digitization with the Expanded mode was changed in SCT_FrontEnd and SCT_ClusteringTool.
https://gitlab.cern.ch/atlas/athena/merge_requests/20213 is the corresponding MR for the master branch.
https://gitlab.cern.ch/atlas/athena/merge_requests/20456 is the corresponding MR for the 21.0 branch.
RunTier0Tests.py did not find unexpected differences. [RunTier0Tests.log](/uploads/44e7fbffaaeabbca66e6ac4ffa90e880/RunTier0Tests.log)https://gitlab.cern.ch/atlas/athena/-/merge_requests/20394Improvement of pixel conditions (ATLASRECTS-4662)2019-02-27T03:02:29+01:00Soshi TsunoImprovement of pixel conditions (ATLASRECTS-4662)In current code, the conditions data is interfaced by a tool, then, if the other tool needs the conditions data, that tool calls the "interface tool". That is, a tool calls a tool to access conditions data. This makes complicated structu...In current code, the conditions data is interfaced by a tool, then, if the other tool needs the conditions data, that tool calls the "interface tool". That is, a tool calls a tool to access conditions data. This makes complicated structure of the code.
So, the suggestion raised in ATLASRECTS-4662 was to drop the interface tool, but directly handle the conditions data.
Based on this suggestion, we deleted the PixelDCSConditionsTool which was called from PixelLorentzAngleTool, PixelPropertiesTool, PixelConditionsSummaryTool. Now, they access the DCS data through the conditions algorithm directly.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20405Remove unnecessary (I)SiProperties(CH)Svc and LorentzAngleSvcSetup.py (ATLASR...2019-01-23T03:02:56+01:00Susumu OdaRemove unnecessary (I)SiProperties(CH)Svc and LorentzAngleSvcSetup.py (ATLASRECTS-4048)Remove unnecessary (I)SiProperties(CH)Svc and LorentzAngleSvcSetup.py.
Client configuration are updated accordingly.
https://its.cern.ch/jira/browse/ATLASRECTS-4048
Although updated codes should not affect anything of q221/q431 ...Remove unnecessary (I)SiProperties(CH)Svc and LorentzAngleSvcSetup.py.
Client configuration are updated accordingly.
https://its.cern.ch/jira/browse/ATLASRECTS-4048
Although updated codes should not affect anything of q221/q431 tests, RunTier0Tests.py was run and fine.