majoplot 0.1.4__tar.gz → 0.1.6__tar.gz

{majoplot-0.1.4 → majoplot-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: majoplot
-Version: 0.1.4
+Version: 0.1.6
 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.4 → majoplot-0.1.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "majoplot"
-version = "0.1.4"
+version = "0.1.6"
 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.4 → majoplot-0.1.6}/src/majoplot/domain/base.py

@@ -359,6 +359,7 @@ class Project(dict[str,folder]):
 # ======== Scenario ========
 class Importer(Protocol):
     instrument: str
+    prefs_scenario: str
 
     @classmethod
     def fetch_raw_data(cls, raw_data_file:TextIO, raw_data_name:str)->Data|FAIL:
@@ -379,7 +380,7 @@ class Scenario(Protocol):
         ...
     
     @classmethod
-    def make_axes_spec(cls, axes_labels:LabelDict)->AxesSpec:
+    def make_axes_spec(cls, axes_labels:LabelDict, data_pool:Iterable[Data])->AxesSpec:
         ...
 
     @classmethod

{majoplot-0.1.4 → majoplot-0.1.6}/src/majoplot/domain/importers/PPMS_Resistivity.py

@@ -21,6 +21,7 @@ R3, I3 = "Bridge 3 Resistivity (Ohm-m)", "Bridge 3 Excitation (uA)"
 
 class PPMS_Resistivity:
     instrument = "PPMS"
+    prefs_scenario = "RT"
     
     @classmethod
     def fetch_raw_data(cls, raw_data_file:TextIO, raw_data_name:str)->Data|FAIL:

{majoplot-0.1.4 → majoplot-0.1.6}/src/majoplot/domain/importers/VSM.py

@@ -25,6 +25,7 @@ headers = (T, H, M, Mfix, Mfit, SD, CP, DCC)
 
 class VSM:
     instrument = "VSM"
+    prefs_scenario = "MT"
     
     @classmethod
     def fetch_raw_data(cls, raw_data_file:TextIO, raw_data_name:str)->Data|FAIL:

{majoplot-0.1.4 → majoplot-0.1.6}/src/majoplot/domain/importers/XRD.py

@@ -5,6 +5,7 @@ from ..base import *
 
 class XRD:
     instrument = "XRD"
+    prefs_scenario = "Compare"
     
     @classmethod
     def fetch_raw_data(cls, raw_data_file:TextIO, raw_data_name:str)->Data|FAIL:

{majoplot-0.1.4 → majoplot-0.1.6}/src/majoplot/domain/scenarios/PPMS_Resistivity/RT.py

@@ -85,7 +85,7 @@ class RT:
             
 
     @classmethod
-    def make_axes_spec(cls, axes_labels)->AxesSpec:
+    def make_axes_spec(cls, axes_labels, data_pool)->AxesSpec:
         return AxesSpec(
             x_axis_title=T,
             y_axis_title=R,

majoplot-0.1.6/src/majoplot/domain/scenarios/VSM/ChiT.py

@@ -0,0 +1,188 @@
+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)"
+chi = "χ ( m³ / kg )"
+
+
+class ChiT:
+    data_summary_label_names = ["H","cooling_type"]
+    axes_label_names = ("material","date","raw_data")
+    figure_label_names = ("material","date", "raw_data")
+    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]:
+                    unused = True
+                    labels["cooling_type"] = "cooling"
+                else:
+                    unused = False
+                    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
+                a_points=np.array(current_points)[:,[iT,iM]]
+                try:
+                    mass = np.float64(labels["mass"].value)
+                except ValueError:
+                    mass = np.nan
+                if mass == 0:
+                    mass = np.nan
+                safe_H_stage = np.nan if H_stage == 0 else H_stage
+                chi_points = np.column_stack([a_points[:,0], a_points[:,1] / safe_H_stage * 1e6 / mass])
+                datas.append(
+                    Data(
+                        labels=labels,
+                        _headers=(T,chi),
+                        points=chi_points,
+                        ignore_outliers=IgnoreOutlierSpec(
+                            min_gap_base=5e-9,
+                            min_gap_multiple=10
+                        ),
+                        unused=unused,
+                ))
+
+            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:Iterable[Data])->AxesSpec:
+        if data_pool:
+            x_min, x_max = data_pool[0].xlim
+            for data in data_pool[1:]:
+                data_x_min, data_x_max = data.xlim
+                if data_x_min > x_min:
+                    x_min = data_x_min
+                if data_x_max < x_max:
+                    x_max = data_x_max
+            
+            y_min, y_max = None, None
+            for data in data_pool:
+                mask = (data.points_for_plot[:, 0] >= x_min) & (data.points_for_plot[:, 0] <= x_max)
+                y = data.points_for_plot[mask, 1]
+                data_y_min = y.min()
+                data_y_max = y.max()
+                if y_min:
+                    if data_y_min < y_min:
+                        y_min = data_y_min
+                else:
+                    y_min = data_y_min
+
+                if y_max:
+                    if data_y_max > y_max:
+                        y_max = data_y_max
+                else:
+                    y_max = data_y_max
+            
+            x_magin = (x_max - x_min) * 0.05
+            y_magin = (y_max - y_min) * 0.05
+            
+            x_min, x_max = x_min - x_magin, x_max + x_magin
+            y_min, y_max = y_min - y_magin, y_max + y_magin
+
+
+        else:
+            x_min, x_max = None, None
+            y_min, y_max = None, None
+
+
+        return AxesSpec(
+            x_axis_title=T,
+            y_axis_title=chi,
+            x_left_lim=x_min,
+            x_right_lim=x_max,
+            y_left_lim=y_min,
+            y_right_lim=y_max,
+            major_grid=None,
+            major_tick=TickSpec(),
+            legend=LegendSpec(),
+        )
+            
+
+    @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 = (
+                "#1f77b4", "#1f77b4",  # blue (best first color)
+                "#ff7f0e", "#ff7f0e",  # orange
+                "#2ca02c", "#2ca02c",  # green
+                "#d62728", "#d62728",  # red
+                "#9467bd", "#9467bd",  # purple
+                "#8c564b", "#8c564b",  # brown
+                "#17becf", "#17becf",  # cyan
+                "#e377c2", "#e377c2",  # pink
+            ),
+            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.6/src/majoplot/domain/scenarios/VSM/ChiT_ZFC.py

@@ -0,0 +1,189 @@
+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)"
+chi = "χ ( m³ / kg )"
+
+
+class ChiT_ZFC:
+    data_summary_label_names = ["H","cooling_type"]
+    axes_label_names = ("material","date","raw_data")
+    figure_label_names = ("material","date", "raw_data")
+    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]:
+                    unused = True
+                    labels["cooling_type"] = "cooling"
+                else:
+                    if current_cool_type == "ZFC":
+                        unused = False
+                        labels["cooling_type"] = "ZFC"
+                        current_cool_type = "FC"
+                    else:
+                        unused = True
+                        labels["cooling_type"] = "FC"
+                        current_cool_type = "ZFC"
+                labels["scenario"] = "MT"
+                labels.summary_names = cls.data_summary_label_names
+                a_points=np.array(current_points)[:,[iT,iM]]
+                try:
+                    mass = np.float64(labels["mass"].value)
+                except ValueError:
+                    mass = np.nan
+                if mass == 0:
+                    mass = np.nan
+                safe_H_stage = np.nan if H_stage == 0 else H_stage
+                chi_points = np.column_stack([a_points[:,0], a_points[:,1] / safe_H_stage * 1e6 / mass])
+                datas.append(
+                    Data(
+                        labels=labels,
+                        _headers=(T,chi),
+                        points=chi_points,
+                        ignore_outliers=IgnoreOutlierSpec(
+                            min_gap_base=5e-9,
+                            min_gap_multiple=10
+                        ),
+                        unused=unused,
+                ))
+
+            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:Iterable[Data])->AxesSpec:
+        if data_pool:
+            x_min, x_max = data_pool[0].xlim
+            for data in data_pool[1:]:
+                data_x_min, data_x_max = data.xlim
+                if data_x_min > x_min:
+                    x_min = data_x_min
+                if data_x_max < x_max:
+                    x_max = data_x_max
+            
+            y_min, y_max = None, None
+            for data in data_pool:
+                mask = (data.points_for_plot[:, 0] >= x_min) & (data.points_for_plot[:, 0] <= x_max)
+                y = data.points_for_plot[mask, 1]
+                data_y_min = y.min()
+                data_y_max = y.max()
+                if y_min:
+                    if data_y_min < y_min:
+                        y_min = data_y_min
+                else:
+                    y_min = data_y_min
+
+                if y_max:
+                    if data_y_max > y_max:
+                        y_max = data_y_max
+                else:
+                    y_max = data_y_max
+            
+            x_magin = (x_max - x_min) * 0.05
+            y_magin = (y_max - y_min) * 0.05
+            
+            x_min, x_max = x_min - x_magin, x_max + x_magin
+            y_min, y_max = y_min - y_magin, y_max + y_magin
+
+
+        else:
+            x_min, x_max = None, None
+            y_min, y_max = None, None
+
+
+        return AxesSpec(
+            x_axis_title=T,
+            y_axis_title=chi,
+            x_left_lim=x_min,
+            x_right_lim=x_max,
+            y_left_lim=y_min,
+            y_right_lim=y_max,
+            major_grid=None,
+            major_tick=TickSpec(),
+            legend=LegendSpec(),
+        )
+            
+
+    @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 = (
+                "#1f77b4",  # blue (best first color)
+                "#ff7f0e",  # orange
+                "#2ca02c",  # green
+                "#d62728",  # red
+                "#9467bd",  # purple
+                "#8c564b",  # brown
+                "#17becf",  # cyan
+                "#e377c2",  # pink
+            ),
+            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-0.1.4 → majoplot-0.1.6}/src/majoplot/domain/scenarios/VSM/MT.py

@@ -98,7 +98,7 @@ class MT:
 
 
     @classmethod
-    def make_axes_spec(cls,axes_labels)->AxesSpec:
+    def make_axes_spec(cls,axes_labels, data_pool)->AxesSpec:
         return AxesSpec(
             x_axis_title=T,
             y_axis_title=M,

{majoplot-0.1.4 → majoplot-0.1.6}/src/majoplot/domain/scenarios/VSM/MT_insert.py

@@ -99,7 +99,7 @@ class MT_insert:
 
 
     @classmethod
-    def make_axes_spec(cls, axes_labels)->AxesSpec:
+    def make_axes_spec(cls, axes_labels, data_pool)->AxesSpec:
         return AxesSpec(
             x_axis_title=T,
             y_axis_title=M,

{majoplot-0.1.4 → majoplot-0.1.6}/src/majoplot/domain/scenarios/VSM/MT_reliability_analysis.py

@@ -107,7 +107,7 @@ class MT_reliability_analysis:
 
 
     @classmethod
-    def make_axes_spec(cls,axes_labels:LabelDict)->AxesSpec:
+    def make_axes_spec(cls,axes_labels:LabelDict, data_pool)->AxesSpec:
         return AxesSpec(
             x_axis_title=T,
             y_axis_title=axes_labels["Y_axis"],

{majoplot-0.1.4 → majoplot-0.1.6}/src/majoplot/domain/scenarios/XRD/Compare.py

@@ -72,7 +72,7 @@ class Compare:
         return datas
 
     @classmethod
-    def make_axes_spec(cls, axes_labels)->AxesSpec:
+    def make_axes_spec(cls, axes_labels, data_pool)->AxesSpec:
         return AxesSpec(
             x_axis_title="2θ",
             y_axis_title="I",

{majoplot-0.1.4 → majoplot-0.1.6}/src/majoplot/domain/utils.py

@@ -8,12 +8,12 @@ def group_into_axes(all_datas:Iterable[Data], scenario:Scenario)->list[Axes]:
     make_axes_spec = scenario.make_axes_spec
 
     axes_labels_and_data_pools, _ = LabelDict.group(
-        ((data.labels, data) for data in all_datas if ( (not data.unused) and (data.points.size > 0) )),
+        ((data.labels, data) for data in all_datas if not (data.unused or np.isnan(data.y_for_plot).all()) ),
         group_label_names=axes_label_names,
     )
     axes_pool = []
     for axes_labels, data_pool in axes_labels_and_data_pools:  
-        spec = make_axes_spec(axes_labels)
+        spec = make_axes_spec(axes_labels, data_pool)
         axes_pool.append(Axes(spec, axes_labels, data_pool))
     return axes_pool
 

{majoplot-0.1.4 → majoplot-0.1.6}/src/majoplot/gui/main.py

@@ -210,7 +210,10 @@ class MainWindow(ttk.Frame):
         snames = sorted(self.scenarios.keys())
         self.scenario_cb["values"] = snames
         if snames:
-            self.scenario_var.set(snames[0])
+            try:
+                self.scenario_var.set(self.importers[name].prefs_scenario)
+            except AttributeError:
+                self.scenario_var.set(snames[0])
 
     # ---------------- Import flow ----------------
     def _pick_raw_files(self) -> None:
@@ -415,8 +418,8 @@ class MainWindow(ttk.Frame):
             return
         proj = self.edit_proj_name_var.get().strip()
         folder = self.edit_folder_path_var.get().strip()
-        if not proj or not folder:
-            messagebox.showwarning("Invalid", "proj_name and folder_path are required.")
+        if not proj:
+            messagebox.showwarning("Invalid", "proj_name is required.")
             return
         fig = self.figures[idx]
         if overwrite:
@@ -428,8 +431,8 @@ class MainWindow(ttk.Frame):
     def _apply_archive_to_all(self, overwrite: bool) -> None:
         proj = self.global_proj_name_var.get().strip()
         folder = self.global_folder_path_var.get().strip()
-        if not proj or not folder:
-            messagebox.showwarning("Invalid", "proj_name and folder_path are required.")
+        if not proj:
+            messagebox.showwarning("Invalid", "proj_name is required.")
             return
         for fig in self.figures:
             if overwrite:

{majoplot-0.1.4 → majoplot-0.1.6}/src/majoplot/infra/plotters/origin.py

@@ -590,13 +590,13 @@ def _legend_anchor_xy(leg: LegendSpec) -> tuple[float, float]:
 
     loc = (leg.loc or "upper right").lower().replace("_", " ")
     table = {
-        "upper right": (90.0, 90.0),
+        "upper right": (85.0, 90.0),
         "upper left": (10.0, 90.0),
         "lower left": (10.0, 10.0),
-        "lower right": (90.0, 10.0),
+        "lower right": (85.0, 10.0),
         "center": (50.0, 50.0),
     }
-    return table.get(loc, (90.0, 90.0))
+    return table.get(loc, (85.0, 90.0))
 
 
 def _apply_legend_text(og: Any, layer_idx: int, legend_spec: LegendSpec, legend_text: str, scale: float) -> None:

{majoplot-0.1.4 → majoplot-0.1.6}/uv.lock

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

majoplot-0.1.4/TODO.md

@@ -1 +0,0 @@
-- take in account the situation that no point in data