scitex 2.7.0__py3-none-any.whl → 2.7.3__py3-none-any.whl

scitex/plt/_subplots/_export_as_csv_formatters/_format_stx_heatmap.py

@@ -12,6 +12,9 @@ __DIR__ = os.path.dirname(__FILE__)
 import numpy as np
 import pandas as pd
 
+from scitex.plt.utils._csv_column_naming import get_csv_column_name
+from ._format_plot import _parse_tracking_id
+
 
 def _format_plot_heatmap(id, tracked_dict, kwargs):
     """Format data from a stx_heatmap call.
@@ -39,12 +42,15 @@ def _format_plot_heatmap(id, tracked_dict, kwargs):
         rows, cols = data.shape
         row_indices, col_indices = np.meshgrid(range(rows), range(cols), indexing="ij")
 
-        # Format data in xyz format (x, y, value)
+        # Parse the tracking ID to get axes position and trace ID
+        ax_row, ax_col, trace_id = _parse_tracking_id(id)
+
+        # Format data in xyz format (x, y, value) using single source of truth
         df = pd.DataFrame(
             {
-                f"{id}_x": col_indices.flatten(),  # x is column
-                f"{id}_y": row_indices.flatten(),  # y is row
-                f"{id}_value": data.flatten(),  # z is intensity/value
+                get_csv_column_name("x", ax_row, ax_col, trace_id=trace_id): col_indices.flatten(),  # x is column
+                get_csv_column_name("y", ax_row, ax_col, trace_id=trace_id): row_indices.flatten(),  # y is row
+                get_csv_column_name("value", ax_row, ax_col, trace_id=trace_id): data.flatten(),  # z is intensity/value
             }
         )
 
@@ -52,12 +58,16 @@ def _format_plot_heatmap(id, tracked_dict, kwargs):
         if x_labels is not None and len(x_labels) == cols:
             # Map column indices to x labels (columns are x)
             x_label_map = {i: label for i, label in enumerate(x_labels)}
-            df[f"{id}_x_label"] = df[f"{id}_x"].map(x_label_map)
+            x_col_name = get_csv_column_name("x", ax_row, ax_col, trace_id=trace_id)
+            x_label_col_name = get_csv_column_name("x_label", ax_row, ax_col, trace_id=trace_id)
+            df[x_label_col_name] = df[x_col_name].map(x_label_map)
 
         if y_labels is not None and len(y_labels) == rows:
             # Map row indices to y labels (rows are y)
             y_label_map = {i: label for i, label in enumerate(y_labels)}
-            df[f"{id}_y_label"] = df[f"{id}_y"].map(y_label_map)
+            y_col_name = get_csv_column_name("y", ax_row, ax_col, trace_id=trace_id)
+            y_label_col_name = get_csv_column_name("y_label", ax_row, ax_col, trace_id=trace_id)
+            df[y_label_col_name] = df[y_col_name].map(y_label_map)
 
         return df
 

scitex/plt/_subplots/_export_as_csv_formatters/_format_stx_image.py

@@ -7,6 +7,9 @@ import os
 import numpy as np
 import pandas as pd
 
+from scitex.plt.utils._csv_column_naming import get_csv_column_name
+from ._format_plot import _parse_tracking_id
+
 __FILE__ = __file__
 __DIR__ = os.path.dirname(__FILE__)
 # ----------------------------------------
@@ -30,6 +33,9 @@ def _format_plot_image(id, tracked_dict, kwargs):
     if not tracked_dict or not isinstance(tracked_dict, dict):
         return pd.DataFrame()
 
+    # Parse the tracking ID to get axes position and trace ID
+    ax_row, ax_col, trace_id = _parse_tracking_id(id)
+
     # Check if image_df is available and use it if present
     if "image_df" in tracked_dict:
         image_df = tracked_dict.get("image_df")
@@ -37,19 +43,20 @@ def _format_plot_image(id, tracked_dict, kwargs):
             # Add prefix if ID is provided
             if id is not None:
                 image_df = image_df.copy()
-                id_str = str(id)
-                # Convert columns to strings first to handle integer column names
-                image_df.columns = [str(col) for col in image_df.columns]
-                image_df.columns = [
-                    f"{id_str}_{col}" if not col.startswith(f"{id_str}_") else col
-                    for col in image_df.columns
-                ]
+                # Rename columns using single source of truth
+                renamed = {}
+                for col in image_df.columns:
+                    # Convert to string to handle integer column names
+                    col_str = str(col)
+                    renamed[col] = get_csv_column_name(
+                        col_str, ax_row, ax_col, trace_id=trace_id
+                    )
+                image_df = image_df.rename(columns=renamed)
             return image_df
 
     # If we have image data
     if "image" in tracked_dict:
         img = tracked_dict["image"]
-        id_str = str(id) if id is not None else "image"
 
         # Handle 2D grayscale images - create xyz format (x, y, value)
         if isinstance(img, np.ndarray) and img.ndim == 2:
@@ -58,12 +65,12 @@ def _format_plot_image(id, tracked_dict, kwargs):
                 range(rows), range(cols), indexing="ij"
             )
 
-            # Create xyz format
+            # Create xyz format using single source of truth
             df = pd.DataFrame(
                 {
-                    f"{id_str}_x": col_indices.flatten(),  # x is column
-                    f"{id_str}_y": row_indices.flatten(),  # y is row
-                    f"{id_str}_value": img.flatten(),  # z is intensity
+                    get_csv_column_name("x", ax_row, ax_col, trace_id=trace_id): col_indices.flatten(),  # x is column
+                    get_csv_column_name("y", ax_row, ax_col, trace_id=trace_id): row_indices.flatten(),  # y is row
+                    get_csv_column_name("value", ax_row, ax_col, trace_id=trace_id): img.flatten(),  # z is intensity
                 }
             )
             return df
@@ -71,24 +78,27 @@ def _format_plot_image(id, tracked_dict, kwargs):
         # Handle RGB/RGBA images - create xyz format with additional channel information
         elif isinstance(img, np.ndarray) and img.ndim == 3:
             rows, cols, channels = img.shape
-            row_indices, col_indices = np.meshgrid(
-                range(rows), range(cols), indexing="ij"
-            )
 
             # Create a list to hold rows for a long-format DataFrame
             data_rows = []
             channel_names = ["r", "g", "b", "a"]
 
+            # Get column names using single source of truth
+            x_col = get_csv_column_name("x", ax_row, ax_col, trace_id=trace_id)
+            y_col = get_csv_column_name("y", ax_row, ax_col, trace_id=trace_id)
+            channel_col = get_csv_column_name("channel", ax_row, ax_col, trace_id=trace_id)
+            value_col = get_csv_column_name("value", ax_row, ax_col, trace_id=trace_id)
+
             # Create long-format data (x, y, channel, value)
             for r in range(rows):
                 for c in range(cols):
                     for ch in range(min(channels, len(channel_names))):
                         data_rows.append(
                             {
-                                f"{id_str}_x": c,  # x is column
-                                f"{id_str}_y": r,  # y is row
-                                f"{id_str}_channel": channel_names[ch],  # channel name
-                                f"{id_str}_value": img[r, c, ch],  # channel value
+                                x_col: c,  # x is column
+                                y_col: r,  # y is row
+                                channel_col: channel_names[ch],  # channel name
+                                value_col: img[r, c, ch],  # channel value
                             }
                         )
 

scitex/plt/_subplots/_export_as_csv_formatters/_format_stx_imshow.py

@@ -0,0 +1,63 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""CSV formatter for stx_imshow() calls."""
+
+import numpy as np
+import pandas as pd
+from scitex.plt.utils._csv_column_naming import get_csv_column_name
+from ._format_plot import _parse_tracking_id
+
+
+def _format_stx_imshow(id, tracked_dict, kwargs):
+    """Format data from stx_imshow call for CSV export.
+
+    Parameters
+    ----------
+    id : str
+        Identifier for the plot
+    tracked_dict : dict
+        Dictionary containing tracked data with 'imshow_df'
+    kwargs : dict
+        Keyword arguments passed to stx_imshow
+
+    Returns
+    -------
+    pd.DataFrame
+        Formatted imshow data in row, col, value format (or row, col, R, G, B for RGB)
+    """
+    if not tracked_dict or not isinstance(tracked_dict, dict):
+        return pd.DataFrame()
+
+    ax_row, ax_col, trace_id = _parse_tracking_id(id)
+
+    # Get imshow_df from tracked_dict
+    imshow_df = tracked_dict.get("imshow_df")
+    if imshow_df is not None and isinstance(imshow_df, pd.DataFrame):
+        # Convert from 2D DataFrame format (with col_0, col_1, ... columns)
+        # to row, col, value format for easier analysis
+        n_rows, n_cols = imshow_df.shape
+
+        # Create row and column indices
+        row_indices = np.repeat(np.arange(n_rows), n_cols)
+        col_indices = np.tile(np.arange(n_cols), n_rows)
+
+        # Get column names from single source of truth
+        col_row = get_csv_column_name("row", ax_row, ax_col, trace_id=trace_id)
+        col_col = get_csv_column_name("col", ax_row, ax_col, trace_id=trace_id)
+        col_value = get_csv_column_name("value", ax_row, ax_col, trace_id=trace_id)
+
+        # Flatten the DataFrame values
+        values = imshow_df.values.flatten()
+
+        result = pd.DataFrame({
+            col_row: row_indices,
+            col_col: col_indices,
+            col_value: values
+        })
+
+        return result
+
+    return pd.DataFrame()
+
+
+# EOF

scitex/plt/_subplots/_export_as_csv_formatters/_format_stx_joyplot.py

@@ -12,6 +12,8 @@ __DIR__ = os.path.dirname(__FILE__)
 import numpy as np
 import pandas as pd
 from scitex.pd import force_df
+from scitex.plt.utils._csv_column_naming import get_csv_column_name
+from ._format_plot import _parse_tracking_id
 
 
 def _format_plot_joyplot(id, tracked_dict, kwargs):
@@ -29,6 +31,9 @@ def _format_plot_joyplot(id, tracked_dict, kwargs):
     if not tracked_dict or not isinstance(tracked_dict, dict):
         return pd.DataFrame()
 
+    # Parse tracking ID to get axes position and trace ID
+    ax_row, ax_col, trace_id = _parse_tracking_id(id)
+
     # Get joyplot_data from tracked_dict
     data = tracked_dict.get("joyplot_data")
 
@@ -39,16 +44,22 @@ def _format_plot_joyplot(id, tracked_dict, kwargs):
     if isinstance(data, pd.DataFrame):
         # Make a copy to avoid modifying original
         result = data.copy()
-        # Add prefix to column names if ID is provided
+        # Add prefix to column names using single source of truth
         if id is not None:
-            result.columns = [f"{id}_joyplot_{col}" for col in result.columns]
+            result.columns = [
+                get_csv_column_name(f"joyplot-{col}", ax_row, ax_col, trace_id=trace_id)
+                for col in result.columns
+            ]
         return result
 
     elif isinstance(data, dict):
         # Convert dictionary to DataFrame
         result = pd.DataFrame()
         for group, values in data.items():
-            result[f"{id}_joyplot_{group}"] = pd.Series(values)
+            col_name = get_csv_column_name(
+                f"joyplot-{group}", ax_row, ax_col, trace_id=trace_id
+            )
+            result[col_name] = pd.Series(values)
         return result
 
     elif isinstance(data, (list, tuple)) and all(
@@ -57,11 +68,17 @@ def _format_plot_joyplot(id, tracked_dict, kwargs):
         # Convert list of arrays to DataFrame
         result = pd.DataFrame()
         for i, values in enumerate(data):
-            result[f"{id}_joyplot_group{i:02d}"] = pd.Series(values)
+            col_name = get_csv_column_name(
+                f"joyplot-group{i:02d}", ax_row, ax_col, trace_id=trace_id
+            )
+            result[col_name] = pd.Series(values)
         return result
 
     # Try to force to DataFrame as a last resort
     try:
-        return force_df({f"{id}_joyplot_data": data})
+        col_name = get_csv_column_name(
+            "joyplot-data", ax_row, ax_col, trace_id=trace_id
+        )
+        return force_df({col_name: data})
     except:
         return pd.DataFrame()

scitex/plt/_subplots/_export_as_csv_formatters/_format_stx_mean_ci.py

@@ -1,21 +1,22 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Timestamp: "2025-05-18 18:14:26 (ywatanabe)"
-# File: /data/gpfs/projects/punim2354/ywatanabe/scitex_repo/src/scitex/plt/_subplots/_export_as_csv_formatters/_format_plot_mean_ci.py
-# ----------------------------------------
-import os
+# Timestamp: "2025-12-13 02:00:00 (ywatanabe)"
+# File: ./src/scitex/plt/_subplots/_export_as_csv_formatters/_format_stx_mean_ci.py
 
-__FILE__ = __file__
-__DIR__ = os.path.dirname(__FILE__)
-# ----------------------------------------
+"""CSV formatter for stx_mean_ci() calls - uses standard column naming."""
 
 import pandas as pd
 
+from scitex.plt.utils._csv_column_naming import get_csv_column_name
+
+from ._format_plot import _parse_tracking_id
+
 
 def _format_plot_mean_ci(id, tracked_dict, kwargs):
     """Format data from a stx_mean_ci call.
 
-    Processes mean with confidence interval band plot data for CSV export.
+    Processes mean with confidence interval band plot data for CSV export using
+    standard column naming (ax-row-{r}-col-{c}_trace-id-{id}_variable-{var}).
 
     Args:
         id (str): Identifier for the plot
@@ -23,7 +24,7 @@ def _format_plot_mean_ci(id, tracked_dict, kwargs):
         kwargs (dict): Keyword arguments passed to stx_mean_ci
 
     Returns:
-        pd.DataFrame: Formatted mean and CI data
+        pd.DataFrame: Formatted mean and CI data with standard column names
     """
     # Mean-CI plot data is passed in the tracked_dict
     if not tracked_dict:
@@ -35,12 +36,15 @@ def _format_plot_mean_ci(id, tracked_dict, kwargs):
     if plot_df is None or not isinstance(plot_df, pd.DataFrame):
         return pd.DataFrame()
 
+    # Parse tracking ID to get axes position
+    ax_row, ax_col, trace_id = _parse_tracking_id(id)
+
     # Create a copy to avoid modifying the original
     result = plot_df.copy()
 
-    # Add prefix to column names if ID is provided
-    if id is not None:
-        # Rename columns with ID prefix
-        result.columns = [f"{id}_mean_ci_{col}" for col in result.columns]
+    # Rename columns using standard naming convention
+    renamed = {}
+    for col in result.columns:
+        renamed[col] = get_csv_column_name(col, ax_row, ax_col, trace_id=trace_id)
 
-    return result
+    return result.rename(columns=renamed)

scitex/plt/_subplots/_export_as_csv_formatters/_format_stx_mean_std.py

@@ -1,21 +1,22 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Timestamp: "2025-05-18 18:14:26 (ywatanabe)"
-# File: /data/gpfs/projects/punim2354/ywatanabe/scitex_repo/src/scitex/plt/_subplots/_export_as_csv_formatters/_format_plot_mean_std.py
-# ----------------------------------------
-import os
+# Timestamp: "2025-12-13 02:00:00 (ywatanabe)"
+# File: ./src/scitex/plt/_subplots/_export_as_csv_formatters/_format_stx_mean_std.py
 
-__FILE__ = __file__
-__DIR__ = os.path.dirname(__FILE__)
-# ----------------------------------------
+"""CSV formatter for stx_mean_std() calls - uses standard column naming."""
 
 import pandas as pd
 
+from scitex.plt.utils._csv_column_naming import get_csv_column_name
+
+from ._format_plot import _parse_tracking_id
+
 
 def _format_plot_mean_std(id, tracked_dict, kwargs):
     """Format data from a stx_mean_std call.
 
-    Processes mean with standard deviation band plot data for CSV export.
+    Processes mean with standard deviation band plot data for CSV export using
+    standard column naming (ax-row-{r}-col-{c}_trace-id-{id}_variable-{var}).
 
     Args:
         id (str): Identifier for the plot
@@ -23,7 +24,7 @@ def _format_plot_mean_std(id, tracked_dict, kwargs):
         kwargs (dict): Keyword arguments passed to stx_mean_std
 
     Returns:
-        pd.DataFrame: Formatted mean and std data
+        pd.DataFrame: Formatted mean and std data with standard column names
     """
     # Check if tracked_dict is empty or not a dictionary
     if not tracked_dict or not isinstance(tracked_dict, dict):
@@ -35,12 +36,15 @@ def _format_plot_mean_std(id, tracked_dict, kwargs):
     if plot_df is None or not isinstance(plot_df, pd.DataFrame):
         return pd.DataFrame()
 
+    # Parse tracking ID to get axes position
+    ax_row, ax_col, trace_id = _parse_tracking_id(id)
+
     # Create a copy to avoid modifying the original
     result = plot_df.copy()
 
-    # Add prefix to column names if ID is provided
-    if id is not None:
-        # Rename columns with ID prefix
-        result.columns = [f"{id}_mean_std_{col}" for col in result.columns]
+    # Rename columns using standard naming convention
+    renamed = {}
+    for col in result.columns:
+        renamed[col] = get_csv_column_name(col, ax_row, ax_col, trace_id=trace_id)
 
-    return result
+    return result.rename(columns=renamed)

scitex/plt/_subplots/_export_as_csv_formatters/_format_stx_median_iqr.py

@@ -1,21 +1,22 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Timestamp: "2025-05-18 18:14:26 (ywatanabe)"
-# File: /data/gpfs/projects/punim2354/ywatanabe/scitex_repo/src/scitex/plt/_subplots/_export_as_csv_formatters/_format_plot_median_iqr.py
-# ----------------------------------------
-import os
+# Timestamp: "2025-12-13 02:00:00 (ywatanabe)"
+# File: ./src/scitex/plt/_subplots/_export_as_csv_formatters/_format_stx_median_iqr.py
 
-__FILE__ = __file__
-__DIR__ = os.path.dirname(__FILE__)
-# ----------------------------------------
+"""CSV formatter for stx_median_iqr() calls - uses standard column naming."""
 
 import pandas as pd
 
+from scitex.plt.utils._csv_column_naming import get_csv_column_name
+
+from ._format_plot import _parse_tracking_id
+
 
 def _format_plot_median_iqr(id, tracked_dict, kwargs):
     """Format data from a stx_median_iqr call.
 
-    Processes median with interquartile range band plot data for CSV export.
+    Processes median with interquartile range band plot data for CSV export using
+    standard column naming (ax-row-{r}-col-{c}_trace-id-{id}_variable-{var}).
 
     Args:
         id (str): Identifier for the plot
@@ -23,7 +24,7 @@ def _format_plot_median_iqr(id, tracked_dict, kwargs):
         kwargs (dict): Keyword arguments passed to stx_median_iqr
 
     Returns:
-        pd.DataFrame: Formatted median and IQR data
+        pd.DataFrame: Formatted median and IQR data with standard column names
     """
     # Median-IQR plot data is passed in the tracked_dict
     if not tracked_dict:
@@ -35,12 +36,15 @@ def _format_plot_median_iqr(id, tracked_dict, kwargs):
     if plot_df is None or not isinstance(plot_df, pd.DataFrame):
         return pd.DataFrame()
 
+    # Parse tracking ID to get axes position
+    ax_row, ax_col, trace_id = _parse_tracking_id(id)
+
     # Create a copy to avoid modifying the original
     result = plot_df.copy()
 
-    # Add prefix to column names if ID is provided
-    if id is not None:
-        # Rename columns with ID prefix
-        result.columns = [f"{id}_median_iqr_{col}" for col in result.columns]
+    # Rename columns using standard naming convention
+    renamed = {}
+    for col in result.columns:
+        renamed[col] = get_csv_column_name(col, ax_row, ax_col, trace_id=trace_id)
 
-    return result
+    return result.rename(columns=renamed)

scitex/plt/_subplots/_export_as_csv_formatters/_format_stx_raster.py

@@ -10,6 +10,8 @@ __DIR__ = os.path.dirname(__FILE__)
 # ----------------------------------------
 
 import pandas as pd
+from scitex.plt.utils._csv_column_naming import get_csv_column_name
+from ._format_plot import _parse_tracking_id
 
 
 def _format_plot_raster(id, tracked_dict, kwargs):
@@ -27,6 +29,9 @@ def _format_plot_raster(id, tracked_dict, kwargs):
     if not tracked_dict or not isinstance(tracked_dict, dict):
         return pd.DataFrame()
 
+    # Parse tracking ID to get axes position and trace ID
+    ax_row, ax_col, trace_id = _parse_tracking_id(id)
+
     # Get the raster_digit_df from args
     raster_df = tracked_dict.get("raster_digit_df")
 
@@ -36,9 +41,12 @@ def _format_plot_raster(id, tracked_dict, kwargs):
     # Create a copy to avoid modifying the original
     result = raster_df.copy()
 
-    # Add prefix to column names if ID is provided
+    # Add prefix to column names using single source of truth
     if id is not None:
         # Rename columns with ID prefix
-        result.columns = [f"{id}_raster_{col}" for col in result.columns]
+        result.columns = [
+            get_csv_column_name(f"raster-{col}", ax_row, ax_col, trace_id=trace_id)
+            for col in result.columns
+        ]
 
     return result

scitex/plt/_subplots/_export_as_csv_formatters/_format_stx_scatter.py

@@ -0,0 +1,51 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""CSV formatter for stx_scatter() calls."""
+
+import pandas as pd
+from scitex.plt.utils._csv_column_naming import get_csv_column_name
+from ._format_plot import _parse_tracking_id
+
+
+def _format_stx_scatter(id, tracked_dict, kwargs):
+    """Format data from stx_scatter call for CSV export.
+
+    Parameters
+    ----------
+    id : str
+        Tracking identifier
+    tracked_dict : dict
+        Dictionary containing tracked data with 'scatter_df' key
+    kwargs : dict
+        Additional keyword arguments (unused)
+
+    Returns
+    -------
+    pd.DataFrame
+        Formatted scatter data with standardized column names
+    """
+    if not tracked_dict or not isinstance(tracked_dict, dict):
+        return pd.DataFrame()
+
+    ax_row, ax_col, trace_id = _parse_tracking_id(id)
+
+    # Get scatter_df from tracked data
+    scatter_df = tracked_dict.get("scatter_df")
+    if scatter_df is not None and isinstance(scatter_df, pd.DataFrame):
+        result = scatter_df.copy()
+        renamed = {}
+        for col in result.columns:
+            renamed[col] = get_csv_column_name(col, ax_row, ax_col, trace_id=trace_id)
+        return result.rename(columns=renamed)
+
+    # Fallback to args if scatter_df not found
+    args = tracked_dict.get("args", [])
+    if len(args) >= 2:
+        col_x = get_csv_column_name("x", ax_row, ax_col, trace_id=trace_id)
+        col_y = get_csv_column_name("y", ax_row, ax_col, trace_id=trace_id)
+        return pd.DataFrame({col_x: args[0], col_y: args[1]})
+
+    return pd.DataFrame()
+
+
+# EOF

scitex/plt/_subplots/_export_as_csv_formatters/_format_stx_scatter_hist.py

@@ -12,6 +12,9 @@ __DIR__ = os.path.dirname(__FILE__)
 import numpy as np
 import pandas as pd
 
+from scitex.plt.utils._csv_column_naming import get_csv_column_name
+from ._format_plot import _parse_tracking_id
+
 
 def _format_plot_scatter_hist(id, tracked_dict, kwargs):
     """Format data from a stx_scatter_hist call.
@@ -28,13 +31,19 @@ def _format_plot_scatter_hist(id, tracked_dict, kwargs):
     if not tracked_dict or not isinstance(tracked_dict, dict):
         return pd.DataFrame()
 
+    # Parse tracking ID to extract axes position and trace ID
+    ax_row, ax_col, trace_id = _parse_tracking_id(id)
+
     # Extract data from tracked_dict
     x = tracked_dict.get("x")
     y = tracked_dict.get("y")
 
     if x is not None and y is not None:
         # Create base DataFrame with x and y values
-        df = pd.DataFrame({f"{id}_scatter_hist_x": x, f"{id}_scatter_hist_y": y})
+        df = pd.DataFrame({
+            get_csv_column_name("scatter_hist_x", ax_row, ax_col, trace_id=trace_id): x,
+            get_csv_column_name("scatter_hist_y", ax_row, ax_col, trace_id=trace_id): y,
+        })
 
         # Add histogram data if available
         hist_x = tracked_dict.get("hist_x")
@@ -50,15 +59,15 @@ def _format_plot_scatter_hist(id, tracked_dict, kwargs):
             # Create a DataFrame for x histogram data
             hist_x_df = pd.DataFrame(
                 {
-                    f"{id}_hist_x_bin_centers": bin_centers_x,
-                    f"{id}_hist_x_counts": hist_x,
+                    get_csv_column_name("hist_x_bin_centers", ax_row, ax_col, trace_id=trace_id): bin_centers_x,
+                    get_csv_column_name("hist_x_counts", ax_row, ax_col, trace_id=trace_id): hist_x,
                 }
             )
 
             # Add it to the main DataFrame using a MultiIndex
             for i, (center, count) in enumerate(zip(bin_centers_x, hist_x)):
-                df.loc[f"hist_x_{i}", f"{id}_hist_x_bin"] = center
-                df.loc[f"hist_x_{i}", f"{id}_hist_x_count"] = count
+                df.loc[f"hist_x_{i}", get_csv_column_name("hist_x_bin", ax_row, ax_col, trace_id=trace_id)] = center
+                df.loc[f"hist_x_{i}", get_csv_column_name("hist_x_count", ax_row, ax_col, trace_id=trace_id)] = count
 
         # If we have y histogram data
         if hist_y is not None and bin_edges_y is not None:
@@ -68,15 +77,15 @@ def _format_plot_scatter_hist(id, tracked_dict, kwargs):
             # Create a DataFrame for y histogram data
             hist_y_df = pd.DataFrame(
                 {
-                    f"{id}_hist_y_bin_centers": bin_centers_y,
-                    f"{id}_hist_y_counts": hist_y,
+                    get_csv_column_name("hist_y_bin_centers", ax_row, ax_col, trace_id=trace_id): bin_centers_y,
+                    get_csv_column_name("hist_y_counts", ax_row, ax_col, trace_id=trace_id): hist_y,
                 }
             )
 
             # Add it to the main DataFrame using a MultiIndex
             for i, (center, count) in enumerate(zip(bin_centers_y, hist_y)):
-                df.loc[f"hist_y_{i}", f"{id}_hist_y_bin"] = center
-                df.loc[f"hist_y_{i}", f"{id}_hist_y_count"] = count
+                df.loc[f"hist_y_{i}", get_csv_column_name("hist_y_bin", ax_row, ax_col, trace_id=trace_id)] = center
+                df.loc[f"hist_y_{i}", get_csv_column_name("hist_y_count", ax_row, ax_col, trace_id=trace_id)] = count
 
         return df
 

scitex/plt/ax/_plot/_stx_ecdf.py

@@ -5,16 +5,18 @@
 
 """Empirical Cumulative Distribution Function (ECDF) plotting."""
 
-import warnings
 from typing import Any, Tuple, Union
 
 import numpy as np
 import pandas as pd
 from matplotlib.axes import Axes
 
+from scitex import logging
 from scitex.pd._force_df import force_df as scitex_pd_force_df
 from ....plt.utils import assert_valid_axis, mm_to_pt
 
+logger = logging.getLogger(__name__)
+
 
 # Default line width (0.2mm for publication)
 DEFAULT_LINE_WIDTH_MM = 0.2
@@ -68,7 +70,7 @@ def stx_ecdf(
 
     # Warnings
     if np.isnan(values_1d).any():
-        warnings.warn("NaN value are ignored for ECDF plot.")
+        logger.warning("NaN values are ignored for ECDF plot.")
     values_1d = values_1d[~np.isnan(values_1d)]
     nn = len(values_1d)