shepherd-data 2024.7.4__tar.gz → 2024.8.2__tar.gz

{shepherd_data-2024.7.4 → shepherd_data-2024.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: shepherd_data
-Version: 2024.7.4
+Version: 2024.8.2
 Summary: Programming- and CLI-Interface for the h5-dataformat of the Shepherd-Testbed
 Author-email: Ingmar Splitt <ingmar.splitt@tu-dresden.de>
 Maintainer-email: Ingmar Splitt <ingmar.splitt@tu-dresden.de>
@@ -35,7 +35,7 @@ Requires-Dist: numpy
 Requires-Dist: pandas>=2.0.0
 Requires-Dist: pyYAML
 Requires-Dist: scipy
-Requires-Dist: shepherd-core[inventory]>=2024.7.4
+Requires-Dist: shepherd-core[inventory]>=2024.8.2
 Requires-Dist: tqdm
 Provides-Extra: elf
 Requires-Dist: shepherd-core[elf]; extra == "elf"

{shepherd_data-2024.7.4 → shepherd_data-2024.8.2}/pyproject.toml

@@ -37,7 +37,7 @@ dependencies = [
     "pandas>=2.0.0",  # full-version, v2 is OK
     "pyYAML",
     "scipy",   # full-version
-    "shepherd-core[inventory]>=2024.7.4",
+    "shepherd-core[inventory]>=2024.8.2",
     "tqdm",    # full-version
 ]
 

{shepherd_data-2024.7.4 → shepherd_data-2024.8.2}/shepherd_data/__init__.py

@@ -11,7 +11,7 @@ from shepherd_core import Writer
 
 from .reader import Reader
 
-__version__ = "2024.7.4"
+__version__ = "2024.8.2"
 
 __all__ = [
     "Reader",

{shepherd_data-2024.7.4 → shepherd_data-2024.8.2}/shepherd_data/ivonne.py

@@ -137,7 +137,7 @@ class Reader:
             curve_interval_us = round(sfw.sample_interval_ns * pts_per_curve / 1000)
             up_factor = self.sample_interval_ns // sfw.sample_interval_ns
             max_elements = math.ceil(sfw.max_elements // up_factor)
-            job_iter = trange(0, df_elements_n, max_elements, desc="generate ivcurves")
+            job_iter = trange(0, df_elements_n, max_elements, desc="generate ivcurves", leave=False)
 
             for idx in job_iter:
                 idx_top = min(idx + max_elements, df_elements_n)
@@ -212,7 +212,9 @@ class Reader:
             interval_us = round(sfw.sample_interval_ns / 1000)
             up_factor = self.sample_interval_ns // sfw.sample_interval_ns
             max_elements = math.ceil(sfw.max_elements // up_factor)
-            job_iter = trange(0, df_elements_n, max_elements, desc="generate ivsamples")
+            job_iter = trange(
+                0, df_elements_n, max_elements, desc="generate ivsamples", leave=False
+            )
 
             for idx in job_iter:
                 # select (max_elements + 1) elements, so upsampling is without gaps
@@ -263,7 +265,7 @@ class Reader:
             interval_us = round(sfw.sample_interval_ns / 1000)
             up_factor = self.sample_interval_ns // sfw.sample_interval_ns
             max_elements = math.ceil(sfw.max_elements // up_factor)
-            job_iter = trange(0, df_elements_n, max_elements, desc="generate upsample")
+            job_iter = trange(0, df_elements_n, max_elements, desc="generate upsample", leave=False)
 
             for idx in job_iter:
                 # select (max_elements + 1) elements, so upsampling is without gaps

{shepherd_data-2024.7.4 → shepherd_data-2024.8.2}/shepherd_data/reader.py

@@ -399,34 +399,32 @@ class Reader(CoreReader):
         if isinstance(data, dict):
             data = [data]
         if only_pwr:
-            fig = plt.figure(figsize=(width, height))
+            fig, ax = plt.subplots(1, 1, figsize=(width, height), layout="tight")
+            axs = [ax]
             fig.suptitle("Power-Trace")
-            plt.xlabel("time [s]")
-            plt.ylabel("power [mW]")
-            for date in data:
-                plt.plot(
-                    date["time"], date["voltage"] * date["current"] * 10**3, label=date["name"]
-                )
-            if len(data) > 1:
-                plt.legend(loc="lower center", ncol=len(data))
         else:
-            fig, axes = plt.subplots(3, 1, sharex="all")
+            fig, axs = plt.subplots(3, 1, sharex="all", figsize=(width, height), layout="tight")
             fig.suptitle("Voltage, current & power")
-            for date in data:
-                axes[0].plot(date["time"], date["voltage"], label=date["name"])
-                axes[1].plot(date["time"], date["current"] * 10**3, label=date["name"])
-                axes[2].plot(
-                    date["time"], date["voltage"] * date["current"] * 10**3, label=date["name"]
-                )
-            axes[0].set_ylabel("voltage [V]")
-            axes[1].set_ylabel("current [mA]")
-            axes[2].set_ylabel("power [mW]")
-            if len(data) > 1:
-                axes[0].legend(loc="lower center", ncol=len(data))
-            axes[2].set_xlabel("time [s]")
-        fig.set_figwidth(width)
-        fig.set_figheight(height)
-        fig.tight_layout()
+            axs[0].set_ylabel("voltage [V]")
+            axs[1].set_ylabel("current [mA]")
+            # last axis is set below
+
+        for date in data:
+            if not only_pwr:
+                axs[0].plot(date["time"], date["voltage"], label=date["name"])
+                axs[1].plot(date["time"], date["current"] * 10**3, label=date["name"])
+            axs[-1].plot(
+                date["time"], date["voltage"] * date["current"] * 10**3, label=date["name"]
+            )
+
+        if len(data) > 1:
+            axs[0].legend(loc="lower center", ncol=len(data))
+        axs[-1].set_xlabel("time [s]")
+        axs[-1].set_ylabel("power [mW]")
+        for ax in axs:
+            # deactivates offset-creation for ax-ticks
+            ax.get_yaxis().get_major_formatter().set_useOffset(False)
+            ax.get_xaxis().get_major_formatter().set_useOffset(False)
         return fig
 
     def plot_to_file(

{shepherd_data-2024.7.4 → shepherd_data-2024.8.2}/shepherd_data.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: shepherd_data
-Version: 2024.7.4
+Version: 2024.8.2
 Summary: Programming- and CLI-Interface for the h5-dataformat of the Shepherd-Testbed
 Author-email: Ingmar Splitt <ingmar.splitt@tu-dresden.de>
 Maintainer-email: Ingmar Splitt <ingmar.splitt@tu-dresden.de>
@@ -35,7 +35,7 @@ Requires-Dist: numpy
 Requires-Dist: pandas>=2.0.0
 Requires-Dist: pyYAML
 Requires-Dist: scipy
-Requires-Dist: shepherd-core[inventory]>=2024.7.4
+Requires-Dist: shepherd-core[inventory]>=2024.8.2
 Requires-Dist: tqdm
 Provides-Extra: elf
 Requires-Dist: shepherd-core[elf]; extra == "elf"

{shepherd_data-2024.7.4 → shepherd_data-2024.8.2}/shepherd_data.egg-info/requires.txt

@@ -5,7 +5,7 @@ numpy
 pandas>=2.0.0
 pyYAML
 scipy
-shepherd-core[inventory]>=2024.7.4
+shepherd-core[inventory]>=2024.8.2
 tqdm
 
 [dev]