jarvisplot 1.0.3__tar.gz → 1.0.5__tar.gz

{jarvisplot-1.0.3 → jarvisplot-1.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvisplot
-Version: 1.0.3
+Version: 1.0.5
 Summary: JarvisPLOT: YAML-driven plotting engine
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -66,7 +66,7 @@ jplot ./bin/SUSYRun2_GEWMSSM.yaml
 ## Requirements
 
 ### Python
-- **Python ≥ 3.9** (tested on 3.9–3.12)
+- **Python ≥ 3.10** (tested on 3.10–3.13)
 
 ### Required Packages
 - `numpy`
@@ -76,6 +76,9 @@ jplot ./bin/SUSYRun2_GEWMSSM.yaml
 - `jsonschema`
 - `scipy` — numerical utilities
 - `h5py` — required for loading HDF5 data files
+- `shapely`
+- `scipy`
+- `sympy`
 
 ### Github Page
 [https://github.com/Pengxuan-Zhu-Phys/Jarvis-PLOT](https://github.com/Pengxuan-Zhu-Phys/Jarvis-PLOT)

{jarvisplot-1.0.3 → jarvisplot-1.0.5}/README.md

@@ -49,7 +49,7 @@ jplot ./bin/SUSYRun2_GEWMSSM.yaml
 ## Requirements
 
 ### Python
-- **Python ≥ 3.9** (tested on 3.9–3.12)
+- **Python ≥ 3.10** (tested on 3.10–3.13)
 
 ### Required Packages
 - `numpy`
@@ -59,6 +59,9 @@ jplot ./bin/SUSYRun2_GEWMSSM.yaml
 - `jsonschema`
 - `scipy` — numerical utilities
 - `h5py` — required for loading HDF5 data files
+- `shapely`
+- `scipy`
+- `sympy`
 
 ### Github Page
 [https://github.com/Pengxuan-Zhu-Phys/Jarvis-PLOT](https://github.com/Pengxuan-Zhu-Phys/Jarvis-PLOT)

{jarvisplot-1.0.3 → jarvisplot-1.0.5}/jarvisplot/Figure/figure.py

@@ -217,10 +217,10 @@ class Figure:
                 if xscale not in ('log', 'symlog', 'logit'):
                     fmt = mticker.ScalarFormatter(useMathText=True)
                     # Do not use sci/offset for small exponents like 10^-1; reserve for <=1e-2 or >=1e4
-                    fmt.set_powerlimits((-2, 4))
+                    fmt.set_powerlimits((-3, 4))
                     axis.set_major_formatter(fmt)
                     try:
-                        target.ticklabel_format(style='sci', axis='x', scilimits=(-2, 4))
+                        target.ticklabel_format(style='sci', axis='x', scilimits=(-3, 4))
                     except Exception:
                         pass
                     try:
@@ -255,71 +255,70 @@ class Figure:
                 return
 
             # --- Y axis formatting
-            if which != 'y':
-                return
+            if which == 'y':
 
-            # Detect scale
-            try:
-                yscale = target.get_yscale()
-            except Exception:
-                yscale = None
+                # Detect scale
+                try:
+                    yscale = target.get_yscale()
+                except Exception:
+                    yscale = None
 
-            # 1) Log-like y-axis: compact decimals in range, otherwise default log formatter
-            if yscale in ('log', 'symlog', 'logit'):
-                from matplotlib.ticker import LogFormatterMathtext, FuncFormatter
+                # 1) Log-like y-axis: compact decimals in range, otherwise default log formatter
+                if yscale in ('log', 'symlog', 'logit'):
+                    from matplotlib.ticker import LogFormatterMathtext, FuncFormatter
 
-                base = LogFormatterMathtext()
-                lo, hi = 1e-2, 1e2  # compact decimal range
+                    base = LogFormatterMathtext()
+                    lo, hi = 1e-2, 1e2  # compact decimal range
 
-                def _fmt(val, pos=None):
-                    if val is None or val <= 0:
-                        return ""
+                    def _fmt(val, pos=None):
+                        if val is None or val <= 0:
+                            return ""
+                        try:
+                            exp = np.log10(val)
+                        except Exception:
+                            return ""
+                        # Only label exact decades
+                        if (not np.isfinite(exp)) or (not np.isclose(exp, round(exp))):
+                            return ""
+
+                        if lo <= val <= hi:
+                            e = int(round(exp))
+                            if e >= 0:
+                                return f"{int(10**e)}"
+                            # e=-1 -> 0.1 (1 dp), e=-2 -> 0.01 (2 dp)
+                            return f"{10**e:.{abs(e)}f}"
+
+                        # outside compact range: defer to Matplotlib
+                        return base(val, pos)
+
+                    axis.set_major_formatter(FuncFormatter(_fmt))
+                    return
+
+                # 2) Linear y-axis: ScalarFormatter sci notation
+                fmt = mticker.ScalarFormatter(useMathText=True)
+                # Do not use sci/offset for small exponents like 10^-1; reserve for <=1e-2 or >=1e4
+                fmt.set_powerlimits((-3, 4))
+                axis.set_major_formatter(fmt)
+                try:
+                    target.ticklabel_format(style='sci', axis='y', scilimits=(-3, 4))
+                except Exception:
+                    pass
+                try:
+                    axis.set_offset_position('left')
+                except Exception:
+                    pass
+                mpl.rcParams['axes.formatter.useoffset'] = True
+                try:
+                    target.figure.canvas.draw_idle()
+                    # shrink offset text a bit
                     try:
-                        exp = np.log10(val)
+                        tl = axis.get_ticklabels()
+                        if tl:
+                            axis.offsetText.set_fontsize(tl[0].get_size() * 0.8)
                     except Exception:
-                        return ""
-                    # Only label exact decades
-                    if (not np.isfinite(exp)) or (not np.isclose(exp, round(exp))):
-                        return ""
-
-                    if lo <= val <= hi:
-                        e = int(round(exp))
-                        if e >= 0:
-                            return f"{int(10**e)}"
-                        # e=-1 -> 0.1 (1 dp), e=-2 -> 0.01 (2 dp)
-                        return f"{10**e:.{abs(e)}f}"
-
-                    # outside compact range: defer to Matplotlib
-                    return base(val, pos)
-
-                axis.set_major_formatter(FuncFormatter(_fmt))
-                return
-
-            # 2) Linear y-axis: ScalarFormatter sci notation
-            fmt = mticker.ScalarFormatter(useMathText=True)
-            # Do not use sci/offset for small exponents like 10^-1; reserve for <=1e-2 or >=1e4
-            fmt.set_powerlimits((-2, 4))
-            axis.set_major_formatter(fmt)
-            try:
-                target.ticklabel_format(style='sci', axis='y', scilimits=(-2, 4))
-            except Exception:
-                pass
-            try:
-                axis.set_offset_position('left')
-            except Exception:
-                pass
-            mpl.rcParams['axes.formatter.useoffset'] = True
-            try:
-                target.figure.canvas.draw_idle()
-                # shrink offset text a bit
-                try:
-                    tl = axis.get_ticklabels()
-                    if tl:
-                        axis.offsetText.set_fontsize(tl[0].get_size() * 0.8)
+                        pass
                 except Exception:
                     pass
-            except Exception:
-                pass
 
         except Exception:
             # Always fail silently here; tick post-processing must never crash plotting.
@@ -857,13 +856,31 @@ class Figure:
             if "color" in self.frame['ax']['spines']:
                 for s in self.axes['ax'].spines.values():
                     s.set_color(self.frame['ax']['spines']['color'])
+             
+        def _safe_cast(v):
+            try:
+                return float(v)
+            except Exception:
+                return v
+                    
+        xlim = self.frame["ax"].get("xlim")
+        if xlim:
+            xlim = list(map(_safe_cast, xlim))
+            self.ax.set_xlim(xlim)
+
+        ylim = self.frame["ax"].get("ylim")
+        if ylim:
+            ylim = list(map(_safe_cast, ylim))
+            self.ax.set_ylim(ylim)
+
                     
+        from matplotlib.ticker import AutoMinorLocator, MaxNLocator, AutoLocator
         if self.frame['ax'].get("yscale", "").lower() == 'log':
             self.ax.set_yscale("log")
             from matplotlib.ticker import LogLocator
             self.ax.yaxis.set_minor_locator(LogLocator(subs='auto'))
         else:
-            from matplotlib.ticker import AutoMinorLocator
+            self.ax.yaxis.set_major_locator(MaxNLocator(nbins=5, min_n_ticks=4))
             self.ax.yaxis.set_minor_locator(AutoMinorLocator())
         
         if self.frame['ax'].get("xscale", "").lower() == 'log':
@@ -871,14 +888,10 @@ class Figure:
             from matplotlib.ticker import LogLocator
             self.ax.xaxis.set_minor_locator(LogLocator(subs='auto'))
         else:
-            from matplotlib.ticker import AutoMinorLocator
+            self.ax.xaxis.set_major_locator(MaxNLocator(nbins=5, min_n_ticks=4))
             self.ax.xaxis.set_minor_locator(AutoMinorLocator())
         
-        def _safe_cast(v):
-            try:
-                return float(v)
-            except Exception:
-                return v
+
 
         if self.frame["ax"].get("text"): 
             for txt in self.frame["ax"]["text"]:
@@ -889,15 +902,6 @@ class Figure:
                     self.ax.text(**txt)
 
 
-        xlim = self.frame["ax"].get("xlim")
-        if xlim:
-            xlim = list(map(_safe_cast, xlim))
-            self.ax.set_xlim(xlim)
-
-        ylim = self.frame["ax"].get("ylim")
-        if ylim:
-            ylim = list(map(_safe_cast, ylim))
-            self.ax.set_ylim(ylim)
 
         if self.frame['ax']['labels'].get("x"):
             self.ax.set_xlabel(self.frame['ax']['labels']['x'], **self.frame['ax']['labels']['xlabel'])
@@ -1176,6 +1180,7 @@ class Figure:
 
             if "frame" in info:
                 self.frame = info['frame']
+            self.logger.debug("Figure frame information loaded")
 
             import matplotlib.pyplot as plt
             plt.rcParams['mathtext.fontset'] = 'stix'

{jarvisplot-1.0.3 → jarvisplot-1.0.5}/jarvisplot/cards/a4paper/2x1/rect_cmap.json

@@ -92,16 +92,16 @@
                 "zorder": 1000,
                 "xlabel": {
                     "loc": "center",
-                    "fontsize": 12,
+                    "fontsize": 11,
                     "fontfamily": "STIXGeneral"
                 },
                 "ylabel": {
                     "loc": "center",
-                    "fontsize": 12,
+                    "fontsize": 11,
                     "fontfamily": "STIXGeneral"
                 },
                 "ylabel_coords": {
-                    "x": -0.12, 
+                    "x": -0.11, 
                     "y": 0.5
                 }
             }
@@ -138,7 +138,7 @@
             "label": {
                 "ylabel": "",
                 "loc": "center",
-                "fontsize": 12,
+                "fontsize": 11,
                 "fontfamily": "STIXGeneral"
             },
             "ticks": {

{jarvisplot-1.0.3 → jarvisplot-1.0.5}/jarvisplot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvisplot
-Version: 1.0.3
+Version: 1.0.5
 Summary: JarvisPLOT: YAML-driven plotting engine
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -66,7 +66,7 @@ jplot ./bin/SUSYRun2_GEWMSSM.yaml
 ## Requirements
 
 ### Python
-- **Python ≥ 3.9** (tested on 3.9–3.12)
+- **Python ≥ 3.10** (tested on 3.10–3.13)
 
 ### Required Packages
 - `numpy`
@@ -76,6 +76,9 @@ jplot ./bin/SUSYRun2_GEWMSSM.yaml
 - `jsonschema`
 - `scipy` — numerical utilities
 - `h5py` — required for loading HDF5 data files
+- `shapely`
+- `scipy`
+- `sympy`
 
 ### Github Page
 [https://github.com/Pengxuan-Zhu-Phys/Jarvis-PLOT](https://github.com/Pengxuan-Zhu-Phys/Jarvis-PLOT)

{jarvisplot-1.0.3 → jarvisplot-1.0.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvisplot"
-version = "1.0.3"
+version = "1.0.5"
 description = "JarvisPLOT: YAML-driven plotting engine"
 readme = "README.md"
 requires-python = ">=3.10"