4848
4949The response matrix may be built by three methods:
5050
51- 1. :py:meth:`~ResponseMatrix.build ` computes the matrix using tracking
51+ 1. :py:meth:`~ResponseMatrix.build_tracking ` computes the matrix using tracking
5252 (any :py:class:`ResponseMatrix`)
53532. :py:meth:`~OrbitResponseMatrix.build_analytical` analytically computes the matrix
5454 using formulas from [1]_ (:py:class:`OrbitResponseMatrix` only)
@@ -210,12 +210,16 @@ def __init__(self):
210210 self ._varmask = None
211211
212212 @abc .abstractmethod
213- def build (self ) -> None :
213+ def build_tracking (self ) -> None :
214214 """Build the response matrix."""
215215 nobs , nvar = self ._response .shape
216216 self ._obsmask = np .ones (nobs , dtype = bool )
217217 self ._varmask = np .ones (nvar , dtype = bool )
218218
219+ def build_analytical (self ) -> None :
220+ """Build the response matrix."""
221+ raise NotImplementedError ("build_analytical not implemented for self.__class__.__name__" )
222+
219223 @property
220224 @abc .abstractmethod
221225 def varweights (self ): ...
@@ -255,7 +259,9 @@ def response(self):
255259 """Response matrix."""
256260 resp = self ._response
257261 if resp is None :
258- raise AtError ("No response matrix yet: run build() or load() first" )
262+ raise AtError (
263+ "No response matrix yet: run build_tracking() or load() first"
264+ )
259265 return resp
260266
261267 @property
@@ -302,7 +308,7 @@ def save(self, file) -> None:
302308 be appended to the filename if it does not already have one.
303309 """
304310 if self ._response is None :
305- raise AtError ("No response matrix: run build () first" )
311+ raise AtError ("No response matrix: run build_tracking() or load () first" )
306312 np .save (file , self ._response )
307313
308314 def load (self , file ) -> None :
@@ -417,7 +423,7 @@ def correct(
417423 self .variables .increment (corr , ring = ring )
418424 return sumcorr
419425
420- def build (
426+ def build_tracking (
421427 self ,
422428 use_mp : bool = False ,
423429 pool_size : int | None = None ,
@@ -481,14 +487,14 @@ def build(
481487 results = _resp (ring .deepcopy (), self .observables , self .variables , ** kwargs )
482488
483489 self ._response = np .stack (results , axis = - 1 )
484- super ().build ()
490+ super ().build_tracking ()
485491
486492 def exclude_obs (self , obsname : str , excluded : Refpts ) -> None :
487493 # noinspection PyUnresolvedReferences
488494 r"""Exclude items from :py:class:`.Observable`\ s.
489495
490496 After excluding observation points, the matrix must be rebuilt with
491- :py:meth:`build `.
497+ :py:meth:`build_tracking `.
492498
493499 Args:
494500 obsname: :py:class:`.Observable` name.
@@ -583,7 +589,7 @@ def steerer(ik, delta):
583589
584590 def set_norm ():
585591 bpm = LocalOpticsObservable (bpmrefs , "beta" , plane = pl )
586- sts = LocalOpticsObservable (ids , "beta" , plane = pl )
592+ sts = LocalOpticsObservable (steerrefs , "beta" , plane = pl )
587593 dsp = LocalOpticsObservable (bpmrefs , "dispersion" , plane = 2 * pl )
588594 tun = GlobalOpticsObservable ("tune" , plane = pl )
589595 obs = ObservableList ([bpm , sts , dsp , tun ])
@@ -602,6 +608,9 @@ def set_norm():
602608
603609 pl = plane_ (plane , "index" )
604610 plcode = plane_ (plane , "code" )
611+ ids = ring .get_uint32_index (steerrefs )
612+ nbsteers = len (ids )
613+ deltas = np .broadcast_to (steerdelta , nbsteers )
605614 if steersum and stsumweight is None or cavrefs and cavdelta is None :
606615 cavd , stsw = set_norm ()
607616
@@ -625,9 +634,6 @@ def set_norm():
625634 observables .append (sumobs )
626635
627636 # Variables
628- ids = ring .get_uint32_index (steerrefs )
629- nbsteers = len (ids )
630- deltas = np .broadcast_to (steerdelta , nbsteers )
631637 variables = VariableList (steerer (ik , delta ) for ik , delta in zip (ids , deltas ))
632638 if cavrefs is not None :
633639 active = (el .longt_motion for el in ring .select (cavrefs ))
0 commit comments