Merge branch 'erodrigu-fixes-NewLoKiContext-15102018' into 'master'

Fixes for new LoKi functors context

See merge request !262

DaVinciTests/tests/options/Do09selBu2LLK.py

@@ -13,9 +13,9 @@ from Gaudi.Configuration import *
 #
 leptoncut = "(PT>800*MeV)" 
 kaoncut   = "(PT>1400*MeV) & (MIPCHI2DV(PRIMARY)>4)"
-llcut     = "(VFASPF(VCHI2/VDOF)<9) & (MINTREE((ABSID<20),PT)>1*GeV)"
+llcut     = "(CHI2VXNDF<9) & (MINTREE((ABSID<20),PT)>1*GeV)"
 combcut   = "(ADAMASS('B0')<600*MeV)"
-bcut      = "((VFASPF(VCHI2/VDOF)<10) & (BPVIPCHI2()<25) & (BPVDIRA>0.999) & (BPVVDCHI2>25))"
+bcut      = "((CHI2VXNDF<10) & (BPVIPCHI2()<25) & (BPVDIRA()>0.999) & (BPVVDCHI2>25))"
 ##########################################################################
 #
 # hard cuts
@@ -23,8 +23,8 @@ bcut      = "((VFASPF(VCHI2/VDOF)<10) & (BPVIPCHI2()<25) & (BPVDIRA>0.999) & (BP
 hardkaon     = " (MINTREE(ABSID=='K+',PT)>1400) "
 hardelectron = " ( 2 == NINTREE( (ABSID=='e-') & (PT>1000) & (PIDe>6) & (MIPCHI2DV(PRIMARY)>4) )) "
 hardmuon     = " ( 2 == NINTREE( (ABSID=='mu-') & (PT>1000) & (MIPCHI2DV(PRIMARY)>4) )) "
-harddilepton = " (INTREE( (ID=='J/psi(1S)') & (MM<2449) & (BPVVDCHI2>25) )) "
-hardB        = " (VFASPF(VCHI2/VDOF)<6.67) & (BPVVDCHI2>100) & (BPVIPCHI2()<25)  & (BPVDIRA>0.9999) " 
+harddilepton = " (INTREE( (ID=='J/psi(1S)') & (MM<2449) & (BPVVDCHI2()>25) )) "
+hardB        = " (CHI2VXNDF<6.67) & (BPVVDCHI2()>100) & (BPVIPCHI2()<25)  & (BPVDIRA()>0.9999) " 
 ###########################################################################
 #
 # Config
@@ -41,7 +41,7 @@ Bu2LLK09_DiLepton.DecayDescriptors = [ "J/psi(1S) -> e+ e-", "J/psi(1S) -> mu+ m
 
 Bu2LLK09_DiLepton.DaughtersCuts = {"e+" : leptoncut, "mu+" : leptoncut }
 Bu2LLK09_DiLepton.CombinationCut = "(AM<6*GeV)"
-Bu2LLK09_DiLepton.MotherCut = "(VFASPF(VCHI2/VDOF)<25)"
+Bu2LLK09_DiLepton.MotherCut = "(CHI2VXNDF<25)"
 ###########################################################################
 # Preselection
 #