Move __lattice and __refpts of BPMScalarAggregator to public namespace

Author: kparasch

pyaml/lattice/abstract_impl.py

@@ -158,11 +158,11 @@ class BPMScalarAggregator(ScalarAggregator):
     """
 
     def __init__(self, ring:at.Lattice):
-        self.__lattice = ring
-        self.__refpts = []
+        self.lattice = ring
+        self.refpts = []
 
     def add_elem(self,elem:at.Element):
-        self.__refpts.append(self.__lattice.index(elem))
+        self.refpts.append(self.lattice.index(elem))
 
     def set(self, value: NDArray[np.float64]):
         pass
@@ -171,7 +171,7 @@ def set_and_wait(self, value: NDArray[np.float64]):
         pass
 
     def get(self) -> np.array:
-        _, orbit = at.find_orbit(self.__lattice, refpts=self.__refpts)
+        _, orbit = at.find_orbit(self.lattice, refpts=self.refpts)
         return orbit[:, [0, 2]].flatten()
 
     def readback(self) -> np.array:
@@ -188,7 +188,7 @@ class BPMHScalarAggregator(BPMScalarAggregator):
     """
 
     def get(self) -> np.array:
-        _, orbit = at.find_orbit(self._BPMScalarAggregator__lattice, refpts=self._BPMScalarAggregator__refpts)
+        _, orbit = at.find_orbit(self.lattice, refpts=self.refpts)
         return orbit[:, 0]
 
 #------------------------------------------------------------------------------
@@ -199,7 +199,7 @@ class BPMVScalarAggregator(BPMScalarAggregator):
     """
 
     def get(self) -> np.array:
-        _, orbit = at.find_orbit(self._BPMScalarAggregator__lattice, refpts=self._BPMScalarAggregator__refpts)
+        _, orbit = at.find_orbit(self.lattice, refpts=self.refpts)
         return orbit[:, 2]
 
 #------------------------------------------------------------------------------