shepherd-data 2024.7.4__py3-none-any.whl → 2024.8.2__py3-none-any.whl

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/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/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.dist-info → shepherd_data-2024.8.2.dist-info}/METADATA

@@ -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: dev
 Requires-Dist: shepherd-core[dev] ; extra == 'dev'

shepherd_data-2024.8.2.dist-info/RECORD

@@ -0,0 +1,11 @@
+shepherd_data/__init__.py,sha256=YlFGrGjvjhPTPIi9P-ldC64broXhqiH1jQ3bHrMV9BE,352
+shepherd_data/cli.py,sha256=pv17ILFQCdPSyWgmw0rQIhdsYucqeiWFwJn8hft4ga0,15760
+shepherd_data/ivonne.py,sha256=IaHy7RizdaaLAo-cQS-S5xQW_TzHW3dcJjb9hkTLjjY,11900
+shepherd_data/mppt.py,sha256=588KSrLuJfNRKKnnL6ewePLi3zrwaO_PAZypikACrks,3925
+shepherd_data/reader.py,sha256=eShdgACQLwoOtOYIyB3CjvUgJlUEbRDcUso_3m02C9U,20098
+shepherd_data-2024.8.2.dist-info/METADATA,sha256=oPkyNG7Hh8HEsDhMRRxXtIQ3SykoFYEYfMDKemqT0Ow,3387
+shepherd_data-2024.8.2.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+shepherd_data-2024.8.2.dist-info/entry_points.txt,sha256=6PBfY36A1xNOdzLiz-Qoukya_UzFZAwOapwmRNnPeZ8,56
+shepherd_data-2024.8.2.dist-info/top_level.txt,sha256=7-SCTY-TG1mLY72OVKCaqte1hy-X8woxknIUAD3OIxs,14
+shepherd_data-2024.8.2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+shepherd_data-2024.8.2.dist-info/RECORD,,

shepherd_data-2024.7.4.dist-info/RECORD

@@ -1,11 +0,0 @@
-shepherd_data/__init__.py,sha256=6-KKBydEEYJAB_sME8Lu0_GfyUchSr5W6p4TcLaM6so,352
-shepherd_data/cli.py,sha256=pv17ILFQCdPSyWgmw0rQIhdsYucqeiWFwJn8hft4ga0,15760
-shepherd_data/ivonne.py,sha256=5EryExMQ8E8PTgX5xkZUyLqhvhCcLT17rdC0POv4NLI,11831
-shepherd_data/mppt.py,sha256=588KSrLuJfNRKKnnL6ewePLi3zrwaO_PAZypikACrks,3925
-shepherd_data/reader.py,sha256=l9Kcx1YHqkd_ef_QRTNpWE5ZEmxPeiVkOPw680Klzkk,20186
-shepherd_data-2024.7.4.dist-info/METADATA,sha256=ZkPJrT_VxcNqVo7baBOx1cSlk9KzswnzSIFg-4tc4Rk,3387
-shepherd_data-2024.7.4.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-shepherd_data-2024.7.4.dist-info/entry_points.txt,sha256=6PBfY36A1xNOdzLiz-Qoukya_UzFZAwOapwmRNnPeZ8,56
-shepherd_data-2024.7.4.dist-info/top_level.txt,sha256=7-SCTY-TG1mLY72OVKCaqte1hy-X8woxknIUAD3OIxs,14
-shepherd_data-2024.7.4.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-shepherd_data-2024.7.4.dist-info/RECORD,,