Refactoring Branch

.gitignore

@@ -41,6 +41,11 @@ venv
 tests.log
 /.pytest_cache
 
+# Unit test / coverage reports
+htmlcov/
+.coverage
+.cache/
+
 # Installer files
 /installers/build
 /installers/dist

.pre-commit-config.yaml

@@ -2,7 +2,7 @@ default_install_hook_types: [pre-commit, pre-push]
 
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.1
+    rev: v0.12.9
     hooks:
       # Run the linter, applying any available fixes
       - id: ruff-check

requirements.txt

@@ -16,4 +16,4 @@ html5lib
 
 # Other stuff
 matplotlib
-pre-commit
+pre-commit

sasdata/ascii_reader_metadata.py

@@ -26,7 +26,7 @@
 T = TypeVar('T')
 
 # TODO: There may be a better place for this.
-pairings = {'I': 'dI', 'Q': 'dQ', 'Qx': 'dQx', 'Qy': 'dQy'}
+pairings = {'I': 'dI', 'Q': 'dQ', 'Qx': 'dQx', 'Qy': 'dQy', 'Qz': 'dQz'}
 pairing_error = {value: key for key, value in pairings.items()}
 # Allows this to be bidirectional.
 bidirectional_pairings = pairings | pairing_error

sasdata/checklist.txt

@@ -0,0 +1,3 @@
+Things to check once everything is in place:
+
+1) Do any centigrade fields read in incorrectly?

sasdata/data.py

@@ -69,7 +69,7 @@ def abscissae(self) -> Quantity:
                 # TODO: Won't work when there's errors involved. On reflection, we
                 # probably want to avoid creating a new Quantity but at the moment I
                 # can't see a way around it.
-                return Quantity(data_contents, reference_data_content.units)
+                return Quantity(data_contents, reference_data_content.units, name=self._data_contents["Qx"].name, id_header=self._data_contents["Qx"]._id_header)
             case dataset_types.sesans:
                 return self._data_contents["SpinEchoLength"]
             case _:

sasdata/data_backing.py

@@ -27,7 +27,7 @@ def summary(self, indent_amount: int = 0, indent: str = "  ") -> str:
         s += f"{indent*(indent_amount+1)}{shorten_string(str(self.data))}\n"
         for key in self.attributes:
             value = self.attributes[key]
-            if isinstance(value, (Group | Dataset)):
+            if isinstance(value, (Group, Dataset)):
                 value_string = value.summary(indent_amount+1, indent)
             else:
                 value_string = f"{indent * (indent_amount+1)}{key}: {shorten_string(repr(value))}\n"