athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2018-12-23T03:02:21+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/20060AthenaPoolMultiTest: Update reference file.2018-12-23T03:02:21+01:00Scott SnyderAthenaPoolMultiTest: Update reference file.Fix test failure in master.Fix test failure in master.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20083CLIDSvc: Delete this obsolete package.2018-12-24T03:02:14+01:00Scott SnyderCLIDSvc: Delete this obsolete package.Should no longer be used from anywhere.Should no longer be used from anywhere.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20081Fix decision creating in MTCalibPebHypoAlg2018-12-26T03:02:13+01:00Rafal Bielskirafal.bielski@cern.chFix decision creating in MTCalibPebHypoAlgMTCalibPebHypoAlg was broken by recent updates in TrigCompositeUtils in [!13561](athenaprivate1!13561) - it was missed in updating the clients. This commit updates the alg to the new TrigCompositeUtils interface.MTCalibPebHypoAlg was broken by recent updates in TrigCompositeUtils in [!13561](athenaprivate1!13561) - it was missed in updating the clients. This commit updates the alg to the new TrigCompositeUtils interface.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20114TrigOutputHandling: cmake fix.2018-12-26T03:02:15+01:00Scott SnyderTrigOutputHandling: cmake fix.Missing dependency on Boost.Missing dependency on Boost.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20099RootUtils: Increase test timeout.2018-12-26T03:02:17+01:00Scott SnyderRootUtils: Increase test timeout.Test has been timing out frequently in recent nightlies.Test has been timing out frequently in recent nightlies.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20105TGCcabling: Comply with ATLAS naming conventions.2018-12-26T03:02:19+01:00Scott SnyderTGCcabling: Comply with ATLAS naming conventions.Private data members should start with m_.Private data members should start with m_.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20115TriggerMatchingTool: Fix clang warning.2018-12-26T03:02:21+01:00Scott SnyderTriggerMatchingTool: Fix clang warning.clang warning: Don't use std::move in a return statement.clang warning: Don't use std::move in a return statement.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20102LArGeoMiniFcal: cmake fix.2018-12-26T03:02:22+01:00Scott SnyderLArGeoMiniFcal: cmake fix.CLHEP_LIBRARIES macro was used without the corresponding find_package.
But we don't actually have a direct dependency on CLHEP now, so just remove
the reference.CLHEP_LIBRARIES macro was used without the corresponding find_package.
But we don't actually have a direct dependency on CLHEP now, so just remove
the reference.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20108TrigOutputHandling: cmake fix.2018-12-26T03:02:23+01:00Scott SnyderTrigOutputHandling: cmake fix.Missing dependency on Boost.Missing dependency on Boost.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20100LArGeoAlgsNV: Remove (again) use of non-bound DataHandle.2018-12-26T03:02:25+01:00Scott SnyderLArGeoAlgsNV: Remove (again) use of non-bound DataHandle.Trying to remove non-const DataHandle operations from StoreGate.Trying to remove non-const DataHandle operations from StoreGate.https://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/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/20039Pseudomerge of FTK athena/Trigger packages from release 21 to master (part 1)2018-12-26T03:03:02+01:00John BainesPseudomerge of FTK athena/Trigger packages from release 21 to master (part 1)Update FTK-HLT packages from upstream/21.0-TrigMC to upstream/master via pseudo-merge (ATR-19006 step 1)
Update packages:FTK_DataProviderInterfaces FTK_DataProviderSvc FTK_RecExample FTK_RecToolInterfaces FTK_RecTools TrigFTK_Monitoring ...Update FTK-HLT packages from upstream/21.0-TrigMC to upstream/master via pseudo-merge (ATR-19006 step 1)
Update packages:FTK_DataProviderInterfaces FTK_DataProviderSvc FTK_RecExample FTK_RecToolInterfaces FTK_RecTools TrigFTK_Monitoring TrigFTK_RawData TrigFTK_RawDataAlgs TrigFTK_RawDataTPCnv TrigFTK_RecAlgs TrigFTK_RecExample TrigFTKByteStream TrigFTKHypo TrigInDetConf from upstream/21.0-TrigMC to upstream/master via pseudo-merge
This a resuming MR https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/16467 in the new repository. Please note that the L1 and L2 reviews were completed in that MR. However when adding updates to 2 files to address L2 review requests, new conflicts arose and there was not time to complete the MR before the repository was cleaned.
This is step 1 of the two step merge described in ATR-19006
Command: git-package-pseudomerge.py
--packages
Trigger/TrigFTK/FTK_DataProviderInterfaces
Trigger/TrigFTK/FTK_DataProviderSvc
Trigger/TrigFTK/FTK_RecExample
Trigger/TrigFTK/FTK_RecToolInterfaces
Trigger/TrigFTK/FTK_RecTools
Trigger/TrigFTK/TrigFTK_Monitoring
Trigger/TrigFTK/TrigFTK_RawData
Trigger/TrigFTK/TrigFTK_RawDataAlgs
Trigger/TrigFTK/TrigFTK_RawDataTPCnv
Trigger/TrigFTK/TrigFTK_RecAlgs
Trigger/TrigFTK/TrigFTK_RecExample
Trigger/TrigFTK/TrigFTKByteStream
Trigger/TrigHypothesis/TrigFTKHypo
Trigger/TrigTools/TrigInDetConf
--source upstream/21.0-TrigMC
--target upstream/master
--stage 2
Conflicts resolved by editing the affected files. In general the FTK coding changes were taken from 21.0-TrigMC and the InDet tool changes and trivial naming convention changes were taking from master.
Note that for TrigIndetConf only the following FTK-specific files were updated: Trigger/TrigTools/TrigInDetConf/python/TrigInDetFTKSequence.py Trigger/TrigTools/TrigInDetConf/python/TrigInDetRecToolsFTK.py
This was tested with ctest -j8 --output-on-failure There was a failure in test 8 - TrigUpgradeTest_egammaRunData_ctest11, but this was the same for the bare nightly (2018-12-18T2257) without any changes.
Also successfully tested with test_physics_pp_v7_primaries_build.sh and test_mc_pp_v7_nops_aod_ftk_build.sh
Also tested running RDOtoESD.
This fixes the problem in ATR-19240https://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/20101LArGeoFcal: cmake fix2018-12-26T03:03:08+01:00Scott SnyderLArGeoFcal: cmake fixFix typo in cmake file.Fix typo in cmake file.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20107DecisionHandling: Fix placement of using directive.2018-12-26T03:03:10+01:00Scott SnyderDecisionHandling: Fix placement of using directive.Do not put using directives in the global namespace in headers.Do not put using directives in the global namespace in headers.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20117SiClusterOnTrackTool: cmake fix2018-12-26T03:03:12+01:00Scott SnyderSiClusterOnTrackTool: cmake fixAdd missing dependency on TrkNeuralNetworkUtils.Add missing dependency on TrkNeuralNetworkUtils.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20116SiClusterizationTool: cmake fix2018-12-26T03:03:19+01:00Scott SnyderSiClusterizationTool: cmake fixcmake fix: TrkNeuralNetworkUtils dependency should be public.cmake fix: TrkNeuralNetworkUtils dependency should be public.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20030new HLTCalo configuration2018-12-26T03:03:20+01:00Denis Oliveira Damazionew HLTCalo configurationJust to make an example running HLTCalo algorithms in parallel, running in views the L2Calo and topo Cluster as part of the main sequence.Just to make an example running HLTCalo algorithms in parallel, running in views the L2Calo and topo Cluster as part of the main sequence.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 MT