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/20050First implementation of GenericMetadataTool and GenericMetadataToolNoAux2018-12-20T15:56:59+01:00Jack CranshawFirst implementation of GenericMetadataTool and GenericMetadataToolNoAuxChanges for migration of athena metadata to MT
Interface change: Remove SourceID argument for IMetaDataTool::metaDataStop method
AthenaOutputStream: Remove listening to MetaDataStop incident
GenericMetadataTool: Implemented as base for B...Changes for migration of athena metadata to MT
Interface change: Remove SourceID argument for IMetaDataTool::metaDataStop method
AthenaOutputStream: Remove listening to MetaDataStop incident
GenericMetadataTool: Implemented as base for BookkeeperTool
GenericMetadataToolNoAux: Implemented as base for CopyEventStreamInfo and EventFormatMetaDataToolhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20045AthContainersInterfaces,etc: Change getSelectedAuxIDs to return by value.2018-12-21T03:02:17+01:00Scott SnyderAthContainersInterfaces,etc: Change getSelectedAuxIDs to return by value.getSelectedAuxIDs() was returning a value by const reference, which was
problematic for thread-safety, since that requires saving a copy of the
set in the AuxSelector object. Change to returning by value.
Now that auxid_set_t is represe...getSelectedAuxIDs() was returning a value by const reference, which was
problematic for thread-safety, since that requires saving a copy of the
set in the AuxSelector object. Change to returning by value.
Now that auxid_set_t is represented by a bitmap with a move operator,
that should not be very expensive.
Also change AuxDiscoverySvc::getauxIDs() to return by value.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20028Make InDetSDOOVerlay parallelisable (ATLASSIM-3817)2018-12-21T03:02:24+01:00Tadej Novaktadej.novak@cern.chMake InDetSDOOVerlay parallelisable (ATLASSIM-3817)Make `InDetSDOOVerlay` parallelisable and independent of specific inner detector component.Make `InDetSDOOVerlay` parallelisable and independent of specific inner detector component.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20043Uniqueness checking fixes for typeless TC adds2018-12-21T03:02:39+01:00Benjamin Michael WynneUniqueness checking fixes for typeless TC addsSpotted by @tamartin on old MR, but was pre-cleanup. Fixing now.
Added ctests for the typeless add method as well.Spotted by @tamartin on old MR, but was pre-cleanup. Fixing now.
Added ctests for the typeless add method as well.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20065xAODTriggerAthenaPool: Add proper pool coverters fro xAODTrigCompositeContainer.2018-12-21T03:02:41+01:00Scott SnyderxAODTriggerAthenaPool: Add proper pool coverters fro xAODTrigCompositeContainer.Needed to fix test failures in TrigUpgradeTest.Needed to fix test failures in TrigUpgradeTest.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20019Fix two problems with thread/slot safety in the CutFlowSvc2018-12-21T03:02:48+01:00Jack CranshawFix two problems with thread/slot safety in the CutFlowSvcFix two problems with thread/slot safety in the CutFlowSvc
- Move the reading of EventInfo weights from the service to the only client
AthFilterAlgorithm
- add a mutex to the addEvent method called by AthFilterAlgorithm
...Fix two problems with thread/slot safety in the CutFlowSvc
- Move the reading of EventInfo weights from the service to the only client
AthFilterAlgorithm
- add a mutex to the addEvent method called by AthFilterAlgorithm
https://its.cern.ch/jira/browse/ATLASRECTS-4693https://gitlab.cern.ch/atlas/athena/-/merge_requests/20041Cleanup EventOverlayJobTransforms (ATLASSIM-3599)2018-12-26T03:02:50+01:00Tadej Novaktadej.novak@cern.chCleanup EventOverlayJobTransforms (ATLASSIM-3599)Cleanup EventOverlayJobTransforms:
- remove obviously obsolete files
- `readBS` and `isRealData` are no longer needed
/cc @tkharlam for confirmationCleanup EventOverlayJobTransforms:
- remove obviously obsolete files
- `readBS` and `isRealData` are no longer needed
/cc @tkharlam for confirmationhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20103EventBookkeeperTools: cmake fix2018-12-26T03:03:06+01:00Scott SnyderEventBookkeeperTools: cmake fixRemove unneeded (and misspelled) dependence on AthContainersInterfaces.Remove unneeded (and misspelled) dependence on AthContainersInterfaces.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20047Initial signal-only overlay output for MT (ATLASSIM-3820)2018-12-26T03:03:22+01:00Tadej Novaktadej.novak@cern.chInitial signal-only overlay output for MT (ATLASSIM-3820)This is an initial step to still support signal-only overlay output (but only when running in MT):
- remove the support from current transforms
- add output file flag and modify the existing `doSignal`->`signalOnlyOutput` to make it cl...This is an initial step to still support signal-only overlay output (but only when running in MT):
- remove the support from current transforms
- add output file flag and modify the existing `doSignal`->`signalOnlyOutput` to make it clearer
- cleanup MuonOverlay code from obsolete flag related to this
- update job options to work only with MThttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20104AthContainers, etc: Add IConstAuxStore::isDecoration().2018-12-27T03:02:24+01:00Scott SnyderAthContainers, etc: Add IConstAuxStore::isDecoration().Add an interface to test if a variable is considered a decoration.
Needed to remove an ugly const_cast in ShallowAuxContainer.Add an interface to test if a variable is considered a decoration.
Needed to remove an ugly const_cast in ShallowAuxContainer.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20154PyDumper: Add --skip option to sg-dump.2019-01-04T03:02:24+01:00Scott SnyderPyDumper: Add --skip option to sg-dump.Add option to sg-dump to skip events before starting dumping.Add option to sg-dump to skip events before starting dumping.https://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/20177PyDumper: Add --exclude to sg-dumper.2019-01-08T03:02:20+01:00Scott SnyderPyDumper: Add --exclude to sg-dumper.Add option to selectively exclude items from the dump.Add option to selectively exclude items from the dump.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20178xAODPFlow: Fix gcc9 warnings.2019-01-08T03:02:21+01:00Scott SnyderxAODPFlow: 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/20010ATR-19246 TriggerMT Decision Encoding in ESD Update2019-01-09T17:56:59+01:00Tim MartinATR-19246 TriggerMT Decision Encoding in ESD UpdateThis persists in the trigger output a `HLTSummary`, and then in the ESD a `xAOD::TrigDecision` object the bit-set which corresponds to fired triggers in the new MT prototype. cc @tbold @bwynne
It hacks a short-term hard-coded fudge i...This persists in the trigger output a `HLTSummary`, and then in the ESD a `xAOD::TrigDecision` object the bit-set which corresponds to fired triggers in the new MT prototype. cc @tbold @bwynne
It hacks a short-term hard-coded fudge into the trigger configuration service in order to obtain `ChainCounters`. cc @mark @fwinkl @stelzer
* Remove my recently added extension to the TrigDecision EDM. Disk-space wise, this was not going to work, sadly.
* Update downstream clients of `DecisionSummaryMakerAlg` within the trigger (signatureMoni, streaming, bit-encoding in HLTResult)
* Update `TrigDecisionMakerMT` to read all HLT summaries from one collection, `DecisionSummaryMakerAlg`'s `HLTSummary`
* Update transient HLT seeding information written by `L1Decoder`, call this `L1DecoderSummary` everywhere.
* Copy TrigCost end-of-event trigger fire to `DecisionSummaryMakerAlg`
* Remove the output from the `TriggerSummaryAlg` - this now just prints to terminal
* Hack the TrigConfSvc to allow hard-coded chains to be injected in the short term, for testing.
(note known problem with egamma test, will try and fix that now too - but in its own MR)https://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/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/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/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.