Adapt to new templated LHCb traj for TVF

related to LHCb!1089 (merged) and Lbcom!209 (merged)

it's a ready to merge split of the WIP !869 (merged) to be able to merge related LHCb and Lbcom MRs

marked as a Work In Progress

changed the description

mentioned in merge request LHCb!1089 (merged)

Unfortunately this has a merge conflict with a recent merge in master, so I cannot test it. @mhadji can you please resolve the conflict?

added 45 commits

• 1b1d832d...d876eb63 - 38 commits from branch master
• fcc50a06 - projectReference changed to use the scheduler as input
• d6075a8b - All the lb::*Traj class hierarchy and their use adapted to their new templated version
• 1075e0a4 - StateZTraj templated and adapted for vectorization with vcl
• 6e130d5b - Add some boost unit test to test vectorized version of StateZTraj
• 81942792 - ZTrajectory templated and adapted for vectorization with vcl
• c20b2d09 - Adaptation of the scalar TrackProjector to previous traj class modifications
• 515d9884 - Use std::make_unique instead of explicit call to std::unique_ptr

Compare with previous version

yes, done

• [2018-02-13 00:16] Validation started with lhcb-gaudi-head#1766
• [2018-02-16 00:16] Validation started with lhcb-gaudi-head#1770
• [2018-02-17 00:12] Validation started with lhcb-clang-test#864
• [2018-02-17 00:12] Validation started with lhcb-gaudi-head-py3#67
• [2018-02-17 00:12] Validation started with lhcb-tdr-test#62
• [2018-02-17 00:19] Validation started with lhcb-head#1760
• [2018-02-17 00:21] Validation started with lhcb-gaudi-head#1771
• [2018-02-18 00:11] Validation started with lhcb-gaudi-head-py3#68
• [2018-02-18 00:13] Validation started with lhcb-clang-test#865
• [2018-02-18 00:14] Validation started with lhcb-tdr-test#63
• [2018-02-18 00:16] Validation started with lhcb-head#1761
• [2018-02-18 00:17] Validation started with lhcb-gaudi-head#1772
• [2018-02-18 00:53] Validation started with lhcb-tdr-test#63
• [2018-02-18 00:55] Validation started with lhcb-gaudi-head-py3#68
• [2018-02-18 01:02] Validation started with lhcb-clang-test#865
• [2018-02-18 01:03] Validation started with lhcb-head#1761
• [2018-02-18 01:09] Validation started with lhcb-gaudi-head#1772
• [2018-02-18 01:32] Validation started with lhcb-tdr-test#63
• [2018-02-18 01:39] Validation started with lhcb-clang-test#865
• [2018-02-18 01:44] Validation started with lhcb-head#1761
• [2018-02-18 01:53] Validation started with lhcb-gaudi-head-py3#68
• [2018-02-18 01:53] Validation started with lhcb-gaudi-head#1772

mentioned in merge request !905 (merged)

unmarked as a Work In Progress

There is a warning from the dictionary generation:

/cvmfs/lhcb.cern.ch/lib/lcg/releases/LCG_92/Python/2.7.13/x86_64-slc6-gcc62-opt/bin/python2.7 GAUDI/GAUDI_HEAD/cmake/xenv --xml build.x86_64-slc6-gcc62-opt/config/Rec-build.xenv /cvmfs/lhcb.cern.ch/lib/lcg/releases/LCG_92/ROOT/6.12.04/x86_64-slc6-gcc62-opt/bin/genreflex Tr/TrackKernel/src/TrackKernelDict.h -o TrackKernelDict.cpp --rootmap=TrackKernelDict.rootmap --rootmap-lib=libTrackKernelDict --select=Tr/TrackKernel/src/TrackKernelDict.xml -U__MINGW32__ -U_Instantiations -D_Instantiations=TrackKernel_Instantiations -ITr/TrackKernel -I/cvmfs/lhcb.cern.ch/lib/lcg/releases/LCG_92/cppgsl/b07383ea/x86_64-slc6-gcc62-opt -I/cvmfs/lhcb.cern.ch/lib/lcg/releases/LCG_92/vdt/0.3.9/x86_64-slc6-gcc62-opt/include -I/cvmfs/lhcb.cern.ch/lib/lcg/releases/LCG_92/clhep/2.3.4.4/x86_64-slc6-gcc62-opt/include -I/cvmfs/lhcb.cern.ch/lib/lcg/releases/LCG_92/GSL/2.1/x86_64-slc6-gcc62-opt/include -I/cvmfs/lhcb.cern.ch/lib/lcg/releases/LCG_92/rangev3/7c2b10f0/x86_64-slc6-gcc62-opt/include -I/cvmfs/lhcb.cern.ch/lib/lcg/releases/LCG_92/AIDA/3.2.1/x86_64-slc6-gcc62-opt/src/cpp -I/cvmfs/lhcb.cern.ch/lib/lcg/releases/LCG_92/tbb/2018_U1/x86_64-slc6-gcc62-opt/include -I/cvmfs/lhcb.cern.ch/lib/lcg/releases/LCG_92/ROOT/6.12.04/x86_64-slc6-gcc62-opt/include -I/cvmfs/lhcb.cern.ch/lib/lcg/releases/LCG_92/Boost/1.64.0/x86_64-slc6-gcc62-opt/include -Ibuild.x86_64-slc6-gcc62-opt/include -ISOAContainer/include -ILBCOM/LBCOM_HEAD/InstallArea/x86_64-slc6-gcc62-opt/include -ILHCB/LHCB_HEAD/InstallArea/x86_64-slc6-gcc62-opt/include -IGAUDI/GAUDI_HEAD/InstallArea/x86_64-slc6-gcc62-opt/include -D_GNU_SOURCE -Dunix -Df2cFortran -Dlinux -DGAUDI_V20_COMPAT -DBOOST_FILESYSTEM_VERSION=3 -DBOOST_SPIRIT_USE_PHOENIX_V3 -DPACKAGE_NAME="TrackKernel" -DPACKAGE_VERSION="v3r1" -DNDEBUG 	
Warning: Unused class rule: LHCb::ZTrajectory

I think to silence it's sufficient to remove the corresponding line from Tr/TrackKernel/src/TrackKernelDict.xml. But is it expected that this class no longer exists?

added 2 commits

• 7719c2e5 - Remove unused variable
• 171140b3 - Update the dictionnary TrackKernelDict.xml

Compare with previous version

ah sorry I have not noticed this one

it's because

<class name="LHCb::ZTrajectory"/>

seems to search a non-template class ZTrajectory but this one is now a templated class

I do not have anymore this warning with this change

<class pattern="LHCb::ZTrajectory<*>"/>

and I have the expected Selected class -> LHCb::ZTrajectory<double> for ROOT: LHCb::ZTrajectory<double>

however, I do not understand why I do not have a warning for <class name="StateZTraj"/> from the same dictionary since this one is also templated now and used

merged

mentioned in commit c7c5130c

mentioned in merge request Phys!376 (merged)

mentioned in commit 497873c8

mentioned in merge request !1152 (merged)

resolved all discussions

resolved all discussions