Skip to content

pseudomerge of FTKSim packages from rel 21 to master

Update packages:FastTrackSimWrap TrigFTKBankGen TrigFTKPool TrigFTKSim TrigFTKToolInterfaces TrigFTKTrackConverter FTKStandaloneMonitoring from upstream/21.3 to upstream/master via pseudo-merge ATR-19006 Command used top create pseudomerge:

git-package-pseudomerge.py
--packages Trigger/TrigFTK/FastTrackSimWrap
Trigger/TrigFTK/TrigFTKBankGen
Trigger/TrigFTK/TrigFTKPool
Trigger/TrigFTK/TrigFTKSim
Trigger/TrigTools/TrigFTKToolInterfaces
Trigger/TrigTools/TrigFTKTrackConverter
Trigger/TrigFTK/FTKStandaloneMonitoring
--source upstream/21.3
--target upstream/master
--stage 1

Conflicts were resolved by taking the FTKSim code updates from 21.3 plus the changes from Scott and the changes for conditions from master

Edited by John Baines

Merge request reports

Loading