majoplot 0.1.7__py3-none-any.whl → 0.1.9__py3-none-any.whl

majoplot/domain/importers/PPMS_Resistivity.py

@@ -15,9 +15,9 @@ ROW_HEADERS       = 32
 
 T = "Temperature (K)"
 H = "Magnetic Field (Oe)"
-R1, I1 = "Bridge 1 Resistivity (Ohm-m)", "Bridge 1 Excitation (uA)"
-R2, I2 = "Bridge 2 Resistivity (Ohm-m)", "Bridge 2 Excitation (uA)"
-R3, I3 = "Bridge 3 Resistivity (Ohm-m)", "Bridge 3 Excitation (uA)"
+R1, I1 = "Bridge 1 Resistance (Ohms)", "Bridge 1 Excitation (uA)"
+R2, I2 = "Bridge 2 Resistance (Ohms)", "Bridge 2 Excitation (uA)"
+R3, I3 = "Bridge 3 Resistance (Ohms)", "Bridge 3 Excitation (uA)"
 
 class PPMS_Resistivity:
     instrument = "PPMS"

majoplot/domain/scenarios/PPMS_Resistivity/RT.py

@@ -7,11 +7,11 @@ FIGSIZE = (8, 6)
 
 T = "Temperature (K)"
 H = "Magnetic Field (Oe)"
-R = "Resistivity (Ohm-m)"
+R = "Resistance (Ohms)"
 RI ={
-    1: {"R":"Bridge 1 Resistivity (Ohm-m)", "I":"Bridge 1 Excitation (uA)"},
-    2: {"R":"Bridge 2 Resistivity (Ohm-m)", "I":"Bridge 2 Excitation (uA)"},
-    3: {"R":"Bridge 3 Resistivity (Ohm-m)", "I":"Bridge 3 Excitation (uA)"},
+    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:
@@ -77,7 +77,7 @@ class RT:
                         labels=labels,
                         _headers=_headers,
                         points=s_points[:,0:2],
-                        ignore_outliers=IgnoreOutlierSpec(min_gap_base=1e-6,min_gap_multiple=10),
+                        ignore_outliers=IgnoreOutlierSpec(min_gap_base=1e-4,min_gap_multiple=10),
                     ))
             
         return datas

majoplot/domain/scenarios/VSM/{ChiT_ZFC.py → ChiT_onlyZFC.py}

@@ -12,7 +12,7 @@ H = "Magnetic Field (Oe)"
 chi = "χ ( m³ / kg )"
 
 
-class ChiT_ZFC:
+class ChiT_onlyZFC:
     data_summary_label_names = ["H","cooling_type"]
     axes_label_names = ("material","date","raw_data")
     figure_label_names = ("material","date", "raw_data")

majoplot/domain/scenarios/VSM/MT_origin.py

@@ -0,0 +1,125 @@
+from __future__ import annotations
+from copy import copy
+
+from ...base import *
+
+
+FIGSIZE = (8, 6)
+
+T = "Temperature (K)"
+M = "DC Moment Free Ctr (emu)"
+H = "Magnetic Field (Oe)"
+
+
+class MT_origin:
+    data_summary_label_names = ["mass","H","cooling_type"]
+    axes_label_names = ("material","date","raw_data", "H")
+    figure_label_names = ("material","date", "raw_data","H")
+    figure_summary_label_names = ("raw_data","date")
+    max_axes_in_one_figure = 1
+    project_to_child_folder_label_names = {"material":"date","date":"material"}
+    parent_folder_name = "MT"
+
+    @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
+            iT = headers[T]
+            iH = headers[H]
+            iM = headers[M]
+            
+            check_deque = []
+
+            current_points = []
+            current_cool_type = "ZFC"
+            try:
+                current_points.append(raw_points[0])
+                H_stage = round(raw_points[0, iH])
+            except KeyError:
+                return []
+
+            def append_data():
+                nonlocal current_points, check_deque, datas
+                nonlocal current_cool_type
+                current_points.append(check_deque.pop(0))
+                labels = copy(raw_labels)
+                labels["H"] = LabelValue(H_stage, "Oe")
+                if current_points[-1][iT] < current_points[0][iT]:
+                    labels["cooling_type"] = "cooling"
+                else:
+                    if current_cool_type == "ZFC":
+                        labels["cooling_type"] = "ZFC"
+                        current_cool_type = "FC"
+                    else:
+                        labels["cooling_type"] = "FC"
+                        current_cool_type = "ZFC"
+                labels["scenario"] = "MT"
+                labels.summary_names = cls.data_summary_label_names
+                datas.append(
+                    Data(
+                        labels=labels,
+                        _headers=(T,M),
+                        points=np.array(current_points)[:,[iT,iM]],
+                        ignore_outliers=None
+                ))
+
+            for point in raw_points[1:]:
+                check_deque.append(point)
+                if len(check_deque) == 2:
+                    # not the same H?
+                    if abs(check_deque[1][iH] - H_stage) > 1.5:
+                        append_data()
+                        current_points = [check_deque.pop()]
+                        H_stage = round(current_points[0][iH])
+                        current_cool_type = "ZFC"
+                    # not the same heating curve?
+                    elif (check_deque[0][iT] - current_points[0][iT])>2 and (check_deque[0][iT] - check_deque[1][iT])>2:
+                        append_data()
+                        current_points = [check_deque.pop()]
+                    else:
+                        # the same curve
+                        current_points.append(check_deque.pop(0))
+
+
+            else:
+                while check_deque:
+                    append_data()
+        
+        return datas
+
+
+    @classmethod
+    def make_axes_spec(cls,axes_labels, data_pool)->AxesSpec:
+        return AxesSpec(
+            x_axis_title=T,
+            y_axis_title=M,
+            major_grid=None,
+            major_tick=TickSpec(),
+            legend=LegendSpec(),
+        )
+            
+
+    @classmethod
+    def make_figure_spec(cls,figure_labels, axes_pool:Iterable[Axes])->FigureSpec:
+        H_stages = {}
+        for axes in axes_pool:
+            H_stages[axes.labels["H"]] = None
+        
+        figure_name = f"{figure_labels.brief_summary}-{",".join(str(H_stage) for H_stage in H_stages)}"
+
+        return FigureSpec(
+            name=figure_name,
+            title=None,
+            figsize=FIGSIZE,
+            linestyle_cycle= ("-", "--"),
+            linecolor_cycle = ("black", "red"),
+            linemarker_cycle = ("o","o","s","s","^","^","v","v","d","d","*","*","x","x","+","+"),
+            alpa_cycle = (1.0,),
+        )
+    
+    @classmethod
+    def make_muti_axes_spec(cls, axes_pool:list[Axes])->MutiAxesSpec|FAIL|None:
+        return None

{majoplot-0.1.7.dist-info → majoplot-0.1.9.dist-info}/METADATA

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

@@ -7,14 +7,15 @@ 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=6Jf6yA0VB4HnTbeNUjQSmN04fJx3zzGdIT3Z8Y83Qvc,4519
+majoplot/domain/importers/PPMS_Resistivity.py,sha256=-1JbI93VQXK3vab89dmMX8NACtidjIUd9a2aNQH3G4M,4513
 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=SZa5f25di9GC9DCBv_aDZtxXwn75jKBgxR87SV1CJ78,4584
+majoplot/domain/scenarios/PPMS_Resistivity/RT.py,sha256=ezP1savHiwKBSOTPq2rJrcxu5IwINvZnEgIVva5gkEE,4576
 majoplot/domain/scenarios/VSM/ChiT.py,sha256=RNpO4xInT0mRr90v4DEZt4K0m6p9cmJNNm7f6F-RN34,6643
-majoplot/domain/scenarios/VSM/ChiT_ZFC.py,sha256=TCD-SD6KYUidZgLSoR4U1FY31De2HELrRuf7_KVlVJA,6564
+majoplot/domain/scenarios/VSM/ChiT_onlyZFC.py,sha256=gcnzmUn_B8EFEZigIUaqNz0deTM2KjtUgaak9kqdlKA,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_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
@@ -22,8 +23,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.7.dist-info/METADATA,sha256=BvDHU3bUUKf4MqpjnA2su0hYiDxOiBB6YX_xlwWTlkw,2877
-majoplot-0.1.7.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-majoplot-0.1.7.dist-info/entry_points.txt,sha256=zEiPXZtNyJQMvVS-Zl9psx8SpTafOcs8F9S8xGtOaBM,52
-majoplot-0.1.7.dist-info/licenses/LICENSE,sha256=fj2NqLupbHWfA5W-8tqCpT5yjO8A4F1HcKnt_maww20,1070
-majoplot-0.1.7.dist-info/RECORD,,
+majoplot-0.1.9.dist-info/METADATA,sha256=R6i7A7vNOszXycQVcT0u6mkdeE1_SyhxxJj0sKTUWkY,2877
+majoplot-0.1.9.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+majoplot-0.1.9.dist-info/entry_points.txt,sha256=zEiPXZtNyJQMvVS-Zl9psx8SpTafOcs8F9S8xGtOaBM,52
+majoplot-0.1.9.dist-info/licenses/LICENSE,sha256=fj2NqLupbHWfA5W-8tqCpT5yjO8A4F1HcKnt_maww20,1070
+majoplot-0.1.9.dist-info/RECORD,,