majoplot 0.1.12__py3-none-any.whl → 0.1.13__py3-none-any.whl

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/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/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/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.dist-info → majoplot-0.1.13.dist-info}/METADATA

@@ -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.dist-info → majoplot-0.1.13.dist-info}/RECORD

@@ -4,15 +4,15 @@ majoplot/config.json,sha256=Fsh4B6pg6et-beyNUQ-pOu3CWd48FYIriqnOUgsaGig,183
 majoplot/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 majoplot/app/cli.py,sha256=L3ADrNasVBFZdmh5r6exuxJEcXJKx7_MROOM4DtjxxM,10033
 majoplot/app/gui.py,sha256=CpRg6LRI3dM2ALswnwz89KSKjONHRlfs69eO8P2VWYE,142
-majoplot/domain/base.py,sha256=JlkzZHSnXkh_C_l-ZxHrV7TbFcCEShD0mFnlu3lMUlc,14391
+majoplot/domain/base.py,sha256=ZfW_KTSoELKvK3GZPBmZKcyhogZRVwnJx1M-T0nIN4Q,14585
 majoplot/domain/muti_axes_spec.py,sha256=pF4Yy2x12QSFny5x18gave-f-ZYuJMW-czwwsJ-6Ths,6313
 majoplot/domain/utils.py,sha256=X4Wdab6kSBA3eBVuRzpz62Wj-1WTWZp4e9TcYMkGeb8,3332
 majoplot/domain/importers/PPMS_Resistivity.py,sha256=ME58Thg_N4tFQYPfnP1ZkiOP_vzYAevF-qSuxqWoAoc,7867
 majoplot/domain/importers/VSM.py,sha256=sEZsz_3n67jtPLy1-grP9A8K1RPVnwuQLMUSrLOtZUk,3576
 majoplot/domain/importers/XRD.py,sha256=_CN3jKLn4vZ3Oa2cm3IcH05R_mrao2so3VTVKVEND98,2840
-majoplot/domain/scenarios/PPMS_Resistivity/RT.py,sha256=DzIOqy8BlsHWKMLc6a-LF-4lwF3p51Vs3rZcTXRW2UA,4684
-majoplot/domain/scenarios/PPMS_Resistivity/RT_Resistivity.py,sha256=Pq5ANx0_lk6m5trJwxK8lywMzHubrfXEcLysMfhii6U,5462
-majoplot/domain/scenarios/PPMS_Resistivity/RT_normalized.py,sha256=UnJqY3KCPDl66rLWxQ914pmW4s4_Qmv82HQgupO8zxg,5458
+majoplot/domain/scenarios/PPMS_Resistivity/RT.py,sha256=GnktsRmNrshuVQoQD8CvVloStS1Ljjz3qazYL0N1WqE,4685
+majoplot/domain/scenarios/PPMS_Resistivity/RT_Resistivity.py,sha256=eTQrIocFh8H6i3HT66JutYRz3I7QlHosYekSeIN-J6k,5436
+majoplot/domain/scenarios/PPMS_Resistivity/RT_normalized.py,sha256=I4QjrZ4AaXikXI_lR_spmfBBaHKBpvNT_6lYI1goidY,6455
 majoplot/domain/scenarios/VSM/ChiT.py,sha256=NcPxf1-OIFrRNBo1uDaU0LzpaKXU_EUDDo9_78Pk2Vs,6643
 majoplot/domain/scenarios/VSM/ChiT_onlyZFC.py,sha256=IFhw6kCha0OxDZ5AgWeCb9UwSFJ1JOrjxQ3N2lH4Kis,6568
 majoplot/domain/scenarios/VSM/MT.py,sha256=lnqEi6sw6pzIOaGoqkC5OWJQzROWXL32-YvtOH__Rvg,4550
@@ -25,8 +25,8 @@ majoplot/gui/main.py,sha256=v5pyi-Gb26o_lmVM4GaM_Tt_-1rTTKVRekgOcBochA0,20291
 majoplot/infra/plotters/matplot.py,sha256=DE3nCfFjL9FxNbuEgggJyXlolkP1nWKmNwJElt1bgHw,12281
 majoplot/infra/plotters/origin.py,sha256=xB80d216pmo_mXo5Lx8sGQrjQC6N0NljzzoMNG37w1g,39034
 majoplot/infra/plotters/origin_utils/originlab_type_library.py,sha256=zxOxF7nB57zwnXSaFSoCUV64ZTHhDBDRv57exatiBoU,37398
-majoplot-0.1.12.dist-info/METADATA,sha256=YThy-qfUqKVRb5MyaVBgVNo-ySaCV4u1mkdkACo6Gmc,2878
-majoplot-0.1.12.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-majoplot-0.1.12.dist-info/entry_points.txt,sha256=zEiPXZtNyJQMvVS-Zl9psx8SpTafOcs8F9S8xGtOaBM,52
-majoplot-0.1.12.dist-info/licenses/LICENSE,sha256=fj2NqLupbHWfA5W-8tqCpT5yjO8A4F1HcKnt_maww20,1070
-majoplot-0.1.12.dist-info/RECORD,,
+majoplot-0.1.13.dist-info/METADATA,sha256=z6mKTNCFXhMsqJKYLdSE-_wUw6374459dfEfg-En0-w,2878
+majoplot-0.1.13.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+majoplot-0.1.13.dist-info/entry_points.txt,sha256=zEiPXZtNyJQMvVS-Zl9psx8SpTafOcs8F9S8xGtOaBM,52
+majoplot-0.1.13.dist-info/licenses/LICENSE,sha256=fj2NqLupbHWfA5W-8tqCpT5yjO8A4F1HcKnt_maww20,1070
+majoplot-0.1.13.dist-info/RECORD,,