athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2019-01-18T11:44:43+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/20250Overlay: Copy TrackRecordCollection and CaloCalibrationHitContainer (ATLASSIM...2019-01-18T11:44:43+01:00Tadej Novaktadej.novak@cern.chOverlay: Copy TrackRecordCollection and CaloCalibrationHitContainer (ATLASSIM-3911, ATLASSIM-3917)Copy TrackRecordCollection and CaloCalibrationHitContainer from one StoreGate to another. Uses file peeking to determine which containers need to be copied over.
Also data overlay now uses common metadata code.
Note: I use non-stan...Copy TrackRecordCollection and CaloCalibrationHitContainer from one StoreGate to another. Uses file peeking to determine which containers need to be copied over.
Also data overlay now uses common metadata code.
Note: I use non-standard CfgGetter syntax but we will migrate to the new configuration at some point anyway.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20322Fixing reco problem due to missing fields in the xAOD::TrackSummary2019-01-12T22:26:12+01:00Noemi CalaceFixing reco problem due to missing fields in the xAOD::TrackSummaryAfter the https://gitlab.cern.ch/atlas/athena/merge_requests/20258 got in, we managed to reproduce the crash at the reco level shown by the CI. Reproducing it allowed to understand it, and this MR fixes it.
In case we run the ITk reco...After the https://gitlab.cern.ch/atlas/athena/merge_requests/20258 got in, we managed to reproduce the crash at the reco level shown by the CI. Reproducing it allowed to understand it, and this MR fixes it.
In case we run the ITk reconstruction, the additional fields in the summery are used to decorate the track particle, otherwise they are skipped.
I have the tested both the ITk reconstruction and the Tier0 tests and everything is ok. I would expect the CI result to end successfully this time. If so, the MR can be merged in directly.
@nstyles, @asalzbur, @xai, @npetters, @lmijovic, @goblirsc, @swabanNoemi CalaceNoemi Calacehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20327EventInfo: More adjustment of dictionary generation for pair classes.2019-01-16T03:02:43+01:00Scott SnyderEventInfo: More adjustment of dictionary generation for pair classes.Needed for current gcc9.Needed for current gcc9.https://gitlab.cern.ch/atlas/athena/-/merge_requests/2034721.6 jetrec2019-01-14T16:56:29+01:00Ewelina Maria Lobodzinska21.6 jetrecAdd some changes introduced in order to prepare for JetRec running on truth levelAdd some changes introduced in order to prepare for JetRec running on truth levelhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20352xAODCutFlow: Fix gcc9 warnings.2019-01-16T03:03:08+01:00Scott SnyderxAODCutFlow: 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/20368DAOD_NANO prototype using CP algorithms2019-01-24T03:03:14+01:00Kerim SurulizDAOD_NANO prototype using CP algorithmsA first version of a small derivation format containing calibrated objects.
Tagging @elmsheus @jcatmore @akraszna @krumnack @egramsta . A few notes:
- I needed to include the CP algorithms in AthDerivation; previously they were only in...A first version of a small derivation format containing calibrated objects.
Tagging @elmsheus @jcatmore @akraszna @krumnack @egramsta . A few notes:
- I needed to include the CP algorithms in AthDerivation; previously they were only in the analysis releases.
- I also needed to (trivally) modify a couple of thinning tools to make sure they actually do the thinning even if the object container supplied was empty. ****Derivation experts, please look at this carefully**** to make sure it doesn't break anything (my tests seemed to be OK, but...).
- I added a `deepCopyOutput` option to the various algorithm sequences - this is needed to dump the calibrated object containers out to the DAOD.
- The change in `Event/EventBookkeeperTools/src/EventCounterAlg.cxx` is required by the fact that the CP algorithms require the `PileupAnalysisSequence` to be run to work. This in turns creates a new `EventInfo` object, so a simple `evtStore()->retrieve(evtInfo);` no longer works without spelling out the name of the container.
- I copied the config files used by the `TauAnalysisSequence` from `SUSYTools` to the `TauAnalysisAlgorithms` package itself. Something like this will eventually need to be done anyway, and it seems a better solution than including `SUSYTools` in `AthDerivation` for this purpose only.
- One shouldn't pay too much attention to the physics content of the format at this stage. The idea was to get something that runs and can be built on.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20388Merge tag 21.0.91-21.0.92 into 21.92021-03-12T17:23:50+01:00John Derek ChapmanMerge tag 21.0.91-21.0.92 into 21.9This merge request merges the changes from the ~"21.0" branch between [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.92) into the ~"...This merge request merges the changes from the ~"21.0" branch between [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.92) into the ~"21.9" branch. This is done via a merge of
[release/21.3.9](https://gitlab.cern.ch/atlas/athena/tags/release/21.3.9).
[release/21.0.91](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.91) is a Tier0 release. It's FT0-violating. It includes the FT0V MRs:
athenaprivate1!16171, athenaprivate1!15893, athenaprivate1!15117, athenaprivate1!16009, athenaprivate1!16049
[release/21.0.92](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.92) is a Tier0 release. It's FT0-violating. It includes the FT0V MRs:
athenaprivate1!15481, athenaprivate1!16537 The latter of which is the merge of ~"21.1" into ~"21.0"https://gitlab.cern.ch/atlas/athena/-/merge_requests/20392Mhodgkin update cal hits dec182019-01-19T03:02:10+01:00Mark HodgkinsonMhodgkin update cal hits dec18Update to calibration hit code, such that the calibration hit moment maker uses xAOD TruthParticles (via ReadHandles) and calculates values of the calibration hit fraction moments.
The PFlow code is updated with a new python flag to make...Update to calibration hit code, such that the calibration hit moment maker uses xAOD TruthParticles (via ReadHandles) and calculates values of the calibration hit fraction moments.
The PFlow code is updated with a new python flag to make use of the calibration hit moment maker in special processings.
It also fixes a bug in the PFlow EDM that was recently introduced, as well introducing a new physics validation module to look at the pflow calibration hit moments.
One additional change to the cluster moment retrieval code is added in the pflow EDM, to ensure we can always get their values back in all scenarios.
Bringing to the attention of @loch , @wlampl ,@menke ,@cyounghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20404AnalysisBase Revival, master branch (2019.01.17.)2019-02-01T12:33:47+01:00Attila KrasznahorkayAnalysisBase Revival, master branch (2019.01.17.)With this MR I would like to revive a dumbed down version of AnalysisBase in the master branch. The project only builds the xAOD EDM and the standalone I/O code built around it. Its purpose is mainly to allow further developments.
Quite...With this MR I would like to revive a dumbed down version of AnalysisBase in the master branch. The project only builds the xAOD EDM and the standalone I/O code built around it. Its purpose is mainly to allow further developments.
Quite a few files had to be touched, but after updating the files under `Project/AnalysisBase` the other updates were all just to make it possible to build all core packages needed by AnalysisBase in "standalone mode" once again. This did reveal a number of unfortunate updates in the xAOD packages, which I tried to fix here...
Cc-ing @ksuruliz and @krumnack, they'll probably want to know about this development. Nils, I started updating `ROOTCORE` definitions to `XAOD_STANDALONE` in the code, that should be continued later on. I just didn't want to bloat this MR any further with that...
For the shifters: In many files the update goes from `2017` to `2018`, because I actually made the commits for those updates still last year. :stuck\_out\_tongue:https://gitlab.cern.ch/atlas/athena/-/merge_requests/20407Create new unified Overlay transform2019-01-22T03:02:19+01:00Tadej Novaktadej.novak@cern.chCreate new unified Overlay transformThis MR creates a new unified Overlay transform targeting to merge MC and data overlay and be MT friendly. It is still in very early stages but SCT and truth overlays can be run with threads > 1. Please ignore commented-out code for now ...This MR creates a new unified Overlay transform targeting to merge MC and data overlay and be MT friendly. It is still in very early stages but SCT and truth overlays can be run with threads > 1. Please ignore commented-out code for now as things will probably still change a lot.
Current transforms should still work and the output should not change.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20426xAODCore: Thread safety fixes.2019-01-19T03:02:30+01:00Scott SnyderxAODCore: Thread safety fixes.Enable thread-safety checker for this package; fix problems that
it identified.Enable thread-safety checker for this package; fix problems that
it identified.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20442Merge tag 21.0.91-21.0.92 into 21.92019-04-25T13:20:17+02:00John Derek ChapmanMerge tag 21.0.91-21.0.92 into 21.9This merge request merges the changes from the ~"21.0" branch between [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.92) into the ~"...This merge request merges the changes from the ~"21.0" branch between [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.92) into the ~"21.9" branch. This is done via a merge of
[release/21.3.9](https://gitlab.cern.ch/atlas/athena/tags/release/21.3.9).
[release/21.0.91](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.91) is a Tier0 release. It's FT0-violating. It includes the FT0V MRs:
athenaprivate1!16171, athenaprivate1!15893, athenaprivate1!15117, athenaprivate1!16009, athenaprivate1!16049
[release/21.0.92](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.92) is a Tier0 release. It's FT0-violating. It includes the FT0V MRs:
athenaprivate1!15481, athenaprivate1!16537 The latter of which is the merge of ~"21.1" into ~"21.0"https://gitlab.cern.ch/atlas/athena/-/merge_requests/20451Remove more references to TileBeamInfoProvider2019-01-21T03:02:08+01:00Scott SnyderRemove more references to TileBeamInfoProviderRemove more references to TileBeamInfoProvider from job options.
Fix a few related job configuration issues.Remove more references to TileBeamInfoProvider from job options.
Fix a few related job configuration issues.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20486Update all clients to work with the new transient version of the HepMcParticl...2019-03-18T18:03:46+01:00John Derek ChapmanUpdate all clients to work with the new transient version of the HepMcParticleLink classThe changes in this merge request migrate Athena to use the new transient HepMcParticleLink version and write out the HepMcParticleLink_p2 version by default.
(This merge request follows on from !20197. These changes are based on athena...The changes in this merge request migrate Athena to use the new transient HepMcParticleLink version and write out the HepMcParticleLink_p2 version by default.
(This merge request follows on from !20197. These changes are based on athenaprivate1!16561.)
There was a weakness in old `HepMcParticleLink` that it could only point to one `McEventCollection`. Hard-scatter and pile-up `HepMC::GenEvent` objects were all stored in the same `McEventCollection`. The `HepMcParticleLink` attempted to identify a specfic `HepMC::GenParticle` using the barcode and event number. Due to the fact that the hard-scatter and pile-up events are from different samples it was perfectly possible for a pile-up `HepMC::GenEvent` to have the same event number as the hard-scatter `HepMC::GenEvent`. In such cases `HepMcParticleLink` would loop through the `HepMC::GenEvent` objects in the `McEventCollection` and link to first the `HepMC::GenParticle` with the matching barcode that it found, leading to incorrect links. Not much of an issue for standard production without pile-up truth, but crippling if pile-up truth was being used as the input for Truth-seeded tracking... The solution is to have one `McEventCollection` per input dataset (i.e. one for each of the hard-scatter, low pT minbias, high pT minbias etc.). In standard production everything looks the same, but when pile-up truth is being saved then we would have three `McEventCollections` typically. The new `HepMcParticleLink` constructor now takes an optional argument to point it to the correct `McEventCollection`.
This merge request updates the transient `HepMcParticleLink` code to enable it to point at multiple `McEventCollections`.
This merge request also tweaks the `HepMcParticleLink::eventIndex()` method such that it now returns the event number of the linked `HepMC::GenEvent`. The old behaviour was that it would return the position of the linked `HepMC::GenEvent` in the vector of `HepMC::GenEvent` objects owned by the linked `McEventCollection`. The there is an optional argument of the constructor where it can be specified whether the event number or the position in the `McEventCollection` is being supplied.
The output root files should be directly comparable due as the persistent versions should be the same. The only change in sim/digi/reco output that is expected is in leaves holding `m_partLink.m_mcEvtIndex`. As the `m_mcEvtIndex` variable changes from representing the position of the linked `HepMC::GenEvent` in the vector of `HepMC::GenEvent` objects owned by the linked `McEventCollection` to being the event number of the linked `HepMC::GenEvent`.
Summary talk from SPOT#8 here: https://indico.cern.ch/event/721374/contributions/2965501/attachments/1631503/2601151/SPOT.pdfhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20530xAODCore: Fix thread-safety issues.2019-01-23T03:02:35+01:00Scott SnyderxAODCore: Fix thread-safety issues.The static accessor objects declared in the xAODCore macros
should be const. Avoids warnings from the thread-safety checker.The static accessor objects declared in the xAODCore macros
should be const. Avoids warnings from the thread-safety checker.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20600ATR-19379 Adding V2 of TrigComposite EDM, changes Aux store's base class2019-02-26T14:19:12+01:00Tim MartinATR-19379 Adding V2 of TrigComposite EDM, changes Aux store's base classEDM migration of the TrigCompositeAuxContainer
* Add new TrigCompositeAuxContainer_v2 which derives from the standard AuxContainerBase
* Any (known) type may now be decorated onto the objects.
* Add a converter to copy data from ...EDM migration of the TrigCompositeAuxContainer
* Add new TrigCompositeAuxContainer_v2 which derives from the standard AuxContainerBase
* Any (known) type may now be decorated onto the objects.
* Add a converter to copy data from the old ByteStreamAuxContainer_v1 backed V1 aux store
* Due to what looks to result from a ROOT bug, the converter currently has to perform a const_cast (ROOT-9762)
as the persistent object never has reset() called on it.
* Update public interface to TrigComposite
* All fetch, get is now templated
* Wrappers are removed for uint32_t and vector<uint32_t>
These methods WERE available in Run-2, and were packing into signed types.
I have scanned the codebase and fortuitously everyone who used a TrigComposite stuck to
storing signed ints & vector<int>. Therefore we don't need any specialist code to intercept a
request to read an unsigned and perform the cast on the stored signed from Run-2 BS.
* Wrappers are removed for uint16_t, vector<uint16_t>, string, vector<string> types.
In V1 these were all packed into vector<int>.
This is safe because these were only recently added in master to work around the V1 limitations. As we have
no BS/RDO written with these methods, we don't need to provide conversion functionality.
Still outstanding: bs-streamer
https://gitlab.cern.ch/atlas/athena/-/merge_requests/20619xAODEventInfo: Thread-safety fixes.2019-01-26T03:02:39+01:00Scott SnyderxAODEventInfo: Thread-safety fixes.Fix issues found by the thread-safety static checker.Fix issues found by the thread-safety static checker.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20646Fix incompatibility of rel 22 metadata with athenaMP2019-02-02T03:02:01+01:00Jack CranshawFix incompatibility of rel 22 metadata with athenaMPChange AthenaOutputStream metadata handling back to using the MetaDataStop incident rather than the stop method as this was not compatible with AthenaMP.
https://its.cern.ch/jira/browse/ATEAM-502Change AthenaOutputStream metadata handling back to using the MetaDataStop incident rather than the stop method as this was not compatible with AthenaMP.
https://its.cern.ch/jira/browse/ATEAM-502https://gitlab.cern.ch/atlas/athena/-/merge_requests/20648Refactor Tile bytestream converters for TMDB2019-01-30T03:01:54+01:00Siarhei HarkushaRefactor Tile bytestream converters for TMDBDigits for TMDB from bytestream are unpacked in the same time
when Tile digits are requested and upacked and put directly
into StoreGate ignoring standard conversion mechanism.
The same is done in the case of unpacking raw channels for T...Digits for TMDB from bytestream are unpacked in the same time
when Tile digits are requested and upacked and put directly
into StoreGate ignoring standard conversion mechanism.
The same is done in the case of unpacking raw channels for TMDB.
This is not very good for AthenaMT (especially for scheduler).
Tile bytestream converters have been refactored
to unpack digits and raw channels for TMDB
only if they are requested (needed)
using standard conversion mechanism.
Unit tests for reading Tile digits and raw channels from bytestream
and the corresponding reference files have been updated accordingly.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20655The Dict.so does not need to be linked with the library,just some standalone ...2019-01-29T03:02:09+01:00Christos Anastopouloschristos.anastopoulos@cern.chThe Dict.so does not need to be linked with the library,just some standalone enumsIt can perhaps help with some of the things discussed in
ATLJETMET-1078,
ATLASRECTS-4827
Mentioning @ssnyder and @akraszna It can perhaps help with some of the things discussed in
ATLJETMET-1078,
ATLASRECTS-4827
Mentioning @ssnyder and @akraszna