majoplot 0.1.10__py3-none-any.whl → 0.1.11__py3-none-any.whl

majoplot/domain/importers/PPMS_Resistivity.py

@@ -6,10 +6,16 @@ from ..utils import skip_lines_then_readline
 
 ROW_FILEOPENTIME  = 3
 ROW_SAMPLE1_NAME  = 6
+ROW_SAMPLE1_CROSS_SECTION = 7
+ROW_SAMPLE1_LENGTH = 8
 ROW_SAMPLE1_UNITS = 9
 ROW_SAMPLE2_NAME  = 10
+ROW_SAMPLE2_CROSS_SECTION = 11
+ROW_SAMPLE2_LENGTH = 12
 ROW_SAMPLE2_UNITS = 13
 ROW_SAMPLE3_NAME  = 14
+ROW_SAMPLE3_CROSS_SECTION = 15
+ROW_SAMPLE3_LENGTH = 16
 ROW_SAMPLE3_UNITS = 17
 ROW_HEADERS       = 32
 
@@ -52,8 +58,36 @@ class PPMS_Resistivity:
             return fail_signal
         labels["sample1_name"] = LabelValue(s1_name)
 
+        # S1 Cross Section
+        line = skip_lines_then_readline(raw_data_file, ROW_SAMPLE1_CROSS_SECTION - ROW_SAMPLE1_NAME -1)
+        info = line.split(",")
+        try:
+            if info[-1].strip() != "Sample1 Cross Section":
+                return fail_signal
+            s1_cross_section = info[1]
+        except IndexError:
+            return fail_signal
+        try:
+            labels["sample1_cross_section"] = LabelValue(float(s1_cross_section),unit="mm²")
+        except ValueError:
+            return fail_signal
+
+        # S1 Length
+        line = skip_lines_then_readline(raw_data_file, ROW_SAMPLE1_LENGTH - ROW_SAMPLE1_CROSS_SECTION -1)
+        info = line.split(",")
+        try:
+            if info[-1].strip() != "Sample1 Length":
+                return fail_signal
+            s1_length = info[1]
+        except IndexError:
+            return fail_signal
+        try:
+            labels["sample1_length"] = LabelValue(float(s1_length),unit="mm")
+        except ValueError:
+            return fail_signal
+
         # S1 Units
-        line = skip_lines_then_readline(raw_data_file, ROW_SAMPLE1_UNITS - ROW_SAMPLE1_NAME -1)
+        line = skip_lines_then_readline(raw_data_file, ROW_SAMPLE1_UNITS - ROW_SAMPLE1_LENGTH -1)
         info = line.split(",")
         try:
             if info[-1].strip() != "Sample1 Units":
@@ -74,8 +108,37 @@ class PPMS_Resistivity:
             return fail_signal
         labels["sample2_name"] = LabelValue(s2_name)
 
+        # S2 Cross Section
+        line = skip_lines_then_readline(raw_data_file, ROW_SAMPLE2_CROSS_SECTION - ROW_SAMPLE2_NAME -1)
+        info = line.split(",")
+        try:
+            if info[-1].strip() != "Sample2 Cross Section":
+                return fail_signal
+            s2_cross_section = info[1]
+        except IndexError:
+            return fail_signal
+        try:
+            labels["sample2_cross_section"] = LabelValue(float(s2_cross_section),unit="mm²")
+        except ValueError:
+            return fail_signal
+
+        # S1 Length
+        line = skip_lines_then_readline(raw_data_file, ROW_SAMPLE2_LENGTH - ROW_SAMPLE2_CROSS_SECTION -1)
+        info = line.split(",")
+        try:
+            if info[-1].strip() != "Sample2 Length":
+                return fail_signal
+            s2_length = info[1]
+        except IndexError:
+            return fail_signal
+        try:
+            labels["sample2_length"] = LabelValue(float(s2_length),unit="mm")
+        except ValueError:
+            return fail_signal
+
+
         # S2 Units
-        line = skip_lines_then_readline(raw_data_file, ROW_SAMPLE2_UNITS - ROW_SAMPLE2_NAME -1)
+        line = skip_lines_then_readline(raw_data_file, ROW_SAMPLE2_UNITS - ROW_SAMPLE2_LENGTH -1)
         info = line.split(",")
         try:
             if info[-1].strip() != "Sample2 Units":
@@ -96,8 +159,36 @@ class PPMS_Resistivity:
             return fail_signal
         labels["sample3_name"] = LabelValue(s3_name)
 
+        # S3 Cross Section
+        line = skip_lines_then_readline(raw_data_file, ROW_SAMPLE3_CROSS_SECTION - ROW_SAMPLE3_NAME -1)
+        info = line.split(",")
+        try:
+            if info[-1].strip() != "Sample3 Cross Section":
+                return fail_signal
+            s3_cross_section = info[1]
+        except IndexError:
+            return fail_signal
+        try:
+            labels["sample3_cross_section"] = LabelValue(float(s3_cross_section),unit="mm²")
+        except ValueError:
+            return fail_signal
+
+        # S1 Length
+        line = skip_lines_then_readline(raw_data_file, ROW_SAMPLE3_LENGTH - ROW_SAMPLE3_CROSS_SECTION -1)
+        info = line.split(",")
+        try:
+            if info[-1].strip() != "Sample3 Length":
+                return fail_signal
+            s3_length = info[1]
+        except IndexError:
+            return fail_signal
+        try:
+            labels["sample3_length"] = LabelValue(float(s3_length),unit="mm")
+        except ValueError:
+            return fail_signal
+
         # S3 Units
-        line = skip_lines_then_readline(raw_data_file, ROW_SAMPLE3_UNITS - ROW_SAMPLE3_NAME -1)
+        line = skip_lines_then_readline(raw_data_file, ROW_SAMPLE3_UNITS - ROW_SAMPLE3_LENGTH -1)
         info = line.split(",")
         try:
             if info[-1].strip() != "Sample3 Units":

majoplot/domain/scenarios/PPMS_Resistivity/RT.py

@@ -7,7 +7,8 @@ FIGSIZE = (8, 6)
 
 T = "Temperature (K)"
 H = "Magnetic Field (Oe)"
-R = "Resistance (Ohms)"
+R = "Resistivity (Ω·m)"
+_headers = (T,R)
 RI ={
     1: {"R":"Bridge 1 Resistance (Ohms)", "I":"Bridge 1 Excitation (uA)"},
     2: {"R":"Bridge 2 Resistance (Ohms)", "I":"Bridge 2 Excitation (uA)"},
@@ -52,13 +53,20 @@ 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 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[:,1])
-                    Imax = np.max(s_points[:,1])
+                    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:
@@ -76,8 +84,8 @@ class RT:
                     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

majoplot/domain/scenarios/PPMS_Resistivity/RT_Resistance.py

@@ -0,0 +1,119 @@
+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)"},
+}
+
+class RT_Resistance:
+    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[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=10),
+                    ))
+            
+        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),
+        )
+            
+
+    @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 = (
+                "#2d0b59", "#3b0f6f", "#4a136e", "#5a176e", "#6a1c6e",
+                "#7a216f", "#8b2770", "#9b2d71", "#ac3372", "#bd3973",
+                "#ce4074", "#df4775", "#f04f76", "#f86a5a", "#fb8c3c",
+                "#fdbb2d", "#fcfdbf",
+                ),
+            linemarker_cycle = ("o","s","^","v","d","*","x","+"),
+            alpa_cycle = (1.0,),
+        )
+    
+    @classmethod
+    def make_muti_axes_spec(cls, axes_pool:list[Axes])->MutiAxesSpec|FAIL|None:
+        return None

majoplot/domain/scenarios/VSM/{MT_origin.py → MT_original.py}

@@ -11,7 +11,7 @@ M = "DC Moment Free Ctr (emu)"
 H = "Magnetic Field (Oe)"
 
 
-class MT_origin:
+class MT_original:
     data_summary_label_names = ["mass","H","cooling_type"]
     axes_label_names = ("material","date","raw_data", "H")
     figure_label_names = ("material","date", "raw_data","H")

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

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

@@ -7,15 +7,16 @@ majoplot/app/gui.py,sha256=CpRg6LRI3dM2ALswnwz89KSKjONHRlfs69eO8P2VWYE,142
 majoplot/domain/base.py,sha256=JlkzZHSnXkh_C_l-ZxHrV7TbFcCEShD0mFnlu3lMUlc,14391
 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=-1JbI93VQXK3vab89dmMX8NACtidjIUd9a2aNQH3G4M,4513
+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=ezP1savHiwKBSOTPq2rJrcxu5IwINvZnEgIVva5gkEE,4576
+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/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
 majoplot/domain/scenarios/VSM/MT_insert.py,sha256=goaB0Y3dUaerBv3Z4DX8S2ixerGBIz4D1e5k6jpAnJc,4711
-majoplot/domain/scenarios/VSM/MT_origin.py,sha256=6uxvv1YWurHMI8nVspwqqasXd_4pyOxwTLpqOzCwe3Q,4313
+majoplot/domain/scenarios/VSM/MT_original.py,sha256=JiGXVyfM7plmp5TSRm7gyTnXJxeO33o0zYsbwID3A8A,4315
 majoplot/domain/scenarios/VSM/MT_reliability_analysis.py,sha256=eACa4Z5Q5Uew_m_kGSmsQ4jLy5CIpTrASx7VV-a7nBY,5109
 majoplot/domain/scenarios/XRD/Compare.py,sha256=YvyrnYyFzzlp5DK6Unv75AFuf5fbRgbCumy3_zy6XNQ,3870
 majoplot/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -23,8 +24,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.10.dist-info/METADATA,sha256=5bDu2ghh2gIkXhtsoDemITjqNzXS45ClbeaFO9rNs0Y,2878
-majoplot-0.1.10.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-majoplot-0.1.10.dist-info/entry_points.txt,sha256=zEiPXZtNyJQMvVS-Zl9psx8SpTafOcs8F9S8xGtOaBM,52
-majoplot-0.1.10.dist-info/licenses/LICENSE,sha256=fj2NqLupbHWfA5W-8tqCpT5yjO8A4F1HcKnt_maww20,1070
-majoplot-0.1.10.dist-info/RECORD,,
+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,,