From 5c37c06b1356ab7c53dfdc1524470d5cd4df330b Mon Sep 17 00:00:00 2001
From: Justus Kuhlmann <justus@kuhl-mann.de>
Date: Thu, 9 Apr 2026 09:54:39 +0200
Subject: [PATCH 1/7] add an implementation to read the first ~200 bytes of the
 par file of openQCD's qcd2

---
 corrlib/input/openQCD.py | 56 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/corrlib/input/openQCD.py b/corrlib/input/openQCD.py
index a3bce6f..9c5fbbc 100644
--- a/corrlib/input/openQCD.py
+++ b/corrlib/input/openQCD.py
@@ -4,6 +4,7 @@ import os
 import fnmatch
 from typing import Any, Optional
 from pathlib import Path
+import struct
 
 
 def read_ms1_param(path: Path, project: str, file_in_project: str) -> dict[str, Any]:
@@ -304,3 +305,58 @@ def extract_t1(path: Path, project: str, dir_in_project: str, param: dict[str, A
     t1_dict[param["type"]] = {}
     t1_dict[param["type"]][pars] = t0
     return t1_dict
+
+
+def read_par_file(fname: str) -> dict[str, dict[str, Any]]:
+
+    def _qcd2_write_lat_parms() -> dict[str, Any]:
+        lat_pars = {}
+
+        t = fp.read(16)
+        lat_pars["N"] = list(struct.unpack('iiii', t)) # lattice extends
+        t = fp.read(8)
+        nk, isw = struct.unpack('ii', t)
+        lat_pars["nk"] = nk
+        lat_pars["isw"] = isw
+        t = fp.read(8)
+        lat_pars["beta"] = struct.unpack('d', t)[0]
+        t = fp.read(8)
+        lat_pars["c0"] = struct.unpack('d', t)[0]
+        t = fp.read(8)
+        lat_pars["c1"] = struct.unpack('d', t)[0]
+        t = fp.read(8)
+        lat_pars["csw"] = struct.unpack('d', t)[0]
+        kappas = []
+        m0s = []
+        for ik in range(nk):
+            t = fp.read(8)
+            kappas.append(struct.unpack('d', t)[0])
+            t = fp.read(8)
+            m0s.append(struct.unpack('d', t)[0])
+        lat_pars["kappas"] = kappas
+        lat_pars["m0s"] = m0s
+        return lat_pars
+
+    def _qcd2_write_bc_parms() -> dict[str, Any]:
+        bc_pars = {}
+        t = fp.read(4)
+        bc_pars["type"] = struct.unpack('i', t)[0]
+        t = fp.read(104)
+        bc_parms = struct.unpack('d'*13, t)
+        bc_pars["cG"] = list(bc_parms[:2])
+        bc_pars["cF"] = list(bc_parms[2:4])
+        phi = [[], []]
+        phi[0] = list(bc_parms[4:7])
+        phi[1] = list(bc_parms[7:10])
+        bc_pars["phi"] = phi
+        bc_pars["theta"] = list(bc_parms[10:])
+        return bc_pars
+
+    with open(fname, "rb") as fp:
+        lat_par_dict = _qcd2_write_lat_parms()
+        bc_par_dict = _qcd2_write_bc_parms()
+        fp.close()
+    par_dict = {}
+    par_dict["lat"] = lat_par_dict
+    par_dict["bc"] = bc_par_dict
+    return par_dict

From 5ea832675702ae6715b07215de120315657ca03d Mon Sep 17 00:00:00 2001
From: Justus Kuhlmann <justus@kuhl-mann.de>
Date: Thu, 9 Apr 2026 10:26:47 +0200
Subject: [PATCH 2/7] add thin wrapper to accomodate for input conventions, add
 comments

---
 corrlib/input/openQCD.py | 62 +++++++++++++++++++++++++++++++++-------
 1 file changed, 52 insertions(+), 10 deletions(-)

diff --git a/corrlib/input/openQCD.py b/corrlib/input/openQCD.py
index 9c5fbbc..1d36e7f 100644
--- a/corrlib/input/openQCD.py
+++ b/corrlib/input/openQCD.py
@@ -307,27 +307,42 @@ def extract_t1(path: Path, project: str, dir_in_project: str, param: dict[str, A
     return t1_dict
 
 
-def read_par_file(fname: str) -> dict[str, dict[str, Any]]:
+def read_qcd2_par_file(fname: Path) -> dict[str, dict[str, Any]]:
+    """
+    The subroutines written here have names according to the openQCD programs and functions that write out the data.
 
+    Parameters
+    ----------
+    fname: Path
+        Location of the parameter file.
+
+    Returns
+    -------
+    par_dict: dict
+        Dictionary holding the parameters specified in the given file.
+    """
     def _qcd2_write_lat_parms() -> dict[str, Any]:
+        """
+        Unpack the lattice parameters written by write_lat_parms.
+        """
         lat_pars = {}
-
         t = fp.read(16)
         lat_pars["N"] = list(struct.unpack('iiii', t)) # lattice extends
         t = fp.read(8)
-        nk, isw = struct.unpack('ii', t)
+        nk, isw = struct.unpack('ii', t) # number of kappas and isw parameter
         lat_pars["nk"] = nk
         lat_pars["isw"] = isw
         t = fp.read(8)
-        lat_pars["beta"] = struct.unpack('d', t)[0]
+        lat_pars["beta"] = struct.unpack('d', t)[0] # beta
         t = fp.read(8)
         lat_pars["c0"] = struct.unpack('d', t)[0]
         t = fp.read(8)
         lat_pars["c1"] = struct.unpack('d', t)[0]
         t = fp.read(8)
-        lat_pars["csw"] = struct.unpack('d', t)[0]
+        lat_pars["csw"] = struct.unpack('d', t)[0] # csw factor
         kappas = []
         m0s = []
+        # read kappas
         for ik in range(nk):
             t = fp.read(8)
             kappas.append(struct.unpack('d', t)[0])
@@ -338,14 +353,17 @@ def read_par_file(fname: str) -> dict[str, dict[str, Any]]:
         return lat_pars
 
     def _qcd2_write_bc_parms() -> dict[str, Any]:
-        bc_pars = {}
+        """
+        Unpack the boundary parameters written by write_bc_parms.
+        """
+        bc_pars: dict[str, Any] = {}
         t = fp.read(4)
-        bc_pars["type"] = struct.unpack('i', t)[0]
+        bc_pars["type"] = struct.unpack('i', t)[0] # type of hte boundaries
         t = fp.read(104)
         bc_parms = struct.unpack('d'*13, t)
-        bc_pars["cG"] = list(bc_parms[:2])
-        bc_pars["cF"] = list(bc_parms[2:4])
-        phi = [[], []]
+        bc_pars["cG"] = list(bc_parms[:2]) # boundary gauge field improvement
+        bc_pars["cF"] = list(bc_parms[2:4]) # boundary fermion field improvement
+        phi: list[list[float]] = [[], []]
         phi[0] = list(bc_parms[4:7])
         phi[1] = list(bc_parms[7:10])
         bc_pars["phi"] = phi
@@ -360,3 +378,27 @@ def read_par_file(fname: str) -> dict[str, dict[str, Any]]:
     par_dict["lat"] = lat_par_dict
     par_dict["bc"] = bc_par_dict
     return par_dict
+
+
+def load_qcd2_pars(path: Path, project: str, file_in_project: str)  -> dict[str, Any]:
+    """
+    Thin wrapper around read_qcd2_par_file, getting the file before reading.
+
+    Parameters
+    ----------
+    path: Path
+        Path of the corrlib repository.
+    project: str
+        UUID of the project of the parameter-file.
+    file_in_project: str
+        The loaction of the file in the project directory.
+
+    Returns
+    -------
+    par_dict: dict
+        The dict with the parameters read from the .par-file.
+    """
+    fname = path / "projects" / project / file_in_project
+    ds = os.path.join(path, "projects", project)
+    dl.get(fname, dataset=ds)
+    return read_qcd2_par_file(fname)

From 71332264cf36ad27c9a9d840c7f14c86ba7835ce Mon Sep 17 00:00:00 2001
From: Justus Kuhlmann <justus@kuhl-mann.de>
Date: Thu, 9 Apr 2026 10:47:19 +0200
Subject: [PATCH 3/7] restruct: give each openQCD prog it's own file

---
 corrlib/input/openQCD.py         | 103 +++++++++----------------------
 corrlib/pars/openQCD/__init__.py |   3 +
 corrlib/pars/openQCD/ms1.py      |  81 ++++++++++++++++++++++++
 corrlib/pars/openQCD/qcd2.py     |  77 +++++++++++++++++++++++
 4 files changed, 189 insertions(+), 75 deletions(-)
 create mode 100644 corrlib/pars/openQCD/__init__.py
 create mode 100644 corrlib/pars/openQCD/ms1.py
 create mode 100644 corrlib/pars/openQCD/qcd2.py

diff --git a/corrlib/input/openQCD.py b/corrlib/input/openQCD.py
index 1d36e7f..8a2b41e 100644
--- a/corrlib/input/openQCD.py
+++ b/corrlib/input/openQCD.py
@@ -4,7 +4,9 @@ import os
 import fnmatch
 from typing import Any, Optional
 from pathlib import Path
-import struct
+from ..pars.openQCD import ms1
+from ..pars.openQCD import qcd2
+
 
 
 def read_ms1_param(path: Path, project: str, file_in_project: str) -> dict[str, Any]:
@@ -307,79 +309,6 @@ def extract_t1(path: Path, project: str, dir_in_project: str, param: dict[str, A
     return t1_dict
 
 
-def read_qcd2_par_file(fname: Path) -> dict[str, dict[str, Any]]:
-    """
-    The subroutines written here have names according to the openQCD programs and functions that write out the data.
-
-    Parameters
-    ----------
-    fname: Path
-        Location of the parameter file.
-
-    Returns
-    -------
-    par_dict: dict
-        Dictionary holding the parameters specified in the given file.
-    """
-    def _qcd2_write_lat_parms() -> dict[str, Any]:
-        """
-        Unpack the lattice parameters written by write_lat_parms.
-        """
-        lat_pars = {}
-        t = fp.read(16)
-        lat_pars["N"] = list(struct.unpack('iiii', t)) # lattice extends
-        t = fp.read(8)
-        nk, isw = struct.unpack('ii', t) # number of kappas and isw parameter
-        lat_pars["nk"] = nk
-        lat_pars["isw"] = isw
-        t = fp.read(8)
-        lat_pars["beta"] = struct.unpack('d', t)[0] # beta
-        t = fp.read(8)
-        lat_pars["c0"] = struct.unpack('d', t)[0]
-        t = fp.read(8)
-        lat_pars["c1"] = struct.unpack('d', t)[0]
-        t = fp.read(8)
-        lat_pars["csw"] = struct.unpack('d', t)[0] # csw factor
-        kappas = []
-        m0s = []
-        # read kappas
-        for ik in range(nk):
-            t = fp.read(8)
-            kappas.append(struct.unpack('d', t)[0])
-            t = fp.read(8)
-            m0s.append(struct.unpack('d', t)[0])
-        lat_pars["kappas"] = kappas
-        lat_pars["m0s"] = m0s
-        return lat_pars
-
-    def _qcd2_write_bc_parms() -> dict[str, Any]:
-        """
-        Unpack the boundary parameters written by write_bc_parms.
-        """
-        bc_pars: dict[str, Any] = {}
-        t = fp.read(4)
-        bc_pars["type"] = struct.unpack('i', t)[0] # type of hte boundaries
-        t = fp.read(104)
-        bc_parms = struct.unpack('d'*13, t)
-        bc_pars["cG"] = list(bc_parms[:2]) # boundary gauge field improvement
-        bc_pars["cF"] = list(bc_parms[2:4]) # boundary fermion field improvement
-        phi: list[list[float]] = [[], []]
-        phi[0] = list(bc_parms[4:7])
-        phi[1] = list(bc_parms[7:10])
-        bc_pars["phi"] = phi
-        bc_pars["theta"] = list(bc_parms[10:])
-        return bc_pars
-
-    with open(fname, "rb") as fp:
-        lat_par_dict = _qcd2_write_lat_parms()
-        bc_par_dict = _qcd2_write_bc_parms()
-        fp.close()
-    par_dict = {}
-    par_dict["lat"] = lat_par_dict
-    par_dict["bc"] = bc_par_dict
-    return par_dict
-
-
 def load_qcd2_pars(path: Path, project: str, file_in_project: str)  -> dict[str, Any]:
     """
     Thin wrapper around read_qcd2_par_file, getting the file before reading.
@@ -401,4 +330,28 @@ def load_qcd2_pars(path: Path, project: str, file_in_project: str)  -> dict[str,
     fname = path / "projects" / project / file_in_project
     ds = os.path.join(path, "projects", project)
     dl.get(fname, dataset=ds)
-    return read_qcd2_par_file(fname)
+    return qcd2.read_qcd2_par_file(fname)
+
+
+def load_ms1_pars(path: Path, project: str, file_in_project: str)  -> dict[str, Any]:
+    """
+    Thin wrapper around read_qcd2_ms1_par_file, getting the file before reading.
+
+    Parameters
+    ----------
+    path: Path
+        Path of the corrlib repository.
+    project: str
+        UUID of the project of the parameter-file.
+    file_in_project: str
+        The loaction of the file in the project directory.
+
+    Returns
+    -------
+    par_dict: dict
+        The dict with the parameters read from the .par-file.
+    """
+    fname = path / "projects" / project / file_in_project
+    ds = os.path.join(path, "projects", project)
+    dl.get(fname, dataset=ds)
+    return ms1.read_qcd2_ms1_par_file(fname)
diff --git a/corrlib/pars/openQCD/__init__.py b/corrlib/pars/openQCD/__init__.py
new file mode 100644
index 0000000..edbac71
--- /dev/null
+++ b/corrlib/pars/openQCD/__init__.py
@@ -0,0 +1,3 @@
+
+from . import ms1 as ms1
+from . import qcd2 as qcd2
diff --git a/corrlib/pars/openQCD/ms1.py b/corrlib/pars/openQCD/ms1.py
new file mode 100644
index 0000000..9aabc54
--- /dev/null
+++ b/corrlib/pars/openQCD/ms1.py
@@ -0,0 +1,81 @@
+import struct
+
+from typing import Any
+from pathlib import Path
+
+
+def read_qcd2_ms1_par_file(fname: Path) -> dict[str, dict[str, Any]]:
+    """
+    The subroutines written here have names according to the openQCD programs and functions that write out the data.
+    Parameters
+    ----------
+    fname: Path
+        Location of the parameter file.
+
+    Returns
+    -------
+    par_dict: dict
+        Dictionary holding the parameters specified in the given file.
+    """
+
+    def _qcd2_write_lat_parms() -> dict[str, Any]:
+        """
+        NOTE: This is a duplcation from qcd2.
+        Unpack the lattice parameters written by write_lat_parms.
+        """
+        lat_pars = {}
+        t = fp.read(16)
+        lat_pars["N"] = list(struct.unpack('iiii', t)) # lattice extends
+        t = fp.read(8)
+        nk, isw = struct.unpack('ii', t) # number of kappas and isw parameter
+        lat_pars["nk"] = nk
+        lat_pars["isw"] = isw
+        t = fp.read(8)
+        lat_pars["beta"] = struct.unpack('d', t)[0] # beta
+        t = fp.read(8)
+        lat_pars["c0"] = struct.unpack('d', t)[0]
+        t = fp.read(8)
+        lat_pars["c1"] = struct.unpack('d', t)[0]
+        t = fp.read(8)
+        lat_pars["csw"] = struct.unpack('d', t)[0] # csw factor
+        kappas = []
+        m0s = []
+        # read kappas
+        for ik in range(nk):
+            t = fp.read(8)
+            kappas.append(struct.unpack('d', t)[0])
+            t = fp.read(8)
+            m0s.append(struct.unpack('d', t)[0])
+        lat_pars["kappas"] = kappas
+        lat_pars["m0s"] = m0s
+        return lat_pars
+
+    def _qcd2_write_bc_parms() -> dict[str, Any]:
+        """
+        NOTE: This is a duplcation from qcd2.
+        Unpack the boundary parameters written by write_bc_parms.
+        """
+        bc_pars: dict[str, Any] = {}
+        t = fp.read(4)
+        bc_pars["type"] = struct.unpack('i', t)[0] # type of hte boundaries
+        t = fp.read(104)
+        bc_parms = struct.unpack('d'*13, t)
+        bc_pars["cG"] = list(bc_parms[:2]) # boundary gauge field improvement
+        bc_pars["cF"] = list(bc_parms[2:4]) # boundary fermion field improvement
+        phi: list[list[float]] = [[], []]
+        phi[0] = list(bc_parms[4:7])
+        phi[1] = list(bc_parms[7:10])
+        bc_pars["phi"] = phi
+        bc_pars["theta"] = list(bc_parms[10:])
+        return bc_pars
+
+    with open(fname, "rb") as fp:
+        lat_par_dict = _qcd2_write_lat_parms()
+        bc_par_dict = _qcd2_write_bc_parms()
+        fp.close()
+    par_dict = {}
+    par_dict["lat"] = lat_par_dict
+    par_dict["bc"] = bc_par_dict
+    return par_dict
+
+
diff --git a/corrlib/pars/openQCD/qcd2.py b/corrlib/pars/openQCD/qcd2.py
new file mode 100644
index 0000000..9d63689
--- /dev/null
+++ b/corrlib/pars/openQCD/qcd2.py
@@ -0,0 +1,77 @@
+import struct
+
+from pathlib import Path
+from typing import Any
+
+
+def read_qcd2_par_file(fname: Path) -> dict[str, dict[str, Any]]:
+    """
+    The subroutines written here have names according to the openQCD programs and functions that write out the data.
+
+    Parameters
+    ----------
+    fname: Path
+        Location of the parameter file.
+
+    Returns
+    -------
+    par_dict: dict
+        Dictionary holding the parameters specified in the given file.
+    """
+    def _qcd2_write_lat_parms() -> dict[str, Any]:
+        """
+        Unpack the lattice parameters written by write_lat_parms.
+        """
+        lat_pars = {}
+        t = fp.read(16)
+        lat_pars["N"] = list(struct.unpack('iiii', t)) # lattice extends
+        t = fp.read(8)
+        nk, isw = struct.unpack('ii', t) # number of kappas and isw parameter
+        lat_pars["nk"] = nk
+        lat_pars["isw"] = isw
+        t = fp.read(8)
+        lat_pars["beta"] = struct.unpack('d', t)[0] # beta
+        t = fp.read(8)
+        lat_pars["c0"] = struct.unpack('d', t)[0]
+        t = fp.read(8)
+        lat_pars["c1"] = struct.unpack('d', t)[0]
+        t = fp.read(8)
+        lat_pars["csw"] = struct.unpack('d', t)[0] # csw factor
+        kappas = []
+        m0s = []
+        # read kappas
+        for ik in range(nk):
+            t = fp.read(8)
+            kappas.append(struct.unpack('d', t)[0])
+            t = fp.read(8)
+            m0s.append(struct.unpack('d', t)[0])
+        lat_pars["kappas"] = kappas
+        lat_pars["m0s"] = m0s
+        return lat_pars
+
+    def _qcd2_write_bc_parms() -> dict[str, Any]:
+        """
+        Unpack the boundary parameters written by write_bc_parms.
+        """
+        bc_pars: dict[str, Any] = {}
+        t = fp.read(4)
+        bc_pars["type"] = struct.unpack('i', t)[0] # type of hte boundaries
+        t = fp.read(104)
+        bc_parms = struct.unpack('d'*13, t)
+        bc_pars["cG"] = list(bc_parms[:2]) # boundary gauge field improvement
+        bc_pars["cF"] = list(bc_parms[2:4]) # boundary fermion field improvement
+        phi: list[list[float]] = [[], []]
+        phi[0] = list(bc_parms[4:7])
+        phi[1] = list(bc_parms[7:10])
+        bc_pars["phi"] = phi
+        bc_pars["theta"] = list(bc_parms[10:])
+        return bc_pars
+
+    with open(fname, "rb") as fp:
+        lat_par_dict = _qcd2_write_lat_parms()
+        bc_par_dict = _qcd2_write_bc_parms()
+        fp.close()
+    par_dict = {}
+    par_dict["lat"] = lat_par_dict
+    par_dict["bc"] = bc_par_dict
+    return par_dict

From e654d7c1bb6b4948eb43037977142358c37dcd7b Mon Sep 17 00:00:00 2001
From: Justus Kuhlmann <justus@kuhl-mann.de>
Date: Thu, 9 Apr 2026 11:10:54 +0200
Subject: [PATCH 4/7] restruct: introduce a file for flags

---
 corrlib/pars/openQCD/flags.py | 59 +++++++++++++++++++++++++++++++++++
 corrlib/pars/openQCD/ms1.py   | 57 ++-------------------------------
 corrlib/pars/openQCD/qcd2.py  | 55 ++------------------------------
 3 files changed, 65 insertions(+), 106 deletions(-)
 create mode 100644 corrlib/pars/openQCD/flags.py

diff --git a/corrlib/pars/openQCD/flags.py b/corrlib/pars/openQCD/flags.py
new file mode 100644
index 0000000..2e4ab17
--- /dev/null
+++ b/corrlib/pars/openQCD/flags.py
@@ -0,0 +1,59 @@
+"""
+Reconstruct the outputs of flags.
+"""
+
+import struct
+from typing import Any, BinaryIO
+
+# lat_parms.c
+def lat_parms_write_lat_parms(fp: BinaryIO) -> dict[str, Any]:
+        """
+        NOTE: This is a duplcation from qcd2.
+        Unpack the lattice parameters written by write_lat_parms.
+        """
+        lat_pars = {}
+        t = fp.read(16)
+        lat_pars["N"] = list(struct.unpack('iiii', t)) # lattice extends
+        t = fp.read(8)
+        nk, isw = struct.unpack('ii', t) # number of kappas and isw parameter
+        lat_pars["nk"] = nk
+        lat_pars["isw"] = isw
+        t = fp.read(8)
+        lat_pars["beta"] = struct.unpack('d', t)[0] # beta
+        t = fp.read(8)
+        lat_pars["c0"] = struct.unpack('d', t)[0]
+        t = fp.read(8)
+        lat_pars["c1"] = struct.unpack('d', t)[0]
+        t = fp.read(8)
+        lat_pars["csw"] = struct.unpack('d', t)[0] # csw factor
+        kappas = []
+        m0s = []
+        # read kappas
+        for ik in range(nk):
+            t = fp.read(8)
+            kappas.append(struct.unpack('d', t)[0])
+            t = fp.read(8)
+            m0s.append(struct.unpack('d', t)[0])
+        lat_pars["kappas"] = kappas
+        lat_pars["m0s"] = m0s
+        return lat_pars
+
+
+def lat_parms_write_bc_parms(fp: BinaryIO) -> dict[str, Any]:
+        """
+        NOTE: This is a duplcation from qcd2.
+        Unpack the boundary parameters written by write_bc_parms.
+        """
+        bc_pars: dict[str, Any] = {}
+        t = fp.read(4)
+        bc_pars["type"] = struct.unpack('i', t)[0] # type of hte boundaries
+        t = fp.read(104)
+        bc_parms = struct.unpack('d'*13, t)
+        bc_pars["cG"] = list(bc_parms[:2]) # boundary gauge field improvement
+        bc_pars["cF"] = list(bc_parms[2:4]) # boundary fermion field improvement
+        phi: list[list[float]] = [[], []]
+        phi[0] = list(bc_parms[4:7])
+        phi[1] = list(bc_parms[7:10])
+        bc_pars["phi"] = phi
+        bc_pars["theta"] = list(bc_parms[10:])
+        return bc_pars
\ No newline at end of file
diff --git a/corrlib/pars/openQCD/ms1.py b/corrlib/pars/openQCD/ms1.py
index 9aabc54..4c2aed5 100644
--- a/corrlib/pars/openQCD/ms1.py
+++ b/corrlib/pars/openQCD/ms1.py
@@ -1,4 +1,4 @@
-import struct
+from . import flags
 
 from typing import Any
 from pathlib import Path
@@ -18,60 +18,9 @@ def read_qcd2_ms1_par_file(fname: Path) -> dict[str, dict[str, Any]]:
         Dictionary holding the parameters specified in the given file.
     """
 
-    def _qcd2_write_lat_parms() -> dict[str, Any]:
-        """
-        NOTE: This is a duplcation from qcd2.
-        Unpack the lattice parameters written by write_lat_parms.
-        """
-        lat_pars = {}
-        t = fp.read(16)
-        lat_pars["N"] = list(struct.unpack('iiii', t)) # lattice extends
-        t = fp.read(8)
-        nk, isw = struct.unpack('ii', t) # number of kappas and isw parameter
-        lat_pars["nk"] = nk
-        lat_pars["isw"] = isw
-        t = fp.read(8)
-        lat_pars["beta"] = struct.unpack('d', t)[0] # beta
-        t = fp.read(8)
-        lat_pars["c0"] = struct.unpack('d', t)[0]
-        t = fp.read(8)
-        lat_pars["c1"] = struct.unpack('d', t)[0]
-        t = fp.read(8)
-        lat_pars["csw"] = struct.unpack('d', t)[0] # csw factor
-        kappas = []
-        m0s = []
-        # read kappas
-        for ik in range(nk):
-            t = fp.read(8)
-            kappas.append(struct.unpack('d', t)[0])
-            t = fp.read(8)
-            m0s.append(struct.unpack('d', t)[0])
-        lat_pars["kappas"] = kappas
-        lat_pars["m0s"] = m0s
-        return lat_pars
-
-    def _qcd2_write_bc_parms() -> dict[str, Any]:
-        """
-        NOTE: This is a duplcation from qcd2.
-        Unpack the boundary parameters written by write_bc_parms.
-        """
-        bc_pars: dict[str, Any] = {}
-        t = fp.read(4)
-        bc_pars["type"] = struct.unpack('i', t)[0] # type of hte boundaries
-        t = fp.read(104)
-        bc_parms = struct.unpack('d'*13, t)
-        bc_pars["cG"] = list(bc_parms[:2]) # boundary gauge field improvement
-        bc_pars["cF"] = list(bc_parms[2:4]) # boundary fermion field improvement
-        phi: list[list[float]] = [[], []]
-        phi[0] = list(bc_parms[4:7])
-        phi[1] = list(bc_parms[7:10])
-        bc_pars["phi"] = phi
-        bc_pars["theta"] = list(bc_parms[10:])
-        return bc_pars
-
     with open(fname, "rb") as fp:
-        lat_par_dict = _qcd2_write_lat_parms()
-        bc_par_dict = _qcd2_write_bc_parms()
+        lat_par_dict = flags.lat_parms_write_lat_parms(fp)
+        bc_par_dict = flags.lat_parms_write_bc_parms(fp)
         fp.close()
     par_dict = {}
     par_dict["lat"] = lat_par_dict
diff --git a/corrlib/pars/openQCD/qcd2.py b/corrlib/pars/openQCD/qcd2.py
index 9d63689..3b6e277 100644
--- a/corrlib/pars/openQCD/qcd2.py
+++ b/corrlib/pars/openQCD/qcd2.py
@@ -1,9 +1,8 @@
-import struct
+from . import flags
 
 from pathlib import Path
 from typing import Any
 
-
 def read_qcd2_par_file(fname: Path) -> dict[str, dict[str, Any]]:
     """
     The subroutines written here have names according to the openQCD programs and functions that write out the data.
@@ -18,58 +17,10 @@ def read_qcd2_par_file(fname: Path) -> dict[str, dict[str, Any]]:
     par_dict: dict
         Dictionary holding the parameters specified in the given file.
     """
-    def _qcd2_write_lat_parms() -> dict[str, Any]:
-        """
-        Unpack the lattice parameters written by write_lat_parms.
-        """
-        lat_pars = {}
-        t = fp.read(16)
-        lat_pars["N"] = list(struct.unpack('iiii', t)) # lattice extends
-        t = fp.read(8)
-        nk, isw = struct.unpack('ii', t) # number of kappas and isw parameter
-        lat_pars["nk"] = nk
-        lat_pars["isw"] = isw
-        t = fp.read(8)
-        lat_pars["beta"] = struct.unpack('d', t)[0] # beta
-        t = fp.read(8)
-        lat_pars["c0"] = struct.unpack('d', t)[0]
-        t = fp.read(8)
-        lat_pars["c1"] = struct.unpack('d', t)[0]
-        t = fp.read(8)
-        lat_pars["csw"] = struct.unpack('d', t)[0] # csw factor
-        kappas = []
-        m0s = []
-        # read kappas
-        for ik in range(nk):
-            t = fp.read(8)
-            kappas.append(struct.unpack('d', t)[0])
-            t = fp.read(8)
-            m0s.append(struct.unpack('d', t)[0])
-        lat_pars["kappas"] = kappas
-        lat_pars["m0s"] = m0s
-        return lat_pars
-
-    def _qcd2_write_bc_parms() -> dict[str, Any]:
-        """
-        Unpack the boundary parameters written by write_bc_parms.
-        """
-        bc_pars: dict[str, Any] = {}
-        t = fp.read(4)
-        bc_pars["type"] = struct.unpack('i', t)[0] # type of hte boundaries
-        t = fp.read(104)
-        bc_parms = struct.unpack('d'*13, t)
-        bc_pars["cG"] = list(bc_parms[:2]) # boundary gauge field improvement
-        bc_pars["cF"] = list(bc_parms[2:4]) # boundary fermion field improvement
-        phi: list[list[float]] = [[], []]
-        phi[0] = list(bc_parms[4:7])
-        phi[1] = list(bc_parms[7:10])
-        bc_pars["phi"] = phi
-        bc_pars["theta"] = list(bc_parms[10:])
-        return bc_pars
 
     with open(fname, "rb") as fp:
-        lat_par_dict = _qcd2_write_lat_parms()
-        bc_par_dict = _qcd2_write_bc_parms()
+        lat_par_dict = flags.lat_parms_qcd2_write_lat_parms(fp)
+        bc_par_dict = flags.lat_parms_qcd2_write_bc_parms(fp)
         fp.close()
     par_dict = {}
     par_dict["lat"] = lat_par_dict

From 9498c1dd735ea498207eedafe4cb37f458c008c2 Mon Sep 17 00:00:00 2001
From: Justus Kuhlmann <justus@kuhl-mann.de>
Date: Thu, 9 Apr 2026 11:11:48 +0200
Subject: [PATCH 5/7] correct function names

---
 corrlib/pars/openQCD/qcd2.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/corrlib/pars/openQCD/qcd2.py b/corrlib/pars/openQCD/qcd2.py
index 3b6e277..e73c156 100644
--- a/corrlib/pars/openQCD/qcd2.py
+++ b/corrlib/pars/openQCD/qcd2.py
@@ -3,6 +3,7 @@ from . import flags
 from pathlib import Path
 from typing import Any
 
+
 def read_qcd2_par_file(fname: Path) -> dict[str, dict[str, Any]]:
     """
     The subroutines written here have names according to the openQCD programs and functions that write out the data.
@@ -19,8 +20,8 @@ def read_qcd2_par_file(fname: Path) -> dict[str, dict[str, Any]]:
     """
 
     with open(fname, "rb") as fp:
-        lat_par_dict = flags.lat_parms_qcd2_write_lat_parms(fp)
-        bc_par_dict = flags.lat_parms_qcd2_write_bc_parms(fp)
+        lat_par_dict = flags.lat_parms_write_lat_parms(fp)
+        bc_par_dict = flags.lat_parms_write_bc_parms(fp)
         fp.close()
     par_dict = {}
     par_dict["lat"] = lat_par_dict

From 8394b1fdbdaeaf0e647b7e568c9338f0a4a3a166 Mon Sep 17 00:00:00 2001
From: Justus Kuhlmann <justus@kuhl-mann.de>
Date: Thu, 9 Apr 2026 11:23:28 +0200
Subject: [PATCH 6/7] rename functions, let write_measurement decide which file
 type is given

---
 corrlib/input/openQCD.py |  6 +++---
 corrlib/meas_io.py       |  7 +++++--
 corrlib/toml.py          | 10 +++++++---
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/corrlib/input/openQCD.py b/corrlib/input/openQCD.py
index 8a2b41e..879b555 100644
--- a/corrlib/input/openQCD.py
+++ b/corrlib/input/openQCD.py
@@ -9,7 +9,7 @@ from ..pars.openQCD import qcd2
 
 
 
-def read_ms1_param(path: Path, project: str, file_in_project: str) -> dict[str, Any]:
+def load_ms1_infile(path: Path, project: str, file_in_project: str) -> dict[str, Any]:
     """
     Read the parameters for ms1 measurements from a parameter file in the project.
 
@@ -73,7 +73,7 @@ def read_ms1_param(path: Path, project: str, file_in_project: str) -> dict[str,
     return param
 
 
-def read_ms3_param(path: Path, project: str, file_in_project: str) -> dict[str, Any]:
+def load_ms3_infile(path: Path, project: str, file_in_project: str) -> dict[str, Any]:
     """
     Read the parameters for ms3 measurements from a parameter file in the project.
 
@@ -333,7 +333,7 @@ def load_qcd2_pars(path: Path, project: str, file_in_project: str)  -> dict[str,
     return qcd2.read_qcd2_par_file(fname)
 
 
-def load_ms1_pars(path: Path, project: str, file_in_project: str)  -> dict[str, Any]:
+def load_ms1_parfile(path: Path, project: str, file_in_project: str)  -> dict[str, Any]:
     """
     Thin wrapper around read_qcd2_ms1_par_file, getting the file before reading.
 
diff --git a/corrlib/meas_io.py b/corrlib/meas_io.py
index 0f9ac02..a48f546 100644
--- a/corrlib/meas_io.py
+++ b/corrlib/meas_io.py
@@ -74,7 +74,10 @@ def write_measurement(path: Path, ensemble: str, measurement: dict[str, dict[str
             ms_type = list(measurement.keys())[0]
             if ms_type == 'ms1':
                 if parameter_file is not None:
-                    parameters = openQCD.read_ms1_param(path, uuid, parameter_file)
+                    if parameter_file.endswith(".ms1.in"):
+                        parameters = openQCD.load_ms1_infile(path, uuid, parameter_file)
+                    elif parameter_file.endswith(".ms1.par"):
+                        parameters = openQCD.load_ms1_parfile(path, uuid, parameter_file)
                 else:
                     raise Exception("Need parameter file for this code!")
                 pars = {}
@@ -88,7 +91,7 @@ def write_measurement(path: Path, ensemble: str, measurement: dict[str, dict[str
                     pars[subkey] = json.dumps(parameters["rw_fcts"][i])
             elif ms_type in ['t0', 't1']:
                 if parameter_file is not None:
-                    parameters = openQCD.read_ms3_param(path, uuid, parameter_file)
+                    parameters = openQCD.load_ms3_infile(path, uuid, parameter_file)
                 else:
                     parameters = {}
                     for rwp in ["integrator", "eps", "ntot", "dnms"]:
diff --git a/corrlib/toml.py b/corrlib/toml.py
index add3739..93ba0f3 100644
--- a/corrlib/toml.py
+++ b/corrlib/toml.py
@@ -192,12 +192,16 @@ def import_toml(path: Path, file: str, copy_file: bool=True) -> None:
 
         elif project['code'] == 'openQCD':
             if md['measurement'] == 'ms1':
-                param = openQCD.read_ms1_param(path, uuid, md['param_file'])
+                parameter_file = md['param_file']
+                if parameter_file.endswith(".ms1.in"):
+                    param = openQCD.load_ms1_infile(path, uuid, parameter_file)
+                elif parameter_file.endswith(".ms1.par"):
+                    param = openQCD.load_ms1_parfile(path, uuid, parameter_file)
                 param['type'] = 'ms1'
                 measurement = openQCD.read_rwms(path, uuid, md['path'], param, md["prefix"], version=md["version"], names=md['names'], files=md['files'])
             elif md['measurement'] == 't0':
                 if 'param_file' in md:
-                    param = openQCD.read_ms3_param(path, uuid, md['param_file'])
+                    param = openQCD.load_ms3_infile(path, uuid, md['param_file'])
                 else:
                     param = {}
                     for rwp in ["integrator", "eps", "ntot", "dnms"]:
@@ -207,7 +211,7 @@ def import_toml(path: Path, file: str, copy_file: bool=True) -> None:
                                                  fit_range=int(md.get('fit_range', 5)), postfix=str(md.get('postfix', '')), names=md.get('names', []), files=md.get('files', []))
             elif md['measurement'] == 't1':
                 if 'param_file' in md:
-                    param = openQCD.read_ms3_param(path, uuid, md['param_file'])
+                    param = openQCD.load_ms3_infile(path, uuid, md['param_file'])
                 param['type'] = 't1'
                 measurement = openQCD.extract_t1(path, uuid, md['path'], param, str(md["prefix"]), int(md["dtr_read"]), int(md["xmin"]), int(md["spatial_extent"]),
                                                  fit_range=int(md.get('fit_range', 5)), postfix=str(md.get('postfix', '')), names=md.get('names', []), files=md.get('files', []))

From 26607632328e4615fce343f7d700baddaad9fdb2 Mon Sep 17 00:00:00 2001
From: Justus Kuhlmann <justus@kuhl-mann.de>
Date: Thu, 9 Apr 2026 11:24:25 +0200
Subject: [PATCH 7/7] lint

---
 corrlib/pars/openQCD/flags.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corrlib/pars/openQCD/flags.py b/corrlib/pars/openQCD/flags.py
index 2e4ab17..95be919 100644
--- a/corrlib/pars/openQCD/flags.py
+++ b/corrlib/pars/openQCD/flags.py
@@ -56,4 +56,4 @@ def lat_parms_write_bc_parms(fp: BinaryIO) -> dict[str, Any]:
         phi[1] = list(bc_parms[7:10])
         bc_pars["phi"] = phi
         bc_pars["theta"] = list(bc_parms[10:])
-        return bc_pars
\ No newline at end of file
+        return bc_pars