batplot 1.1.0__tar.gz → 1.1.2__tar.gz

{batplot-1.1.0 → batplot-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: batplot
-Version: 1.1.0
+Version: 1.1.2
 Summary: Interactive plotting for XRD, PDF, and XAS data (.xye, .xy, .qye, .dat, .csv, .gr, .nor, .chik, .chir)
 Author-email: Tian Dai <tianda@uio.no>
 License: MIT License
@@ -55,10 +55,10 @@ Dynamic: license-file
 
 ## Features
 
-- **Electrochemistry Modes**: Galvanostatic cycling (GC), cyclic voltammetry (CV), differential capacity (dQdV), chronopotentiometry (CPC)
+- **Electrochemistry Modes**: Galvanostatic cycling (GC), cyclic voltammetry (CV), differential capacity (dQdV), capacity per cycle (CPC) with multi-file support
 - **Structural Characterization**: XRD, PDF, XAS (XANES/EXAFS)
 - **Operando Analysis**: Correlate in-situ structural changes with electrochemical data
-- **Interactive Menu**: Real-time styling, cycle visibility control, color customization
+- **Interactive Menu**: Real-time styling, cycle visibility control, individual color customization for multi-file plots
 - **Session Persistence**: Save and reload complete plot states with `.pkl` files
 - **Style Management**: Import/export plot styles as `.bpcfg` files
 - **Batch Processing**: Plot multiple files simultaneously with automatic SVG export
@@ -96,9 +96,12 @@ batplot cyclic.mpt --cv --interactive
 # Differential capacity
 batplot battery.csv --dqdv
 
-# Chronopotentiometry with mass normalization
+# Capacity per cycle - single file
 batplot stability.mpt --cpc --mass 5.4 --interactive
 
+# Capacity per cycle - multiple files with individual color control
+batplot file1.csv file2.csv file3.mpt --cpc --mass 5.4 --interactive
+
 # Batch processing: export all EC files to SVG
 batplot --gc all         # All .mpt/.csv files (.mpt needs --mass, .csv doesn't)
 batplot --cv all                    # All .mpt files (CV mode)

{batplot-1.1.0 → batplot-1.1.2}/README.md

@@ -6,10 +6,10 @@
 
 ## Features
 
-- **Electrochemistry Modes**: Galvanostatic cycling (GC), cyclic voltammetry (CV), differential capacity (dQdV), chronopotentiometry (CPC)
+- **Electrochemistry Modes**: Galvanostatic cycling (GC), cyclic voltammetry (CV), differential capacity (dQdV), capacity per cycle (CPC) with multi-file support
 - **Structural Characterization**: XRD, PDF, XAS (XANES/EXAFS)
 - **Operando Analysis**: Correlate in-situ structural changes with electrochemical data
-- **Interactive Menu**: Real-time styling, cycle visibility control, color customization
+- **Interactive Menu**: Real-time styling, cycle visibility control, individual color customization for multi-file plots
 - **Session Persistence**: Save and reload complete plot states with `.pkl` files
 - **Style Management**: Import/export plot styles as `.bpcfg` files
 - **Batch Processing**: Plot multiple files simultaneously with automatic SVG export
@@ -47,9 +47,12 @@ batplot cyclic.mpt --cv --interactive
 # Differential capacity
 batplot battery.csv --dqdv
 
-# Chronopotentiometry with mass normalization
+# Capacity per cycle - single file
 batplot stability.mpt --cpc --mass 5.4 --interactive
 
+# Capacity per cycle - multiple files with individual color control
+batplot file1.csv file2.csv file3.mpt --cpc --mass 5.4 --interactive
+
 # Batch processing: export all EC files to SVG
 batplot --gc all         # All .mpt/.csv files (.mpt needs --mass, .csv doesn't)
 batplot --cv all                    # All .mpt files (CV mode)

{batplot-1.1.0 → batplot-1.1.2}/batplot/args.py

@@ -14,23 +14,28 @@ def _print_general_help() -> None:
         "  • EC: GC/CPC/dQdV/CV (from .csv or .mpt)\n"
         "  • Operando: contour maps from a folder of normalized XY and .mpt files\n"
         "  • Batch: export SVG plots for all files in a directory\n\n"
-        "How to run (basics):\n"
-        "  batplot file1.xy file2.qye [option1] [option2]             # XY curves\n"
-        "  batplot all                            # Batch mode: all XY files in current directory\n"
-        "  batplot --gc FILE.mpt --mass 7.0       # EC GC from .mpt (requires --mass mg)\n"
-        "  batplot --gc FILE.csv                  # EC GC from supported .csv (no mass required)\n"
-        "  batplot --gc all --mass 7.0            # Batch: all .mpt/.csv in directory (.mpt needs --mass)\n"
-        "  batplot --dqdv FILE.csv                # EC dQ/dV from supported .csv\n"
-        "  batplot --dqdv all                     # Batch: all .csv in directory (dQdV mode)\n"
-        "  batplot --cv FILE.mpt                  # EC CV (cyclic voltammetry) from .mpt\n"
-        "  batplot --cv all                       # Batch: all .mpt in directory (CV mode)\n"
-        "  batplot --operando [FOLDER]            # Operando contour from folder\n\n"
-        "  [options]\n"
+        "  • Interactive mode: --interactive flag opens a menu for styling, ranges, fonts, export, sessions\n\n"
+    "How to run (basics):\n"
+    "  [XY curves]\n"
+    "    batplot file1.xy file2.qye [option1] [option2]             # XY curves\n"
+    "    batplot all                            # Batch mode: all XY files in current directory\n\n"
+    "  [Electrochemistry]\n"
+    "    batplot --gc FILE.mpt --mass 7.0       # EC GC from .mpt (requires --mass mg)\n"
+    "    batplot --gc FILE.csv                  # EC GC from supported .csv (no mass required)\n"
+    "    batplot --gc all --mass 7.0            # Batch: all .mpt/.csv in directory (.mpt needs --mass)\n"
+    "    batplot --dqdv FILE.csv                # EC dQ/dV from supported .csv\n"
+    "    batplot --dqdv all                     # Batch: all .csv in directory (dQdV mode)\n"
+    "    batplot --cv FILE.mpt                  # EC CV (cyclic voltammetry) from .mpt\n"
+    "    batplot --cv FILE.txt                  # EC CV (cyclic voltammetry) from .txt\n"
+    "    batplot --cv all                       # Batch: all .mpt/.txt in directory (CV mode)\n\n"
+    "  [Operando]\n"
+    "    batplot --operando [FOLDER]            # Operando contour from folder\n\n"
         "Features:\n"
         "  • Quick plotting with sensible defaults, no config files needed\n"
         "  • Supports many common file formats (see -h xy/ec/op)\n"
         "  • Interactive menus (--interactive): styling, ranges, fonts, export, sessions\n"
         "  • Batch processing: use 'all' or directory path with any mode\n\n"
+    
         "More help:\n"
         "  batplot -h xy   # XY file plotting guide\n"
         "  batplot -h ec   # Electrochemistry (GC/dQdV/CV/CPC) guide\n"
@@ -47,12 +52,19 @@ def _print_xy_help() -> None:
         "If mixing 2θ data in Q, give wavelength per-file (file.xye:1.5406) or global --wl.\n\n"
         "Examples:\n"
         "  batplot a.xye:1.5406 b.qye --stack --interactive\n"
-        "  batplot a.dat b.xy --xaxis 2theta --wl 1.54 --out fig.svg\n"
+        "  batplot a.dat b.xy --wl 1.54 --out fig.svg\n"
         "  batplot pattern.qye ticks.cif --interactive\n\n"
-        "Tips:\n"
-        "  --delta/-d spacing between curves; --raw for raw intensity; --xrange min max; --out fig.svg\n"
-        "  Interactive menu: colors, fonts, lines, ticks, ranges, CIF hkl (z), style print/export/import, save.\n"
-        "  • CIF ticks/labels for diffraction, style import/export (.bpcfg), session save/load (.pkl)\n\n"
+        "Tips and options:\n"
+        "[XY plot]\n"
+    "  --interactive             : open interactive menu for styling, ranges, fonts, export, sessions\n"
+    "  --delta/-d <float>        : spacing between curves, e.g. --delta 0.1\n"
+    "  --raw                     : plot raw intensity (normalized by default)\n"
+    "  --xrange/-r <min> <max>   : set x-axis range, e.g. --xrange 0 10\n"
+    "  --out/-o <filename>       : save figure to file, e.g. --out file.svg\n"
+    "  --xaxis <type>            : set x-axis type (Q, 2theta, r, k, energy, rft, or user defined), e.g. --xaxis 2theta\n"
+    "  --wl <float>              : set wavelength for Q conversion for all files, e.g. --wl 1.5406\n"
+    "  --fullprof <args>         : FullProf overlay options\n"
+    "  --stack                   : stack curves vertically\n"
     )
     print(msg)
 
@@ -60,20 +72,24 @@ def _print_xy_help() -> None:
 def _print_ec_help() -> None:
     msg = (
         "Electrochemistry (GC, dQ/dV, CV, and CPC)\n\n"
+        "Use --interactive for styling, colors, line widths, axis scales, etc.\n"
         "GC from .mpt: requires active mass in mg to compute mAh g⁻¹.\n"
         "  batplot --gc file.mpt --mass 6.5 --interactive\n\n"
         "GC from supported .csv: specific capacity is read directly (no --mass).\n"
         "  batplot --gc file.csv\n\n"
         "dQ/dV from supported .csv:\n"
         "  batplot --dqdv file.csv\n\n"
-        "Cyclic voltammetry (CV) from .mpt: plots voltage vs current for each cycle.\n"
-        "  batplot --cv file.mpt\n\n"
-        "Capacity-per-cycle (CPC) with coulombic efficiency from .csv or .mpt (for .mpt, provide --mass mg):\n"
+        "Cyclic voltammetry (CV) from .mpt or .txt: plots voltage vs current for each cycle.\n"
+        "  batplot --cv file.mpt\n"
+        "  batplot --cv file.txt\n\n"
+        "Capacity-per-cycle (CPC) with coulombic efficiency from .csv or .mpt.\n"
+        "Supports multiple files with individual color customization:\n"
         "  batplot --cpc file.csv\n"
-        "  batplot --cpc file.mpt --mass 1.2\n\n"
+        "  batplot --cpc file.mpt --mass 1.2\n"
+        "  batplot --cpc file1.csv file2.csv file3.mpt --mass 1.2 --interactive\n"
         "Batch mode: Process all files in a directory and export to SVG.\n"
         "  batplot --gc all --mass 7.0            # All .mpt/.csv files (.mpt requires --mass)\n"
-        "  batplot --cv all                       # All .mpt files (CV mode)\n"
+        "  batplot --cv all                       # All .mpt/.txt files (CV mode)\n"
         "  batplot --dqdv all                     # All .csv files (dQdV mode)\n"
         "  batplot --cpc all --mass 5.4           # All .mpt/.csv files (.mpt requires --mass)\n"
         "  batplot --gc /path/to/folder --mass 6  # Process specific directory\n\n"

{batplot-1.1.0 → batplot-1.1.2}/batplot/batch.py

@@ -184,7 +184,7 @@ def batch_process_ec(directory: str, args):
         supported_ext = {'.mpt', '.csv'}
     elif getattr(args, 'cv', False):
         mode = 'cv'
-        supported_ext = {'.mpt'}
+        supported_ext = {'.mpt', '.txt'}
     elif getattr(args, 'dqdv', False):
         mode = 'dqdv'
         supported_ext = {'.csv'}
@@ -230,11 +230,11 @@ def batch_process_ec(directory: str, args):
                     specific_capacity, voltage, cycle_numbers, charge_mask, discharge_mask = \
                         read_mpt_file(fpath, mode='gc', mass_mg=mass_mg)
                     cap_x = specific_capacity
-                    x_label = 'Specific Capacity (mAh g⁻¹)'
+                    x_label = r'Specific Capacity (mAh g$^{-1}$)'
                 elif ext == '.csv':
                     cap_x, voltage, cycle_numbers, charge_mask, discharge_mask = \
                         read_ec_csv_file(fpath, prefer_specific=True)
-                    x_label = 'Specific Capacity (mAh g⁻¹)'
+                    x_label = r'Specific Capacity (mAh g$^{-1}$)'
                 else:
                     raise ValueError(f"Unsupported file type for GC: {ext}")
                 
@@ -274,10 +274,14 @@ def batch_process_ec(directory: str, args):
             
             # ---- CV Mode ----
             elif mode == 'cv':
-                if ext != '.mpt':
-                    raise ValueError("CV mode requires .mpt file")
+                if ext == '.txt':
+                    from .readers import read_biologic_txt_file
+                    voltage, current, cycles = read_biologic_txt_file(fpath, mode='cv')
+                elif ext == '.mpt':
+                    voltage, current, cycles = read_mpt_file(fpath, mode='cv')
+                else:
+                    raise ValueError("CV mode requires .mpt or .txt file")
                 
-                voltage, current, cycles = read_mpt_file(fpath, mode='cv')
                 cyc_int_raw = np.array(np.rint(cycles), dtype=int)
                 if cyc_int_raw.size:
                     min_c = int(np.min(cyc_int_raw))
@@ -307,7 +311,7 @@ def batch_process_ec(directory: str, args):
                 voltage, dqdv = read_ec_csv_dqdv_file(fpath)
                 ax_b.plot(voltage, dqdv, '-', color='#1f77b4', linewidth=1.5)
                 ax_b.set_xlabel('Voltage (V)')
-                ax_b.set_ylabel('dQ/dV (mAh g⁻¹ V⁻¹)')
+                ax_b.set_ylabel(r'dQ/dV (mAh g$^{-1}$ V$^{-1}$)')
                 ax_b.set_title(f"{fname}")
             
             # ---- CPC Mode ----
@@ -320,7 +324,7 @@ def batch_process_ec(directory: str, args):
                         continue
                     cyc_nums, cap_charge, cap_discharge, eff = \
                         read_mpt_file(fpath, mode='cpc', mass_mg=mass_mg)
-                    x_label = 'Specific Capacity (mAh g⁻¹)'
+                    x_label = r'Specific Capacity (mAh g$^{-1}$)'
                 elif ext == '.csv':
                     # For CSV CPC, read as GC-like data
                     cap_x, voltage, cycle_numbers, charge_mask, discharge_mask = \
@@ -349,7 +353,7 @@ def batch_process_ec(directory: str, args):
                         cyc_nums = np.array([1])
                         cap_charge = np.array([0])
                         cap_discharge = np.array([0])
-                    x_label = 'Specific Capacity (mAh g⁻¹)'
+                    x_label = r'Specific Capacity (mAh g$^{-1}$)'
                 else:
                     raise ValueError(f"Unsupported file type for CPC: {ext}")
                 

{batplot-1.1.0 → batplot-1.1.2}/batplot/batplot.py

@@ -112,14 +112,19 @@ def batplot_main() -> int:
         import os as _os
         import matplotlib.pyplot as _plt
         if len(args.files) != 1:
-            print("CV mode: provide exactly one .mpt file.")
+            print("CV mode: provide exactly one file (.mpt or .txt).")
             exit(1)
         ec_file = args.files[0]
         if not _os.path.isfile(ec_file):
             print(f"File not found: {ec_file}")
             exit(1)
         try:
-            voltage, current, cycles = read_mpt_file(ec_file, mode='cv')
+            # Support both .mpt and .txt formats
+            if ec_file.lower().endswith('.txt'):
+                from .readers import read_biologic_txt_file
+                voltage, current, cycles = read_biologic_txt_file(ec_file, mode='cv')
+            else:
+                voltage, current, cycles = read_mpt_file(ec_file, mode='cv')
             # Normalize cycle indices to start at 1
             # Find the first cycle with at least 2 data points (needed for plotting)
             cyc_int_raw = np.array(np.rint(cycles), dtype=int)
@@ -330,12 +335,12 @@ def batplot_main() -> int:
                     print("Example: batplot file.mpt --gc --mass 7.0")
                     exit(1)
                 specific_capacity, voltage, cycle_numbers, charge_mask, discharge_mask = read_mpt_file(ec_file, mode='gc', mass_mg=mass_mg)
-                x_label_gc = 'Specific Capacity (mAh g⁻¹)'
+                x_label_gc = r'Specific Capacity (mAh g$^{-1}$)'
                 cap_x = specific_capacity
             elif ec_file.lower().endswith('.csv'):
                 # For supported CSV export, use specific capacity directly when available (no mass required)
                 cap_x, voltage, cycle_numbers, charge_mask, discharge_mask = read_ec_csv_file(ec_file, prefer_specific=True)
-                x_label_gc = 'Specific Capacity (mAh g⁻¹)'
+                x_label_gc = r'Specific Capacity (mAh g$^{-1}$)'
             else:
                 print("GC mode: file must be .mpt or .csv")
                 exit(1)
@@ -573,81 +578,143 @@ def batplot_main() -> int:
         import os as _os
         import numpy as _np
 
-        if len(args.files) != 1:
-            print("CPC mode: provide exactly one file (.csv or .mpt).")
-            exit(1)
-        ec_file = args.files[0]
-        if not _os.path.isfile(ec_file):
-            print(f"File not found: {ec_file}")
+        if len(args.files) < 1:
+            print("CPC mode: provide at least one file (.csv or .mpt).")
             exit(1)
+        
+        # Process multiple files
+        file_data = []  # List of dicts with file info and data
+        # Use Viridis colormap for capacity (charge/discharge) - spreads from purple to yellow
+        # Use Plasma colormap for efficiency - spreads from purple to yellow-pink
+        import matplotlib.cm as cm
+        import matplotlib.colors as mcolors
+        n_files = len(args.files)
+        viridis = cm.get_cmap('viridis', n_files)
+        plasma = cm.get_cmap('plasma', n_files)
+        
+        # Generate colors from colormaps
+        capacity_colors = [mcolors.rgb2hex(viridis(i)[:3]) for i in range(n_files)]
+        efficiency_colors = [mcolors.rgb2hex(plasma(i)[:3]) for i in range(n_files)]
+        
+        for file_idx, ec_file in enumerate(args.files):
+            if not _os.path.isfile(ec_file):
+                print(f"File not found: {ec_file}")
+                continue
 
-        ext = _os.path.splitext(ec_file)[1].lower()
-        if ext == '.csv':
-            try:
-                cap_x, voltage, cycles, chg_mask, dchg_mask = _bp_read_ec_csv(ec_file, prefer_specific=True)
-            except Exception as e:
-                print(f"Failed to read EC CSV: {e}")
-                exit(1)
-            cyc = _np.array(cycles, dtype=int)
-            unique_cycles = _np.unique(cyc)
-            unique_cycles = unique_cycles[_np.isfinite(unique_cycles)]
-            unique_cycles = [int(x) for x in unique_cycles]
-            if not unique_cycles:
-                unique_cycles = [1]
-            cyc_nums = []
-            cap_charge = []
-            cap_discharge = []
-            eff = []
-            for c in sorted(unique_cycles):
-                m_c = (cyc == c)
-                qchg = _np.nanmax(cap_x[m_c & chg_mask]) if _np.any(m_c & chg_mask) else _np.nan
-                qdch = _np.nanmax(cap_x[m_c & dchg_mask]) if _np.any(m_c & dchg_mask) else _np.nan
-                eta = (qdch / qchg * 100.0) if (_np.isfinite(qchg) and qchg > 0 and _np.isfinite(qdch)) else _np.nan
-                cyc_nums.append(c)
-                cap_charge.append(qchg)
-                cap_discharge.append(qdch)
-                eff.append(eta)
-            cyc_nums = _np.array(cyc_nums, dtype=float)
-            cap_charge = _np.array(cap_charge, dtype=float)
-            cap_discharge = _np.array(cap_discharge, dtype=float)
-            eff = _np.array(eff, dtype=float)
-        elif ext == '.mpt':
-            mass_mg = getattr(args, 'mass', None)
-            if mass_mg is None:
-                print("CPC mode (.mpt): --mass parameter is required (active material mass in mg).")
-                print("Example: batplot data.mpt --cpc --mass 1.2 --interactive")
-                exit(1)
+            ext = _os.path.splitext(ec_file)[1].lower()
+            file_basename = _os.path.basename(ec_file)
+            
             try:
-                cyc_nums, cap_charge, cap_discharge, eff = read_mpt_file(ec_file, mode='cpc', mass_mg=mass_mg)
+                if ext == '.csv':
+                    cap_x, voltage, cycles, chg_mask, dchg_mask = read_ec_csv_file(ec_file, prefer_specific=True)
+                    cyc = _np.array(cycles, dtype=int)
+                    unique_cycles = _np.unique(cyc)
+                    unique_cycles = unique_cycles[_np.isfinite(unique_cycles)]
+                    unique_cycles = [int(x) for x in unique_cycles]
+                    if not unique_cycles:
+                        unique_cycles = [1]
+                    cyc_nums = []
+                    cap_charge = []
+                    cap_discharge = []
+                    eff = []
+                    for c in sorted(unique_cycles):
+                        m_c = (cyc == c)
+                        qchg = _np.nanmax(cap_x[m_c & chg_mask]) if _np.any(m_c & chg_mask) else _np.nan
+                        qdch = _np.nanmax(cap_x[m_c & dchg_mask]) if _np.any(m_c & dchg_mask) else _np.nan
+                        eta = (qdch / qchg * 100.0) if (_np.isfinite(qchg) and qchg > 0 and _np.isfinite(qdch)) else _np.nan
+                        cyc_nums.append(c)
+                        cap_charge.append(qchg)
+                        cap_discharge.append(qdch)
+                        eff.append(eta)
+                    cyc_nums = _np.array(cyc_nums, dtype=float)
+                    cap_charge = _np.array(cap_charge, dtype=float)
+                    cap_discharge = _np.array(cap_discharge, dtype=float)
+                    eff = _np.array(eff, dtype=float)
+                elif ext == '.mpt':
+                    mass_mg = getattr(args, 'mass', None)
+                    if mass_mg is None:
+                        print(f"Skipped {file_basename}: CPC mode (.mpt) requires --mass parameter.")
+                        continue
+                    cyc_nums, cap_charge, cap_discharge, eff = read_mpt_file(ec_file, mode='cpc', mass_mg=mass_mg)
+                else:
+                    print(f"Skipped {file_basename}: unsupported format (must be .csv or .mpt)")
+                    continue
+                
+                # Assign colors: distinct hue for each file
+                capacity_color = capacity_colors[file_idx % len(capacity_colors)]
+                efficiency_color = efficiency_colors[file_idx % len(efficiency_colors)]
+                
+                file_data.append({
+                    'filename': file_basename,
+                    'filepath': ec_file,
+                    'cyc_nums': cyc_nums,
+                    'cap_charge': cap_charge,
+                    'cap_discharge': cap_discharge,
+                    'eff': eff,
+                    'color': capacity_color,
+                    'eff_color': efficiency_color,
+                    'visible': True
+                })
+                
             except Exception as e:
-                print(f"Failed to read .mpt for CPC: {e}")
-                exit(1)
-        else:
-            print("CPC mode: file must be .csv or .mpt")
+                print(f"Failed to read {file_basename}: {e}")
+                continue
+        
+        if not file_data:
+            print("No valid CPC data files to plot.")
             exit(1)
 
         # Plot (same figsize as GC)
         fig, ax = plt.subplots(figsize=(10, 6))
-        col_chg = '#1f77b4'  # blue
-        col_dch = '#d62728'  # red
-        sc_charge = ax.scatter(cyc_nums, cap_charge, color=col_chg, label='Charge capacity', s=32, zorder=3)
-        sc_discharge = ax.scatter(cyc_nums, cap_discharge, color=col_dch, label='Discharge capacity', s=32, zorder=3)
         ax.set_xlabel('Cycle number', labelpad=8.0)
-        ax.set_ylabel('Specific Capacity (mAh g⁻¹)', labelpad=8.0)
+        ax.set_ylabel(r'Specific Capacity (mAh g$^{-1}$)', labelpad=8.0)
         ax.grid(True, alpha=0.25, linestyle='--', linewidth=0.8)
-        ax.legend(loc='best')
 
         ax2 = ax.twinx()
-        sc_eff = ax2.scatter(cyc_nums, eff, color='#2ca02c', marker='^', label='Coulombic efficiency', s=40, alpha=0.85, zorder=3)
         ax2.set_ylabel('Efficiency (%)', labelpad=8.0)
-        # Nice y range for efficiency if present
-        if _np.isfinite(eff).any():
-            lo = _np.nanmin(eff)
-            hi = _np.nanmax(eff)
-            pad = max(1.0, 0.05 * max(1.0, hi - lo))
-            ax2.set_ylim(max(0.0, lo - pad), min(110.0, hi + pad))
-
-        # Compose a combined legend with extra padding to avoid touching curves
+        
+        # Create scatter plots for each file
+        for file_info in file_data:
+            cyc_nums = file_info['cyc_nums']
+            cap_charge = file_info['cap_charge']
+            cap_discharge = file_info['cap_discharge']
+            eff = file_info['eff']
+            color = file_info['color']  # Warm color for capacity
+            eff_color = file_info['eff_color']  # Cold color for efficiency
+            label = file_info['filename']
+            
+            # For single file, use simple labels; for multiple files, prefix with filename
+            if len(file_data) == 1:
+                label_chg = 'Charge capacity'
+                label_dch = 'Discharge capacity'
+                label_eff = 'Coulombic efficiency'
+            else:
+                label_chg = f'{label} (Chg)'
+                label_dch = f'{label} (Dch)'
+                label_eff = f'{label} (Eff)'
+            
+            # Use slightly different shades for charge/discharge from same file
+            from matplotlib.colors import to_rgb
+            rgb = to_rgb(color)
+            # Discharge: darker shade of the warm color
+            discharge_color = tuple(max(0, c * 0.7) for c in rgb)
+            
+            sc_charge = ax.scatter(cyc_nums, cap_charge, color=color, label=label_chg, 
+                                  s=32, zorder=3, alpha=0.8, marker='o')
+            sc_discharge = ax.scatter(cyc_nums, cap_discharge, color=discharge_color, label=label_dch, 
+                                     s=32, zorder=3, alpha=0.8, marker='s')
+            sc_eff = ax2.scatter(cyc_nums, eff, color=eff_color, marker='^', label=label_eff, 
+                               s=40, alpha=0.7, zorder=3)
+            
+            # Store scatter artists in file_info for interactive menu
+            file_info['sc_charge'] = sc_charge
+            file_info['sc_discharge'] = sc_discharge
+            file_info['sc_eff'] = sc_eff
+
+        # Set efficiency y-range to 0-120 by default
+        ax2.set_ylim(0, 120)
+
+        # Compose a combined legend
         try:
             h1, l1 = ax.get_legend_handles_labels()
             h2, l2 = ax2.get_legend_handles_labels()
@@ -655,7 +722,7 @@ def batplot_main() -> int:
         except Exception:
             pass
 
-        # Adjust layout to ensure top and bottom labels/titles are visible (same as GC)
+        # Adjust layout to ensure top and bottom labels/titles are visible
         fig.subplots_adjust(left=0.12, right=0.88, top=0.88, bottom=0.15)
     
         if args.interactive and cpc_interactive_menu is not None:
@@ -679,7 +746,20 @@ def batplot_main() -> int:
                     pass
                 plt.show(block=False)
                 try:
-                    cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff)
+                    # Pass file_data for multi-file support, but keep backward compatibility
+                    if len(file_data) == 1:
+                        # Single file: use original signature
+                        cpc_interactive_menu(fig, ax, ax2, 
+                                           file_data[0]['sc_charge'], 
+                                           file_data[0]['sc_discharge'], 
+                                           file_data[0]['sc_eff'])
+                    else:
+                        # Multiple files: pass file_data list
+                        cpc_interactive_menu(fig, ax, ax2, 
+                                           file_data[0]['sc_charge'], 
+                                           file_data[0]['sc_discharge'], 
+                                           file_data[0]['sc_eff'],
+                                           file_data=file_data)
                 except Exception as _ie:
                     print(f"CPC interactive menu failed: {_ie}")
                 # Keep window open after menu
@@ -1185,9 +1265,9 @@ def batplot_main() -> int:
                 else:
                     # Keep canvas size as current; avoid surprising resize on load
                     pass
-            if 'dpi' in fig_cfg:
-                try: fig.set_dpi(int(fig_cfg['dpi']))
-                except Exception: pass
+            # Don't restore saved DPI - use system default to avoid display-dependent issues
+            # (Retina displays, Windows scaling, etc. can cause saved DPI to differ)
+            # Keeping figure size in inches ensures consistent appearance across platforms
         except Exception:
             pass
         # Restore spines (linewidth, color, visibility) and subplot margins/tick widths (for CLI .pkl load)