Follow naming changes in Rec!2652

V{X,Y,Z} -> END_V{X,Y,Z} and {X,Y,Z} -> REFERENCEPOINT_{X,Y,Z}

Goes with LHCb!3397 (merged), Rec!2652 (merged), Analysis!846 (merged) and DaVinci!646 (merged)

Hlt/Hlt1Conf/python/Hlt1Conf/lines/smog_lines.py

@@ -19,7 +19,7 @@ from ..algorithms import (Filter, CombineTracks)
 from Moore.config import HltLine
 
 from Functors import (CLOSESTTOBEAM, NHITS, P, PT, ISMUON, CHI2DOF, MAXDOCA,
-                      MASS, Z, CHARGE)
+                      MASS, REFERENCEPOINT_Z, CHARGE)
 from Functors.math import in_range
 
 
@@ -32,7 +32,7 @@ def smog_minimumbias_line(
         min_Smog_z=-550 * mm,
         min_nhits=17,
 ):
-    selection = in_range(min_Smog_z, CLOSESTTOBEAM(Z),
+    selection = in_range(min_Smog_z, CLOSESTTOBEAM(REFERENCEPOINT_Z),
                          max_Smog_z) & (NHITS > min_nhits)
     tracks = {'PrVeloTracks': make_input_tracks()['Pr']}
     track_filter = Filter(tracks, selection)['PrVeloTracks']
@@ -63,7 +63,7 @@ def smog_dimuon_line(
 
     comb_cut = (MAXDOCA < max_doca) & (CHARGE == comb_charge_sum)
     moth_cut = (CHI2DOF < max_vtx_chi2dof) & (MASS > min_inv_mass) & in_range(
-        min_Smog_z, Z, max_Smog_z)
+        min_Smog_z, REFERENCEPOINT_Z, max_Smog_z)
 
     combination_filter = CombineTracks(
         AssumedMass='mu+',