majoplot 0.1.11__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

@@ -7,8 +7,7 @@ FIGSIZE = (8, 6)
 
 T = "Temperature (K)"
 H = "Magnetic Field (Oe)"
-R = "Resistivity (Ω·m)"
-_headers = (T,R)
+R = "Resistance (Ohms)"
 RI ={
     1: {"R":"Bridge 1 Resistance (Ohms)", "I":"Bridge 1 Excitation (uA)"},
     2: {"R":"Bridge 2 Resistance (Ohms)", "I":"Bridge 2 Excitation (uA)"},
@@ -53,17 +52,10 @@ class RT:
             for H_stage, points in split_datas:
                 for i in range(1,4):
                     _headerTRI = (T,RI[i]["R"],RI[i]["I"])
+                    _headers = (T,RI[i]["R"])
                     s_points = [ [point[headers[x]] for x in _headerTRI] for point in points]
-                    # clear null Resistance points
+                    # clear null R points
                     s_points = np.array([point for point in s_points if point[1]])
-                    # calculate resistivity
-                    cross_section = raw_labels[f"sample{i}_cross_section"].value * 1e-6
-                    if cross_section <= 0:
-                        cross_section = np.nan
-                    length = raw_labels[f"sample{i}_length"].value * 1e-3
-                    if length <= 0:
-                        length = np.nan
-                    r_points = np.column_stack([s_points[:,0], s_points[:,1] * cross_section / length])
                     # record
                     Imin = np.min(s_points[:,2])
                     Imax = np.max(s_points[:,2])
@@ -84,8 +76,8 @@ class RT:
                     datas.append(Data(
                         labels=labels,
                         _headers=_headers,
-                        points=r_points,
-                        ignore_outliers=IgnoreOutlierSpec(min_gap_base=1e-8,min_gap_multiple=10),
+                        points=s_points[:,0:2],
+                        ignore_outliers=IgnoreOutlierSpec(min_gap_base=1e-4,min_gap_multiple=10),
                     ))
             
         return datas
@@ -100,6 +92,8 @@ class RT:
             major_grid=None,
             major_tick=TickSpec(),
             legend=LegendSpec(fontsize=5),
+            linewidth=1,
+            marker_size=2,
         )
             
 
@@ -112,13 +106,14 @@ class RT:
             title=None,
             figsize=FIGSIZE,
             linestyle_cycle= ("-",),
+            linemarker_cycle = ("o",),
             linecolor_cycle = (
-                "#2d0b59", "#3b0f6f", "#4a136e", "#5a176e", "#6a1c6e",
-                "#7a216f", "#8b2770", "#9b2d71", "#ac3372", "#bd3973",
-                "#ce4074", "#df4775", "#f04f76", "#f86a5a", "#fb8c3c",
-                "#fdbb2d", "#fcfdbf",
+                "#515151", "#F14040", "#1A6FDF", "#37AD6B", "#B177DE",
+                "#CC9900", "#00CBCC", "#7D4E4E", "#8E8E00", "#FB6501",
+                "#6699CC", "#6FB802", "#FD0000FF", "#15ff00", "#FF9447",
+                "#fdbb2d", "#fcfdbf","#2B2E83", "#E6007A", "#00FFFF", 
+                "#6DFFA7",  "#FDBAFD","#FAB3d1",
                 ),
-            linemarker_cycle = ("o","s","^","v","d","*","x","+"),
             alpa_cycle = (1.0,),
         )
     

majoplot/domain/scenarios/PPMS_Resistivity/{RT_Resistance.py → RT_Resistivity.py}

@@ -7,14 +7,20 @@ FIGSIZE = (8, 6)
 
 T = "Temperature (K)"
 H = "Magnetic Field (Oe)"
-R = "Resistance (Ohms)"
+R = "Resistivity (Ω·m)"
 RI ={
     1: {"R":"Bridge 1 Resistance (Ohms)", "I":"Bridge 1 Excitation (uA)"},
     2: {"R":"Bridge 2 Resistance (Ohms)", "I":"Bridge 2 Excitation (uA)"},
     3: {"R":"Bridge 3 Resistance (Ohms)", "I":"Bridge 3 Excitation (uA)"},
 }
 
-class RT_Resistance:
+ResistivityI ={
+    1: {"R":"Bridge 1 Resistivity (Ω·m)", "I":"Bridge 1 Excitation (uA)"},
+    2: {"R":"Bridge 2 Resistivity (Ω·m)", "I":"Bridge 2 Excitation (uA)"},
+    3: {"R":"Bridge 3 Resistivity (Ω·m)", "I":"Bridge 3 Excitation (uA)"},
+}
+
+class RT_Resistivity:
     data_summary_label_names = ["H"]
     axes_label_names = ("date", "raw_data", "bridge", "sample_name")
     figure_label_names = ("date", "raw_data", "bridge", "sample_name")
@@ -52,10 +58,18 @@ class RT_Resistance:
             for H_stage, points in split_datas:
                 for i in range(1,4):
                     _headerTRI = (T,RI[i]["R"],RI[i]["I"])
-                    _headers = (T,RI[i]["R"])
+                    _headers = (T,ResistivityI[i]["R"])
                     s_points = [ [point[headers[x]] for x in _headerTRI] for point in points]
-                    # clear null R points
+                    # clear null Resistance points
                     s_points = np.array([point for point in s_points if point[1]])
+                    # calculate resistivity
+                    cross_section = raw_labels[f"sample{i}_cross_section"].value * 1e-6
+                    if cross_section <= 0:
+                        cross_section = np.nan
+                    length = raw_labels[f"sample{i}_length"].value * 1e-3
+                    if length <= 0:
+                        length = np.nan
+                    r_points = np.column_stack([s_points[:,0], s_points[:,1] * cross_section / length])
                     # record
                     Imin = np.min(s_points[:,2])
                     Imax = np.max(s_points[:,2])
@@ -76,8 +90,8 @@ class RT_Resistance:
                     datas.append(Data(
                         labels=labels,
                         _headers=_headers,
-                        points=s_points[:,0:2],
-                        ignore_outliers=IgnoreOutlierSpec(min_gap_base=1e-4,min_gap_multiple=10),
+                        points=r_points,
+                        ignore_outliers=IgnoreOutlierSpec(min_gap_base=1e-8,min_gap_multiple=10),
                     ))
             
         return datas
@@ -92,6 +106,8 @@ class RT_Resistance:
             major_grid=None,
             major_tick=TickSpec(),
             legend=LegendSpec(fontsize=5),
+            linewidth=1,
+            marker_size=2,
         )
             
 
@@ -105,12 +121,13 @@ class RT_Resistance:
             figsize=FIGSIZE,
             linestyle_cycle= ("-",),
             linecolor_cycle = (
-                "#2d0b59", "#3b0f6f", "#4a136e", "#5a176e", "#6a1c6e",
-                "#7a216f", "#8b2770", "#9b2d71", "#ac3372", "#bd3973",
-                "#ce4074", "#df4775", "#f04f76", "#f86a5a", "#fb8c3c",
-                "#fdbb2d", "#fcfdbf",
+                "#515151", "#F14040", "#1A6FDF", "#37AD6B", "#B177DE",
+                "#CC9900", "#00CBCC", "#7D4E4E", "#8E8E00", "#FB6501",
+                "#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

@@ -0,0 +1,167 @@
+from __future__ import annotations
+
+from ...base import *
+
+
+FIGSIZE = (8, 6)
+
+T = "Temperature (K)"
+H = "Magnetic Field (Oe)"
+R = "Resistance (Ohms)"
+RI ={
+    1: {"R":"Bridge 1 Resistance (Ohms)", "I":"Bridge 1 Excitation (uA)"},
+    2: {"R":"Bridge 2 Resistance (Ohms)", "I":"Bridge 2 Excitation (uA)"},
+    3: {"R":"Bridge 3 Resistance (Ohms)", "I":"Bridge 3 Excitation (uA)"},
+}
+RI_normalized ={
+    1: {"R":"Bridge 1 Normalized Resistance", "I":"Bridge 1 Excitation (uA)"},
+    2: {"R":"Bridge 2 Normalied Resistance", "I":"Bridge 2 Excitation (uA)"},
+    3: {"R":"Bridge 3 Normalized Resistance", "I":"Bridge 3 Excitation (uA)"},
+}
+
+class RT_normalized:
+    data_summary_label_names = ["H"]
+    axes_label_names = ("date", "raw_data", "bridge", "sample_name")
+    figure_label_names = ("date", "raw_data", "bridge", "sample_name")
+    figure_summary_label_names = ("raw_data","bridge","sample_name")
+    max_axes_in_one_figure = 1
+    project_to_child_folder_label_names = {"date":"sample_name"}
+    parent_folder_name = "RT"
+
+    @classmethod
+    def preprocess(cls, raw_datas:list[Data])->list[Data]:
+        datas = []
+        for raw_data in raw_datas:
+            raw_labels = raw_data.labels
+            headers = raw_data.headers
+            raw_points = raw_data.points
+            
+            # Split by H
+            split_datas = []
+
+            last_H_stage = round(raw_points[0][headers[H]])
+            current_points = [ last_H_stage, [ raw_points[0] ] ]
+
+            for point in raw_points[1:]:
+                cur_H_stage = round(point[headers[H]])
+                if cur_H_stage != last_H_stage:
+                    split_datas.append(current_points)
+                    last_H_stage = cur_H_stage
+                    current_points = [ last_H_stage, [ point ] ]
+                else:
+                    current_points[1].append(point)
+            else:
+                split_datas.append(current_points)
+
+            # 3 bridges
+            for H_stage, points in split_datas:
+                for i in range(1,4):
+                    _headerTRI = (T,RI[i]["R"],RI[i]["I"])
+                    _headers = (T,RI_normalized[i]["R"])
+                    s_points = [ [point[headers[x]] for x in _headerTRI] for point in points]
+                    # clear null R points
+                    s_points = np.array([point for point in s_points if point[1]])
+                    # record
+                    Imin = np.min(s_points[:,2])
+                    Imax = np.max(s_points[:,2])
+                    if (Imax - Imin) / Imax < 0.03:
+                        Irange = f"{np.mean(s_points[:,1]):.1e}"
+                    else:
+                        Irange = f"{Imin:.1e}~{Imax:.1e}"
+                    
+                    labels = LabelDict()
+                    labels["instrument"] = raw_labels["instrument"]
+                    labels["raw_data"] = raw_labels["raw_data"]
+                    labels["date"] = raw_labels["date"]
+                    labels["bridge"] = LabelValue(i,unit="Bridge",unit_as_postfix=False)
+                    labels["sample_name"] = raw_labels[f"sample{i}_name"]
+                    labels["sample_units"] = raw_labels[f"sample{i}_units"]
+                    labels["H"] = LabelValue(H_stage, unit="Oe")
+                    labels["I_range"] = LabelValue(Irange,unit="μA")
+                    labels.summary_names = cls.data_summary_label_names
+                    datas.append(Data(
+                        labels=labels,
+                        _headers=_headers,
+                        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
+            ymax = np.max(np.abs(data.ylim))
+            data.points = np.column_stack( [data.points[:,0], np.asarray(data.points[:,1] / ymax)])
+            data.ignore_outliers = None
+            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
+
+        return datas
+            
+            
+
+    @classmethod
+    def make_axes_spec(cls, axes_labels, data_pool)->AxesSpec:
+        return AxesSpec(
+            x_axis_title=T,
+            y_axis_title=R,
+            major_grid=None,
+            major_tick=TickSpec(),
+            legend=LegendSpec(fontsize=5),
+            linewidth=1,
+            marker_size=2,
+        )
+            
+
+    @classmethod
+    def make_figure_spec(cls,figure_labels, axes_pool:Iterable[Axes])->FigureSpec:
+        figure_name = figure_labels.brief_summary
+
+        return FigureSpec(
+            name=figure_name,
+            title=None,
+            figsize=FIGSIZE,
+            linestyle_cycle= ("-",),
+
+            linecolor_cycle = (
+                "#515151", "#F14040", "#1A6FDF", "#37AD6B", "#B177DE",
+                "#CC9900", "#00CBCC", "#7D4E4E", "#8E8E00", "#FB6501",
+                "#6699CC", "#6FB802", "#FD0000FF", "#15ff00", "#FF9447",
+                "#fdbb2d", "#fcfdbf","#2B2E83", "#E6007A", "#00FFFF", 
+                "#6DFFA7",  "#FDBAFD","#FAB3d1",
+                ),
+            linemarker_cycle = ("o",),
+            alpa_cycle = (1.0,),
+        )
+    
+    @classmethod
+    def make_muti_axes_spec(cls, axes_pool:list[Axes])->MutiAxesSpec|FAIL|None:
+        return None

{majoplot-0.1.11.dist-info → majoplot-0.1.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: majoplot
-Version: 0.1.11
+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.11.dist-info → majoplot-0.1.13.dist-info}/RECORD

@@ -4,14 +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=7bu2nVYbIGLSmhFkL85vdOzkHixiFlp_C-IpfC35CFo,5027
-majoplot/domain/scenarios/PPMS_Resistivity/RT_Resistance.py,sha256=04u09JUWxczWyapaElQ42cEdyLMGSb2HJ4NJ7Tww4T0,4587
+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
@@ -24,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.11.dist-info/METADATA,sha256=t37ChgeAnwgtB4EIiSIGchpk5ZFivgwoiZfJJ-vbL_8,2878
-majoplot-0.1.11.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-majoplot-0.1.11.dist-info/entry_points.txt,sha256=zEiPXZtNyJQMvVS-Zl9psx8SpTafOcs8F9S8xGtOaBM,52
-majoplot-0.1.11.dist-info/licenses/LICENSE,sha256=fj2NqLupbHWfA5W-8tqCpT5yjO8A4F1HcKnt_maww20,1070
-majoplot-0.1.11.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,,