athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2020-07-07T12:38:29+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/34482WIP: Make sure DataHandle initialize is called when not used2020-07-07T12:38:29+02:00Adam Edward BartonWIP: Make sure DataHandle initialize is called when not usedDataHandles should be initialized with `false` if they are not used.DataHandles should be initialized with `false` if they are not used.https://gitlab.cern.ch/atlas/athena/-/merge_requests/33615Merging recent developments in jet grooming2020-06-16T20:19:38+02:00Teng Jian KhooMerging recent developments in jet grooming@delsart, I put together the new JetTrimming class you prepared with my JetGroomer, making the former a subclass of the latter. I think this way it ends up being quite neat, as for any given grooming method, one just has to define the pe...@delsart, I put together the new JetTrimming class you prepared with my JetGroomer, making the former a subclass of the latter. I think this way it ends up being quite neat, as for any given grooming method, one just has to define the per-jet operation, and configure a filter with the appropriate setup in `initialize()`. In fact even most of the per-jet operation is the same, it's only the decorations that need to be changed -- so in principle we could even think of moving even more into the `JetGroomer` class.
In the process, I also reworked `PseudoJetTranslator` to eliminate bare pointers -- we can work with references everywhere to make the memory management a mite more robust.
A few other minor changes:
* Created a WriteHandleKey for the output pseudojets in `JetGroomer` and `JetClusterer` -- I think it is better to communicate this explicitly to the scheduler. This is autoconfigured, so `initialize` will print a warning if the user sets any value. Lastly, I changed the name of the container to be `ToolName+"FinalPJ"`, because I think this will be more unique (I think the previous setup could clash if you had 2 jet collections built from the same merged PJ container).
* Merging the various Read/WriteHandles, I thought `UngroomedJets` and `ParentPseudoJets` was a bit more explicit.
This was tested so far with `JetRecAlgTestCfg.py`, but we could stand to verify the results vs the older classes.
This MR needs to be handled after !33564 is merged.https://gitlab.cern.ch/atlas/athena/-/merge_requests/22675Clean-up public Tile Conditions Tools in Digitization jobs2019-04-17T11:14:58+02:00John Derek ChapmanClean-up public Tile Conditions Tools in Digitization jobsPublic verions of `TileCondToolPulseShape`, `TileCondToolNoiseSample`,
`TileCondToolEmscale`, `TileCondToolTiming` and `TileCondToolOfcCool`
are not used in digitization jobs, so protecting against them being
created. Only doing this for...Public verions of `TileCondToolPulseShape`, `TileCondToolNoiseSample`,
`TileCondToolEmscale`, `TileCondToolTiming` and `TileCondToolOfcCool`
are not used in digitization jobs, so protecting against them being
created. Only doing this for digitization jobs, in case there are
other clients in reconstruction.https://gitlab.cern.ch/atlas/athena/-/merge_requests/22628More clients of CaloNoiseAlg2019-04-16T14:35:28+02:00Walter LamplMore clients of CaloNoiseAlgThis one contains (and superseeds) !22582.
It contains:
Migration of the CaloTopoClusterMaker, CaloClusterMomentsMaker and CaloTopoTowerAlg to the new CaloNoise conditions object, removing the dependency on the thread-unsafe CaloNoise...This one contains (and superseeds) !22582.
It contains:
Migration of the CaloTopoClusterMaker, CaloClusterMomentsMaker and CaloTopoTowerAlg to the new CaloNoise conditions object, removing the dependency on the thread-unsafe CaloNoiseTool.
On top of this, a number of obsolete features of the TopoClusterMaker are removed. This was discussed on the calo-perf mailing list.
While testing this, I found that the implementation of the CaloNoise::getEffectiveSigma (that is used to account for the double-gaussian noise observed in the TileCal during some periods) was wrong. This MR fixes also this problem. I verified that the resulting CaloCalTopoClusters container remains identical.
It contains also fixes for the CI failures observed in !22582.https://gitlab.cern.ch/atlas/athena/-/merge_requests/22582Calo noise alg clients12019-04-12T15:34:13+02:00Walter LamplCalo noise alg clients1This MR migrates the CaloTopoClusterMaker to the new CaloNoise conditions object, removing the dependency on the thread-unsafe CaloNoiseTool.
On top of this, a number of obsolete features of the TopoClusterMaker are removed. This was d...This MR migrates the CaloTopoClusterMaker to the new CaloNoise conditions object, removing the dependency on the thread-unsafe CaloNoiseTool.
On top of this, a number of obsolete features of the TopoClusterMaker are removed. This was discussed on the calo-perf mailing list.
While testing this, I found that the implementation of the CaloNoise::getEffectiveSigma (that is used to account for the double-gaussian noise observed in the TileCal during some periods) was wrong. This MR fixes also this problem. I verified that the resulting CaloCalTopoClusters container remains identical.https://gitlab.cern.ch/atlas/athena/-/merge_requests/21330Added decoding of the timeout bits for QDC (bit 31) and TDC (bit 30) from the...2019-02-21T20:23:51+01:00Henric WilkensAdded decoding of the timeout bits for QDC (bit 31) and TDC (bit 30) from the...Added decoding of the timeout bits for QDC (bit 31) and TDC (bit 30) from the laserbox filter&slama delay word.
QDC and TDC timeout status added to the LaserObject.
QDC timeout bit used to reject event in the h3000 N-tuple fillingAdded decoding of the timeout bits for QDC (bit 31) and TDC (bit 30) from the laserbox filter&slama delay word.
QDC and TDC timeout status added to the LaserObject.
QDC timeout bit used to reject event in the h3000 N-tuple fillinghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20981TileCalibAlgs: Move large arrays into separately-allocated objects.2019-02-11T12:17:15+01:00Scott SnyderTileCalibAlgs: Move large arrays into separately-allocated objects.ubsan can give false positives for classes using virtual derivation that
have excessive space in member variables. Resolve by moving the large
member arrays to a separately allocated object.
Fixes ubsan warnings seen in the gcc8 dbg bu...ubsan can give false positives for classes using virtual derivation that
have excessive space in member variables. Resolve by moving the large
member arrays to a separately allocated object.
Fixes ubsan warnings seen in the gcc8 dbg build.https://gitlab.cern.ch/atlas/athena/-/merge_requests/66971Draft: Fix TileROD_Decoder to enable TPCnv for HLTCalo unpacked cells2023-11-13T22:55:04+01:00Denis Oliveira DamazioDraft: Fix TileROD_Decoder to enable TPCnv for HLTCalo unpacked cellsFor the appreciation of @solodkov.
Fix TileROD_Decoder to enable TPCnv for HLTCalo unpacked cells.
Discussed in ATR-27663.
(I created another one to avoid mixing with LAr changes)For the appreciation of @solodkov.
Fix TileROD_Decoder to enable TPCnv for HLTCalo unpacked cells.
Discussed in ATR-27663.
(I created another one to avoid mixing with LAr changes)https://gitlab.cern.ch/atlas/athena/-/merge_requests/61765Draft: Remove boost from TileConditions 22023-04-09T01:04:51+02:00Andrii VerbytskyiDraft: Remove boost from TileConditions 2Remove boost from TileConditions
Tag @sroeRemove boost from TileConditions
Tag @sroehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/61754Draft: Remove boost from TileConditions 12023-04-11T10:47:18+02:00Andrii VerbytskyiDraft: Remove boost from TileConditions 1Remove boost from TileConditions
Tag @sroeRemove boost from TileConditions
Tag @sroehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/53384TileByteStream: Fix test configuration.2022-05-19T19:38:47+02:00Scott SnyderTileByteStream: Fix test configuration.Update for changes in tile configuration: need to disable Geant4 version check.
Update reference files.
Fixes test failure in master.Update for changes in tile configuration: need to disable Geant4 version check.
Update reference files.
Fixes test failure in master.https://gitlab.cern.ch/atlas/athena/-/merge_requests/41329MC-Overlay implementation for TMDB for RUN 2 L1 Muon Simulation2021-03-13T00:57:20+01:00Joao Gentil Mendes SaraivaMC-Overlay implementation for TMDB for RUN 2 L1 Muon SimulationIncluding MC Overlay in TMDB for RUN 2 L1 Muon Simulation. This change is in TileCalorimeter/TileSimAlgs package alone.
Changes are expected between outputs since the MC Overlay was recently implemented in release 22. And it is being tr...Including MC Overlay in TMDB for RUN 2 L1 Muon Simulation. This change is in TileCalorimeter/TileSimAlgs package alone.
Changes are expected between outputs since the MC Overlay was recently implemented in release 22. And it is being transported here due to the RUN2 L1 Muon Simulation.
An error was also found in the standard digitization path which results in changes to previous processings.
Both of these output changes were already discussed and cleared during the merge in release 22.
Request from this JIRA ticket [ATR-19346](https://its.cern.ch/jira/browse/ATR-19346).https://gitlab.cern.ch/atlas/athena/-/merge_requests/41321MC-Overlay implementation for TMDB for RUN 2 L1 Muon Simulation2021-03-13T00:56:58+01:00Joao Gentil Mendes SaraivaMC-Overlay implementation for TMDB for RUN 2 L1 Muon SimulationIncluding MC Overlay in TMDB for RUN 2 L1 Muon Simulation. This change is in TileCalorimeter/TileSimAlgs package alone.
Changes are expected between outputs since the MC Overlay was recently implemented in release 22. And it is being tr...Including MC Overlay in TMDB for RUN 2 L1 Muon Simulation. This change is in TileCalorimeter/TileSimAlgs package alone.
Changes are expected between outputs since the MC Overlay was recently implemented in release 22. And it is being transported here due to the RUN2 L1 Muon Simulation.
An error was also found in the standard digitization path which results in changes to previous processings.
Both of these output changes were already discussed and cleared during the merge in release 22.
Request from this JIRA ticket [ATR-19346](https://its.cern.ch/jira/browse/ATR-19346).https://gitlab.cern.ch/atlas/athena/-/merge_requests/38776LArConditionsTest+LArRecUtils+TileByteStream+TileRecUtils+LArCellRec: Ignore ...2020-12-03T16:17:51+01:00Scott SnyderLArConditionsTest+LArRecUtils+TileByteStream+TileRecUtils+LArCellRec: Ignore dynamic alignment messageFix test failure in master.
Clean up some obsolete patterns.Fix test failure in master.
Clean up some obsolete patterns.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20270TileConditions: Add TileBadChanTool::isDrawerMasked.2019-01-10T17:10:09+01:00Scott SnyderTileConditions: Add TileBadChanTool::isDrawerMasked.TileROD_Decoder was caching flags of masked drawers, updated each run,
which is not MT-safe. This should instead be done via a conditions algorithm.
Rather than introduce a new conditions algorithm, it seems reasonable to roll
this fun...TileROD_Decoder was caching flags of masked drawers, updated each run,
which is not MT-safe. This should instead be done via a conditions algorithm.
Rather than introduce a new conditions algorithm, it seems reasonable to roll
this functionality into the existing TileBadChannelsCondAlg and make the
result available via TileBadChanTool. That way, TileROD_Decoder doesn't
need to grow any new dependencies.https://gitlab.cern.ch/atlas/athena/-/merge_requests/67086TileROD_Decoder fixes for the issue related to time not being stored in Tile ...2023-11-14T17:44:52+01:00Denis Oliveira DamazioTileROD_Decoder fixes for the issue related to time not being stored in Tile CellsFor the appreciation of @solodkov. Fix TileROD_Decoder to enable TPCnv for HLTCalo unpacked cells. Discussed in ATR-27663. (I created another one to avoid mixing with LAr changes).
Yet another MR with Sacha suggestionsFor the appreciation of @solodkov. Fix TileROD_Decoder to enable TPCnv for HLTCalo unpacked cells. Discussed in ATR-27663. (I created another one to avoid mixing with LAr changes).
Yet another MR with Sacha suggestionshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/659442023-09-20: merge of 23.0 into main2023-09-24T22:05:09+02:00Vakhtang Tsulaia2023-09-20: merge of 23.0 into mainConflicts:
* `DataQuality/dqm_algorithms/src/TRTWeightedAverage.cxx`
Kept the ~main version
* `Reconstruction/Jet/JetMonitoring/python/JetMonitoringStandard.py`
Kept the ~"23.0" version. CC @cdelitzs (!65911)
* `Trigger/TriggerCommon/Tri...Conflicts:
* `DataQuality/dqm_algorithms/src/TRTWeightedAverage.cxx`
Kept the ~main version
* `Reconstruction/Jet/JetMonitoring/python/JetMonitoringStandard.py`
Kept the ~"23.0" version. CC @cdelitzs (!65911)
* `Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py`
Manual merge. Combined lambda with the help message for the `Trigger.Jet.pflowCalibKey` flag. CC @cantel (!65831)
This sweep contains the following MRs:
* !65938 TRT config updates are merged from 'main' into '23.0' (resubmission of 65926) ~DQ
* !65931 ZDC: implement EventInfo flags in case of LUCROD decoding failure, and update to ZdcRecConfig ~ForwardDetectors
* !63562 Adding cross compatability between onnx and lwtnn as a library for NNs ~Simulation
* !65752 Updates to RPD/Centroid Analysis and ZdcNtuple for Heavy Ions ~ForwardDetectors
* !65925 merging new Algo for TRT (and few changes on config) from 'main' into '23.0' ~DQ
* !65911 Configure correct jet collections for monitoring in HI and UPC mode ~Core, ~DQ, ~JetEtmiss, ~Reconstruction, ~Tile
* !65831 Trigger Jet: Add HI UPC pflow calibration configs (ATR-22067) ~JetEtmiss, ~Reconstruction, ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !65881 Heavy Ion : Disable out-of-time pileup topo cluster cut ~Reconstructionhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/6420123.0-coverity-TileMonitoring2023-07-10T13:09:46+02:00Shaun Roe23.0-coverity-TileMonitoringtrap possible out-of-bounds accesstrap possible out-of-bounds accesshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/62222Draft: Replace outdated code with STL2023-07-22T20:31:09+02:00Andrii VerbytskyiDraft: Replace outdated code with STLReplace outdated code with STL. Not to be merged!Replace outdated code with STL. Not to be merged!https://gitlab.cern.ch/atlas/athena/-/merge_requests/61426TileTBAANtuple::Updated to use Felix and legacy containers2023-03-10T12:15:54+01:00Arya AikotTileTBAANtuple::Updated to use Felix and legacy containersTileTBAANtuple is modified to use digits and RawChannels stored in Felix and Legacy containers.
TileTBAANtuple is modified to use RawChannels reconstructed from Fit method and Optimal Filtering for FELIX.TileTBAANtuple is modified to use digits and RawChannels stored in Felix and Legacy containers.
TileTBAANtuple is modified to use RawChannels reconstructed from Fit method and Optimal Filtering for FELIX.Luca FioriniLuca Fiorini