mv _header to Step

Author: amorison

src/stagpy/step.py

@@ -42,7 +42,7 @@ class Geometry:
 
     @cached_property
     def _header(self) -> Mapping[str, Any]:
-        hdr = self.step.fields._header
+        hdr = self.step._header
         if hdr is None:
             raise error.NoGeomError(self.step)
         return hdr
@@ -356,7 +356,7 @@ def _get_raw_data(self, name: str) -> tuple[list[str], Any]:
                 sdat = self.step.sdat
                 if filestem in phyvars.SFIELD_FILES_H5:
                     xmff = sdat._botxmf if name.endswith("bot") else sdat._topxmf
-                    header = self._header
+                    header = self.step._header
                 else:
                     xmff = sdat._dataxmf
                     header = None
@@ -367,20 +367,6 @@ def _get_raw_data(self, name: str) -> tuple[list[str], Any]:
                     break
         return list_fvar, parsed_data
 
-    @cached_property
-    def _header(self) -> dict[str, Any] | None:
-        if self.step.isnap is None:
-            return None
-        binfiles = self.step.sdat._binfiles_set(self.step.isnap)
-        header = None
-        if binfiles:
-            header = stagyyparsers.field_header(binfiles.pop())
-        elif self.step.sdat.hdf5:
-            header = stagyyparsers.read_geom_h5(
-                self.step.sdat._dataxmf, self.step.isnap
-            )
-        return header if header else None
-
     @cached_property
     def geom(self) -> Geometry:
         """Geometry information.
@@ -636,6 +622,18 @@ def __repr__(self) -> str:
         else:
             return f"{self.sdat!r}.steps[{self.istep}]"
 
+    @cached_property
+    def _header(self) -> dict[str, Any] | None:
+        if self.isnap is None:
+            return None
+        binfiles = self.sdat._binfiles_set(self.isnap)
+        header = None
+        if binfiles:
+            header = stagyyparsers.field_header(binfiles.pop())
+        elif self.sdat.hdf5:
+            header = stagyyparsers.read_geom_h5(self.sdat._dataxmf, self.isnap)
+        return header if header else None
+
     @property
     def geom(self) -> Geometry:
         """Geometry information.