majoplot 0.1.7__tar.gz → 0.1.9__tar.gz

{majoplot-0.1.7 → majoplot-0.1.9}/PKG-INFO

@@ -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 → majoplot-0.1.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "majoplot"
-version = "0.1.7"
+version = "0.1.9"
 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.7 → majoplot-0.1.9}/src/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-0.1.7 → majoplot-0.1.9}/src/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-0.1.7/src/majoplot/domain/scenarios/VSM/ChiT_ZFC.py → majoplot-0.1.9/src/majoplot/domain/scenarios/VSM/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-0.1.9/src/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 → majoplot-0.1.9}/uv.lock

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