Pseudomerge 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 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-19240

added 14 commits

• 6e84908b...0af798b7 - 13 commits from branch atlas:master
• 8c163ef8 - fix conflict due to addition of Atlas copyright

Compare with previous version

This merge request affects 17 packages:

• Trigger/TrigAlgorithms/TrigFastTrackFinder
• Trigger/TrigFTK/FTKStandaloneMonitoring
• Trigger/TrigFTK/FTK_DataProviderInterfaces
• Trigger/TrigFTK/FTK_DataProviderSvc
• Trigger/TrigFTK/FTK_RecExample
• Trigger/TrigFTK/FTK_RecToolInterfaces
• Trigger/TrigFTK/FTK_RecTools
• Trigger/TrigFTK/TrigFTKByteStream
• Trigger/TrigFTK/TrigFTKPool
• 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/TrigHypothesis/TrigFTKHypo
• Trigger/TrigTools/TrigInDetConf

Adding @jahreda ,@benhoob ,@mswiatlo ,@karolos as watchers

added Trigger master review-pending-level-1 labels

CI Result SUCCESS

	Athena	AthSimulation
externals
cmake
make
required tests
optional tests

Full details available at NICOS MR-20039-2018-12-19-23-42
Athena: number of compilation errors 0, warnings 3
AthSimulation: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST 31739] (for remote access see the FAQ for MR reviewers)

Giving that original MR was discussed already, and changes afterwards are pure technical, approving.

Pavol [as L2 MR shifter]

added review-approved label and removed review-pending-level-1 label

merged

mentioned in commit c17f8506

added sweep:ignore label