evefile 0.1.0rc1__tar.gz → 0.1.0rc2__tar.gz

{evefile-0.1.0rc1/evefile.egg-info → evefile-0.1.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: evefile
-Version: 0.1.0rc1
+Version: 0.1.0rc2
 Summary: Transitional package to read eveH5 files containing synchrotron radiometry data recorded at BESSY/MLS in Berlin
 Home-page: https://www.ptb.de/cms/en/ptb/fachabteilungen/abt7/ptb-sr.html
 Author: Till Biskup
@@ -53,6 +53,11 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
+
+.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.16815768.svg
+   :target: https://doi.org/10.5281/zenodo.16815768
+   :align: right
+
 =======
 evefile
 =======

{evefile-0.1.0rc1 → evefile-0.1.0rc2}/README.rst

@@ -1,3 +1,8 @@
+
+.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.16815768.svg
+   :target: https://doi.org/10.5281/zenodo.16815768
+   :align: right
+
 =======
 evefile
 =======

evefile-0.1.0rc2/VERSION

@@ -0,0 +1 @@
+0.1.0-rc.2

{evefile-0.1.0rc1 → evefile-0.1.0rc2}/evefile/boundaries/evefile.py

@@ -488,7 +488,7 @@ class EveFile(File):
         dataframe = pd.DataFrame(
             {item.metadata.name: item.data for item in joined_data}
         )
-        dataframe.index.name = "PosRef"
+        dataframe.index.name = "position"
         return dataframe
 
     def show_info(self):

{evefile-0.1.0rc1 → evefile-0.1.0rc2}/evefile/controllers/joining.py

@@ -466,7 +466,6 @@ import logging
 from functools import reduce
 
 import numpy as np
-from numpy import ma
 
 import evefile.entities
 import evefile.entities.data
@@ -616,56 +615,16 @@ class Join:
     def _fill_axes(self):
         for axis in self._axes:
             if axis.metadata.id in self.evefile.snapshots:
-                self.evefile.snapshots[axis.metadata.id].get_data()
-                axis.position_counts = np.searchsorted(
-                    axis.position_counts,
-                    self.evefile.snapshots[axis.metadata.id].position_counts,
+                axis.join(
+                    positions=self._result_positions,
+                    snapshot=self.evefile.snapshots[axis.metadata.id],
                 )
-                axis.data = np.insert(
-                    axis.data,
-                    axis.position_counts,
-                    self.evefile.snapshots[axis.metadata.id].data,
-                )
-            positions = (
-                np.searchsorted(
-                    axis.position_counts, self._result_positions, side="right"
-                )
-                - 1
-            )
-            axis.position_counts = self._result_positions
-            axis.data = axis.data[positions]
-            if np.any(np.where(positions < 0)):
-                axis.data = ma.masked_array(axis.data)
-                axis.data[np.where(positions < 0)] = ma.masked
+            else:
+                axis.join(positions=self._result_positions, fill=True)
 
     def _fill_channels(self):
         for channel in self._channels:
-            if len(self._result_positions) > len(channel.position_counts):
-                original_values = channel.data
-                channel.data = ma.masked_array(
-                    np.zeros(len(self._result_positions))
-                )
-                channel.data = ma.masked_array(channel.data)
-                positions = np.setdiff1d(
-                    self._result_positions, channel.position_counts
-                )
-                channel.data[
-                    np.searchsorted(
-                        self._result_positions, channel.position_counts
-                    ).astype(np.int64)
-                ] = original_values
-                channel.data[
-                    np.searchsorted(self._result_positions, positions).astype(
-                        np.int64
-                    )
-                ] = ma.masked
-            elif len(self._result_positions) < len(channel.position_counts):
-                channel.data = channel.data[
-                    np.searchsorted(
-                        channel.position_counts, self._result_positions
-                    ).astype(np.int64)
-                ]
-            channel.position_counts = self._result_positions
+            channel.join(positions=self._result_positions)
 
     def _assign_result(self):
         result = [*self._axes]