Update MAD binaries to version 1.1.6 and adjust tests to use py_name parameter in MAD context manager

Author: jgray-19

.github/workflows/python-publish.yml

@@ -36,9 +36,9 @@ jobs:
         pip install build
     - name: Get MAD Binaries
       run: |
-        mkdir src/pymadng/bin 
-        curl https://madx.web.cern.ch/releases/madng/1.1/mad-linux-1.1.3 -o src/pymadng/bin/mad_Linux
-        curl https://madx.web.cern.ch/releases/madng/1.1/mad-macos-1.1.3 -o src/pymadng/bin/mad_Darwin
+        mkdir src/pymadng/bin
+        curl https://madx.web.cern.ch/releases/madng/1.1/mad-linux-1.1.6 -o src/pymadng/bin/mad_Linux
+        curl https://madx.web.cern.ch/releases/madng/1.1/mad-macos-1.1.6 -o src/pymadng/bin/mad_Darwin
         chmod +x src/pymadng/bin/mad_Linux src/pymadng/bin/mad_Darwin
     - name: Build package
       run: python -m build

.github/workflows/test-pymadng.yml

@@ -3,7 +3,7 @@
 
 name: Test pymadng
 
-on: 
+on:
   push:
     branches:
       - main
@@ -32,9 +32,9 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Get MAD Binaries
       run: |
-        mkdir ./src/pymadng/bin 
-        curl https://madx.web.cern.ch/releases/madng/1.1/mad-linux-1.1.3 -o ./src/pymadng/bin/mad_Linux
-        curl https://madx.web.cern.ch/releases/madng/1.1/mad-macos-1.1.3 -o ./src/pymadng/bin/mad_Darwin
+        mkdir ./src/pymadng/bin
+        curl https://madx.web.cern.ch/releases/madng/1.1/mad-linux-1.1.6 -o ./src/pymadng/bin/mad_Linux
+        curl https://madx.web.cern.ch/releases/madng/1.1/mad-macos-1.1.6 -o ./src/pymadng/bin/mad_Darwin
         chmod +x ./src/pymadng/bin/mad_Linux ./src/pymadng/bin/mad_Darwin
     - name: Install dependencies
       run: |

docs/source/reference.rst

@@ -12,8 +12,8 @@ PyMAD-NG Module contents
 Useful functions for MAD References
 -----------------------------------
 
-.. autofunction:: pymadng.madp_classes.high_level_mad_object.convert_to_dataframe
-   :no-index: 
+.. autofunction:: pymadng.madp_classes.MadObject.convert_to_dataframe
+   :no-index:
 
-.. autofunction:: pymadng.madp_classes.high_level_mad_object.to_df
+.. autofunction:: pymadng.madp_classes.MadObject.to_df
    :no-index:

src/pymadng/madp_pymad.py

@@ -79,7 +79,9 @@ def __init__(
 
         # Create a chunk of code to start the process
         lua_debug_flag = "true" if debug else "false"
-        startup_chunk = f"MAD.pymad '{py_name}' {{_dbg = {lua_debug_flag}}} :__ini({mad_write})"
+        startup_chunk = (
+            f"MAD.pymad '{py_name}' {{_dbg = {lua_debug_flag}}} :__ini({mad_write})"
+        )
 
         if threading.current_thread() is threading.main_thread():
             self._setup_signal_handler()
@@ -125,7 +127,9 @@ def __init__(
         if not startup_status_checker[0] or mad_rtrn != "started":
             self.close()
             if mad_rtrn == "started":
-                raise OSError(f"Could not establish communication with {mad_path} process")
+                raise OSError(
+                    f"Could not establish communication with {mad_path} process"
+                )
             raise OSError(f"Could not start {mad_path} process, received: {mad_rtrn}")
 
         # Set the error handler to be on by default
@@ -175,7 +179,9 @@ def send_cpx_tpsa(self, monos: np.ndarray, coefficients: np.ndarray) -> None:
         self.mad_input_stream.write(b"ctpa")
         send_generic_tpsa(self, monos, coefficients, send_cpx)
 
-    def send(self, data: str | int | float | np.ndarray | bool | list | dict) -> MadProcess:
+    def send(
+        self, data: str | int | float | np.ndarray | bool | list | dict
+    ) -> MadProcess:
         """Send data to the MAD-NG process.
 
         Accepts several types (str, int, float, ndarray, bool, list, dict) and sends them using the appropriate serialization.
@@ -199,9 +205,13 @@ def protected_send(self, string: str) -> MadProcess:
         if self.raise_on_madng_error:
             # If the user has specified that they want to raise an error always, skip the error handling on and off
             return self.send(string)
-        return self.send(f"{self.py_name}:__err(true); {string}; {self.py_name}:__err(false);")
+        return self.send(
+            f"{self.py_name}:__err(true); {string}; {self.py_name}:__err(false);"
+        )
 
-    def protected_variable_retrieval(self, name: str, shallow_copy: bool = False) -> Any:
+    def protected_variable_retrieval(
+        self, name: str, shallow_copy: bool = False
+    ) -> Any:
         """Safely retrieve a variable from MAD-NG.
 
         Enables temporary error handling while retrieving a variable.
@@ -213,7 +223,7 @@ def protected_variable_retrieval(self, name: str, shallow_copy: bool = False) ->
         """
         shallow_copy = str(shallow_copy).lower()
         if self.raise_on_madng_error:
-            return self.send(f"py:send({name}, {shallow_copy})").recv(name)
+            return self.send(f"{self.py_name}:send({name}, {shallow_copy})").recv(name)
         self.send(
             f"{self.py_name}:__err(true):send({name}, {shallow_copy}):__err(false)"
         )  # Enable error handling, ask for the variable, and disable error handling
@@ -297,7 +307,9 @@ def recv_vars(self, *names, shallow_copy: bool = False) -> Any:
             raise ValueError("Cannot retrieve private variables from MAD-NG")
         if len(names) == 1:
             return self.protected_variable_retrieval(names[0], shallow_copy)
-        return tuple(self.protected_variable_retrieval(name, shallow_copy) for name in names)
+        return tuple(
+            self.protected_variable_retrieval(name, shallow_copy) for name in names
+        )
 
     # -------------------------------------------------------------------------- #
 
@@ -683,7 +695,9 @@ def recv_generic_matrix(self: MadProcess, dtype: np.dtype) -> str:
         str: A string representation of the matrix (reshaped numpy array).
     """
     shape = read_data_stream(self, 8, np.int32)
-    return read_data_stream(self, shape[0] * shape[1] * dtype.itemsize, dtype).reshape(shape)
+    return read_data_stream(self, shape[0] * shape[1] * dtype.itemsize, dtype).reshape(
+        shape
+    )
 
 
 def recv_matrix(self: MadProcess) -> np.ndarray:
@@ -759,7 +773,9 @@ def send_generic_tpsa(
     assert len(monos) == len(coefficients), (
         "The number of monomials must be equal to the number of coefficients"
     )
-    assert monos.dtype == np.uint8, "The monomials must be of type 8-bit unsigned integer "
+    assert monos.dtype == np.uint8, (
+        "The monomials must be of type 8-bit unsigned integer "
+    )
     write_serial_data(self, "ii", len(monos), len(monos[0]))
     for mono in monos:
         self.mad_input_stream.write(mono.tobytes())

tests/inputs/example.log

@@ -27,7 +27,7 @@ match = MAD.match
 ***pymad.recv: [py:__err(true):send(MAD['env']['version'], false):__err(false)] 62 bytes
 ***pymad.send: [str_] 4 bytes
 ***pymad.send: binary data 4 bytes
-***pymad.send: [1.1.3] 5 bytes
+***pymad.send: [1.1.6] 5 bytes
 ***pymad.recv: binary data 4 bytes
 ***pymad.recv: [
 function __mklast__ (a, b, ...)

tests/test_object_wrapping.py

@@ -114,7 +114,7 @@ def test_create_deferred_expression(self):
 
 class TestObjFun(unittest.TestCase):
     def test_call_obj(self):
-        with MAD() as mad:
+        with MAD(py_name="python") as mad:
             mad.load("element", "quadrupole", "sextupole")
             qd = mad.quadrupole(knl=[0, 0.25], l=1)
             sd = mad.sextupole(knl=[0, 0.25, 0.5], l=1)
@@ -157,7 +157,7 @@ def test_call_fail(self):
             self.assertRaises(RuntimeError, lambda: mad.mtable.read("'abad.tfs'").eval())
 
     def test_call_func(self):
-        with MAD() as mad:
+        with MAD(py_name="python") as mad:
             mad.load("element", "quadrupole")
             mad["qd"] = mad.quadrupole(knl=[0, 0.25], l=1)
             mad.qd.select()
@@ -237,7 +237,7 @@ def test_evaluate_in_madx_environment(self):
 
 class TestOps(unittest.TestCase):
     def test_matrix(self):
-        with MAD() as mad:
+        with MAD(py_name="python") as mad:
             mad.load("MAD", "matrix")
             py_mat = np.arange(1, 101).reshape((10, 10))
 
@@ -311,7 +311,7 @@ def test_kwargs(self):
 
 class TestDir(unittest.TestCase):
     def test_dir(self):
-        with MAD() as mad:
+        with MAD(py_name="python") as mad:
             mad.load("MAD", "gfunc", "element", "object")
             mad.load("element", "quadrupole")
             mad.load("gfunc", "functor")
@@ -330,7 +330,7 @@ def test_dir(self):
             )  # Adding to the instance should change the dir
 
     def test_dir_on_mad_object(self):
-        with MAD() as mad:
+        with MAD(py_name="python") as mad:
             mad.load("MAD", "object")
             mad.send("my_obj = object {a = 1, b = 2, c = 3}")
             expected_dir = sorted(["a", "b", "c"] + dir(mad.object))