Add Pynel vertical dispersion analysis

apsuite/__init__.py

@@ -1,7 +1,7 @@
 
 __all__ = (
     'commisslib', 'loco', 'optics_analysis', 'optimization',
-    'trackcpp_utils', 'orbcorr', 'dynap')
+    'trackcpp_utils')
 
 import os as _os
 

apsuite/optics_analysis/misalign_analysis/__init__.py

@@ -8,4 +8,15 @@
 
 del base, buttons
 
-__all__ = ["Base", "Button", "functions", "fitting", "si_data", "set_model"]
+__all__ = [
+    "Base",
+    "Button",
+    "functions",
+    "fitting",
+    "si_data",
+    "get_model",
+    "set_model",
+    "get_default_base",
+    "save_default_base",
+    "delete_default_base",
+]

apsuite/optics_analysis/misalign_analysis/base.py

@@ -1,6 +1,5 @@
 """Module 'base' for the class object 'Base': a collection of 'Buttons'."""
 
-import os as _os
 from copy import deepcopy as _dpcopy
 from itertools import product
 
@@ -13,9 +12,7 @@
 _STD_ELEMS = si_elems()
 _STD_TYPES = std_misaligment_types()
 _STD_SECTS = si_sectors()
-_D_BUTTONS_FILE = _os.path.join(
-    _os.path.dirname(__file__), "Default_Buttons.pickle"
-)
+_D_BUTTONS_FILE = "Default_Buttons.pickle"
 _DEFAULT_BUTTONS = []
 
 
@@ -175,8 +172,9 @@ def __search_button_in_default_base(self, button):
                 (button.dtype == b.dtype)
                 and (button.indices == b.indices)
                 and (button.fantasy_name == b.fantasy_name)
+                and (self._func == b.func)
             ):
-                return True, b
+                return True, _dpcopy(b.signature)
         return False, None
 
     def __generate_buttons(self):
@@ -188,15 +186,14 @@ def __generate_buttons(self):
                 "vertical_disp",
                 "twiss",
             ]:
-                update_default_base()
                 temp_button = buttons.Button(
                     elem=elem, dtype=dtype, sect=sect, func="testfunc"
                 ).flatten()
                 for tb in temp_button:
-                    flag, b = self.__search_button_in_default_base(tb)
+                    flag, sig = self.__search_button_in_default_base(tb)
                     if flag:
-                        sig = b.signature
-                        tb._signature = _dpcopy(sig)
+                        tb._func = self._func
+                        tb._signature = sig
                         all_buttons += [tb]
                     else:
                         tb_new = buttons.Button(
@@ -210,7 +207,6 @@ def __generate_buttons(self):
                     elem=elem, dtype=dtype, sect=sect, func=self._func
                 ).flatten()
                 all_buttons += temp_button
-
         return all_buttons
 
     def __handle_buttons(self, buttons):

apsuite/optics_analysis/misalign_analysis/buttons.py

@@ -413,7 +413,7 @@ def _handle_fantasy_name(self, elem, sect, indices, split_flag):
         elif _sects_dict[elem].count(sect) > 1:
             c = 0
             for ind, sec in zip(_fam[elem]["index"], _fam[elem]["subsection"]):
-                print("ind:", ind, "\nsec:", sec, "\nindices:", indices)
+                # print("ind:", ind, "\nsec:", sec, "\nindices:", indices)
                 if int(sec[:2]) == sect:
                     c += 1
                     if ind == indices: