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/20026removing problematic collection from ESD in egammaRun trigger test2018-12-20T03:03:00+01:00Tomasz Boldremoving problematic collection from ESD in egammaRun trigger testThis is a quick fix for the CI egammaRun test. One collection seems to be incorrectly stored.
The cause will be investigated. The fix here is about getting CI back in shape.
Tagging @tamartinThis is a quick fix for the CI egammaRun test. One collection seems to be incorrectly stored.
The cause will be investigated. The fix here is about getting CI back in shape.
Tagging @tamartinhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20025add dynamic variables for monitoring L2StandAloneMuon2018-12-20T03:02:50+01:00Yohei Yamaguchiadd dynamic variables for monitoring L2StandAloneMuonAdding variables in TrigL2MuonSA for monitoring L2StandAloneMuon as dynamic variables.
Also modifying TriggerEDM config to store them into AODSLIM.Adding variables in TrigL2MuonSA for monitoring L2StandAloneMuon as dynamic variables.
Also modifying TriggerEDM config to store them into AODSLIM.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20037More ID trigger configuration2018-12-21T03:02:30+01:00Stewart Martin-HaughMore ID trigger configurationRefactor ID configuration into GeoModel, conditions and algorithms. Add GeoModel and conditions to newJOtestRefactor ID configuration into GeoModel, conditions and algorithms. Add GeoModel and conditions to newJOtesthttps://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/20040Configuration cleanup for athenaHLT2018-12-21T03:02:51+01:00Frank WinklmeierConfiguration cleanup for athenaHLT- Move all configuration of athenaHLT services to `TriggerUnixStandardSetup.py`. Remove the use of includes as much as possible (apart from user job options).
- Replace the `OfflineTHistSvc.py` include with a simple flag
- Add an error...- Move all configuration of athenaHLT services to `TriggerUnixStandardSetup.py`. Remove the use of includes as much as possible (apart from user job options).
- Replace the `OfflineTHistSvc.py` include with a simple flag
- Add an error in case the offline THistSvc is used with more than one child process
- Move the configuration of `HLTResultMTMaker` to its own module
- Remove the copy of `hadd` in TrigServices
https://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/20061TrigJetMonitoring: Fix compilation warning.2018-12-21T03:02:49+01:00Scott SnyderTrigJetMonitoring: Fix compilation warning.Compilation warning: Unused function argument.Compilation warning: Unused function argument.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20068TrigTauHypo: cmake fix2018-12-21T03:02:11+01:00Scott SnyderTrigTauHypo: cmake fixAdd missing link dependency on AthViews.
Fixes build failure in master in dbg build.Add missing link dependency on AthViews.
Fixes build failure in master in dbg build.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/20070InDetTrigRecExample: Protect against duplicating PixelConfigCondAlg.2018-12-21T03:03:05+01:00Scott SnyderInDetTrigRecExample: Protect against duplicating PixelConfigCondAlg.Fixes failure in TriggerMenu test.Fixes failure in TriggerMenu test.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20023New map in ElectronEfficiencyCorrection and example for 2e17 in TrigGlobalEff...2019-01-03T11:24:25+01:00Philip SommerNew map in ElectronEfficiencyCorrection and example for 2e17 in TrigGlobalEfficiencyCorrectionChanges related to an update in the trigger scale factors:
- new map file in ElectronEfficiencyCorrection which includes the full set of supported electron triggers, see ATR-18843, ATR-18903
- amongst others, this includes the 2e17 diel...Changes related to an update in the trigger scale factors:
- new map file in ElectronEfficiencyCorrection which includes the full set of supported electron triggers, see ATR-18843, ATR-18903
- amongst others, this includes the 2e17 dielectron trigger which was accidentally prescaled for a short period in 2017, see discussion in ATR-17746
- a small example how the scale factors for 2e17 can be used in TrigGlobalEfficiencyCorrection
Cheers,
Philip and @jmaurer, @thrynova, @fernandohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20035Move trig-art-result-parser.sh to TrigValTools/bin2018-12-27T18:13:16+01:00Rafal Bielskirafal.bielski@cern.chMove trig-art-result-parser.sh to TrigValTools/binMove the script to where all other scripts are, which also makes it installed in the release.Move the script to where all other scripts are, which also makes it installed in the release.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20032Fix issues in TrigP1Test/Testing/TrigP1Test_ART.conf2019-04-25T13:20:47+02:00Rafal Bielskirafal.bielski@cern.chFix issues in TrigP1Test/Testing/TrigP1Test_ART.confTests 109 and 110 were duplicated because of incorrect merges between branches. Also changed the job property name `GeometryFlags` (as it was in 21.1) to `InDetGeometryFlags` (as it is in 21.3).
Reported in ATR-19204Tests 109 and 110 were duplicated because of incorrect merges between branches. Also changed the job property name `GeometryFlags` (as it was in 21.1) to `InDetGeometryFlags` (as it is in 21.3).
Reported in ATR-19204https://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/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/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/20031Imorove collection of hypo algorithms2019-01-15T20:36:17+01:00Tomasz BoldImorove collection of hypo algorithmsThis small change is about how we recognise the HypoAlgs. New approach is more robust.
The problem was found in MET trigger integration by @ggallardThis small change is about how we recognise the HypoAlgs. New approach is more robust.
The problem was found in MET trigger integration by @ggallardhttps://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/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.