majoplot 0.1.12__tar.gz → 0.1.13__tar.gz

{majoplot-0.1.12 → majoplot-0.1.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: majoplot
-Version: 0.1.12
+Version: 0.1.13
 Summary: Automates scenario-specific data preprocessing and plotting workflows for condensed-matter physics labs (OriginLab COM backend + Matplotlib for preview).
 Project-URL: Homepage, https://github.com/ponyofshadows/majoplot
 Project-URL: Source, https://github.com/ponyofshadows/majoplot

{majoplot-0.1.12 → majoplot-0.1.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "majoplot"
-version = "0.1.12"
+version = "0.1.13"
 description = "Automates scenario-specific data preprocessing and plotting workflows for condensed-matter physics labs (OriginLab COM backend + Matplotlib for preview)."
 readme = "README.md"
 requires-python = ">=3.11"

{majoplot-0.1.12 → majoplot-0.1.13}/src/majoplot/domain/base.py

@@ -205,7 +205,10 @@ class Data:
     @property
     def x_for_plot(self)->NDArray[np.floating]:
         if self._x_for_plot is None:
-            self._x_for_plot = self.points_for_plot[:,0]
+            try:
+                self._x_for_plot = self.points_for_plot[:,0]
+            except IndexError:
+                return np.asarray(np.nan)
         return self._x_for_plot
 
     @property
@@ -217,13 +220,16 @@ class Data:
     @property
     def y_for_plot(self)->NDArray[np.floating]:
         if self._y_for_plot is None:
-            self._y_for_plot = self.points_for_plot[:,1]
+            try:
+                self._y_for_plot = self.points_for_plot[:,1]
+            except IndexError:
+                return np.asarray(np.nan)
         return self._y_for_plot
 
     @property
     def ylim(self)->tuple[np.float64,np.float64]:
         if self._ylim is None:
-            self._ylim = (min(self.y_for_plot), max(self.y_for_plot))
+            self._ylim = (np.min(self.y_for_plot), np.max(self.y_for_plot))
         return self._ylim
     
     @property

{majoplot-0.1.12 → majoplot-0.1.13}/src/majoplot/domain/scenarios/PPMS_Resistivity/RT.py

@@ -106,15 +106,14 @@ class RT:
             title=None,
             figsize=FIGSIZE,
             linestyle_cycle= ("-",),
-
+            linemarker_cycle = ("o",),
             linecolor_cycle = (
                 "#515151", "#F14040", "#1A6FDF", "#37AD6B", "#B177DE",
                 "#CC9900", "#00CBCC", "#7D4E4E", "#8E8E00", "#FB6501",
-                "#6699CC", "#6FB802", "#f04f76", "#f86a5a", "#fb8c3c",
-                "#fdbb2d", "#fcfdbf","#2B2E83", "#E6007A", "#005F5F", 
-                "#1F3D2B",  "#E8C6E8","#FAB3d1",
+                "#6699CC", "#6FB802", "#FD0000FF", "#15ff00", "#FF9447",
+                "#fdbb2d", "#fcfdbf","#2B2E83", "#E6007A", "#00FFFF", 
+                "#6DFFA7",  "#FDBAFD","#FAB3d1",
                 ),
-            linemarker_cycle = ("o",),
             alpa_cycle = (1.0,),
         )
     

{majoplot-0.1.12 → majoplot-0.1.13}/src/majoplot/domain/scenarios/PPMS_Resistivity/RT_Resistivity.py

@@ -123,11 +123,11 @@ class RT_Resistivity:
             linecolor_cycle = (
                 "#515151", "#F14040", "#1A6FDF", "#37AD6B", "#B177DE",
                 "#CC9900", "#00CBCC", "#7D4E4E", "#8E8E00", "#FB6501",
-                "#6699CC", "#6FB802", "#f04f76", "#f86a5a", "#fb8c3c",
-                "#fdbb2d", "#fcfdbf","#2B2E83", "#E6007A", "#005F5F", 
-                "#1F3D2B",  "#E8C6E8","#FAB3d1",
+                "#6699CC", "#6FB802", "#FD0000FF", "#15ff00", "#FF9447",
+                "#fdbb2d", "#fcfdbf","#2B2E83", "#E6007A", "#00FFFF", 
+                "#6DFFA7",  "#FDBAFD","#FAB3d1",
                 ),
-            linemarker_cycle = ("o","s","^","v","d","*","x","+"),
+            linemarker_cycle = ("o"),
             alpa_cycle = (1.0,),
         )
     

{majoplot-0.1.12 → majoplot-0.1.13}/src/majoplot/domain/scenarios/PPMS_Resistivity/RT_normalized.py

@@ -85,7 +85,32 @@ class RT_normalized:
                         points=s_points[:,0:2],
                         ignore_outliers=IgnoreOutlierSpec(min_gap_base=1e-4,min_gap_multiple=5),
                     ))
-        
+        # find common range
+        comm_left_margin = -273.15
+        comm_right_margin = 3890
+        for data in datas:
+            if data.points.size < 20:
+                break
+            data_left_margin, data_right_margin = data.xlim
+            if data_left_margin > comm_left_margin:
+                comm_left_margin = data_left_margin
+            if data_right_margin < comm_right_margin:
+                comm_right_margin = data_right_margin
+        comm_right_margin = round(comm_right_margin)
+        comm_left_margin = round(comm_left_margin)
+
+        for data in datas:
+            points = data.points
+            mask = (points[:,0] > comm_left_margin) & (points[:, 0] < comm_right_margin)
+            points = points[mask,:]
+            data.points = points
+            data._ignore_outliers_spec_cache = None
+            data._points_for_plot = None
+            data._x_for_plot = None
+            data._y_for_plot = None
+            data._xlim = None
+            data._ylim = None
+
         # normalize
         for data in datas:
             data: Data
@@ -129,9 +154,9 @@ class RT_normalized:
             linecolor_cycle = (
                 "#515151", "#F14040", "#1A6FDF", "#37AD6B", "#B177DE",
                 "#CC9900", "#00CBCC", "#7D4E4E", "#8E8E00", "#FB6501",
-                "#6699CC", "#6FB802", "#f04f76", "#f86a5a", "#fb8c3c",
-                "#fdbb2d", "#fcfdbf","#2B2E83", "#E6007A", "#005F5F", 
-                "#1F3D2B",  "#E8C6E8","#FAB3d1",
+                "#6699CC", "#6FB802", "#FD0000FF", "#15ff00", "#FF9447",
+                "#fdbb2d", "#fcfdbf","#2B2E83", "#E6007A", "#00FFFF", 
+                "#6DFFA7",  "#FDBAFD","#FAB3d1",
                 ),
             linemarker_cycle = ("o",),
             alpa_cycle = (1.0,),

{majoplot-0.1.12 → majoplot-0.1.13}/uv.lock

@@ -252,7 +252,7 @@ wheels = [
 
 [[package]]
 name = "majoplot"
-version = "0.1.11"
+version = "0.1.12"
 source = { editable = "." }
 dependencies = [
     { name = "matplotlib" },