Merge branch 'rm-MCTrackInfo' into 'master'

Rename TT to UT in MCTrackInfo (follow LHCb!3767)

See merge request !920

Phys/DaVinciMCTools/python/DaVinciMCTools/MCReconstructible.py

@@ -82,12 +82,9 @@ class MCReconstructible:
         self.HasT1S = self.get_info(self._Flag.maskT1S)
         self.HasT2S = self.get_info(self._Flag.maskT2S)
         self.HasT3S = self.get_info(self._Flag.maskT3S)
-        self.HasTT = self.get_info(
-            self._Flag.maskHasTT)  #same as HasUT (see later)
-        self.HasTT1 = self.get_info(
-            self._Flag.maskTT1)  #same as HasUT1 (see later)
-        self.HasTT2 = self.get_info(
-            self._Flag.maskTT2)  #same as HasUT2 (see later)
+        self.HasUT = self.get_info(self._Flag.maskHasUT)
+        self.HasUT1 = self.get_info(self._Flag.maskUT1)
+        self.HasUT2 = self.get_info(self._Flag.maskUT2)
         #Within sub-detector acceptance
         # https://gitlab.cern.ch/lhcb/LHCb/-/blob/master/Event/MCEvent/include/Event/MCTrackInfo.h
         self.AccVelo = self.get_info(self._Flag.maskAccVelo)
@@ -102,27 +99,10 @@ class MCReconstructible:
         self.AccT1S = self.get_info(self._Flag.maskAccT1S)
         self.AccT2S = self.get_info(self._Flag.maskAccT2S)
         self.AccT3S = self.get_info(self._Flag.maskAccT3S)
-        self.AccTT = self.get_info(
-            self._Flag.maskAccTT)  #same as AccUT (see later)
-        self.AccTT1 = self.get_info(
-            self._Flag.maskAccTT1)  #same as AccUT1 (see later)
-        self.AccTT2 = self.get_info(
-            self._Flag.maskAccTT2)  #same as AccUT2 (see later)
-        self.multVeloR = self.get_info(self._Flag.maskMultVeloR)
-        self.multVeloPhi = self.get_info(self._Flag.maskMultVeloPhi)
-        ##These should be updated
-        #self.HasVeloR   = self.get_info(self._Flag.maskVeloR)
-        #self.HasVeloPhi = self.get_info(self._Flag.maskVeloPhi)
-        #self.AccVeloR   = self.get_info(self._Flag.maskAccVeloR)
-        #self.AccVeloPhi = self.get_info(self._Flag.maskAccVeloPhi)
-
-        # UT alias
-        self.HasUT1 = self.HasTT1
-        self.HasUT2 = self.HasTT2
-        self.HasUT = self.HasTT
-        self.AccUT1 = self.AccTT1
-        self.AccUT2 = self.AccTT2
-        self.AccUT = self.AccTT
+        self.AccUT = self.get_info(self._Flag.maskAccUT)
+        self.AccUT1 = self.get_info(self._Flag.maskAccUT1)
+        self.AccUT2 = self.get_info(self._Flag.maskAccUT2)
+        self.multVelo = self.get_info(self._Flag.maskMultVelo)
 
         # Reconstructible
         self.Reconstructible = F.VALUE_OR(