solarc-eclipse 0.6.1.2__tar.gz → 0.6.1.4__tar.gz

{solarc_eclipse-0.6.1.2/solarc_eclipse.egg-info → solarc_eclipse-0.6.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: solarc-eclipse
-Version: 0.6.1.2
+Version: 0.6.1.4
 Summary: ECLIPSE: Emission Calculation and Line Prediction for SOLAR-C EUVST
 Home-page: https://github.com/jamesmckevitt/eclipse
 Author: James McKevitt
@@ -29,6 +29,13 @@ Requires-Dist: dill
 Requires-Dist: pyyaml
 Requires-Dist: reproject
 Requires-Dist: sunpy[all]
+Requires-Dist: dask
+Requires-Dist: psutil
+Requires-Dist: mendeleev
+Requires-Dist: h5py
+Requires-Dist: fiasco
+Provides-Extra: mpi
+Requires-Dist: mpi4py; extra == "mpi"
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"
@@ -71,7 +78,7 @@ After installation, you can run ECLIPSE from the command line:
 
 ```bash
 # Run synthesis script (convert 3D MHD data to synthetic spectra)
-synthesise-spectra --data-dir ./data/atmosphere --goft-file ./data/gofnt.sav --output-dir ./run/input
+synthesise-spectra --data-dir ./data/atmosphere --lines Fe12_195.1190 --output-dir ./run/input
 
 # Run instrument response simulation
 eclipse --config ./run/input/config.yaml
@@ -95,7 +102,7 @@ detector = Detector_SWC()
 print(f"Telescope collecting area: {telescope.collecting_area:.4f}")
 print(f"Detector QE (EUV): {detector.qe_euv:.2f}")
 
-# Calculate effective area at Fe XII 195.119 Å
+# Calculate effective area at Fe XII 195.119 Angstrom
 fe12_wl = 195.119 * u.AA
 effective_area = telescope.collecting_area * telescope.throughput(fe12_wl) * detector.qe_euv
 
@@ -125,22 +132,24 @@ from euvst_response import (
     create_sunpy_maps_from_combo,
     summary_table
 )
-```
-
-## Detailed instructions
 
-### 1. Generate contribution functions for the desired emission lines
+# Load results
+results = load_instrument_response_results("run/result/my_results.pkl")
 
-Edit `make_gofnt.pro` to specify the desired emission lines and the location of the CHIANTI files. You can use CHIANTI to identify the required lines.
+# Get results for a specific parameter combination:
+combo = get_results_for_combination(
+    results, exposure=40*u.s, slit_width=0.4*u.arcsec, offchip_bin_slit=2
+)
 
-Run the following command:
-```bash
-idl -e "make_goft"
+# Create SunPy maps
+maps = create_sunpy_maps_from_combo(combo, rest_wavelength=195.119*u.AA, data_type='dn')
 ```
 
-### 2. Run the line synthesis
+## Detailed instructions
+
+### 1. Run the line synthesis
 
-The synthesis script converts 3D MHD simulation data into synthetic solar spectra. It can be run directly from the command line with extensive configuration options.
+The synthesis script converts 3D MHD simulation data into synthetic solar spectra. Contribution functions G(T, n_e) are computed on-the-fly using [fiasco](https://fiasco.readthedocs.io/) (a Python interface to the CHIANTI atomic database).
 
 #### Basic Usage
 
@@ -148,7 +157,9 @@ The synthesis script converts 3D MHD simulation data into synthetic solar spectr
 # Example using all available command line options
 synthesise-spectra \
   --data-dir ./data/atmosphere \
-  --goft-file ./data/gofnt.sav \
+  --lines Fe12_195.1190 Fe12_195.1790 \
+  --abundance sun_coronal_2021_chianti \
+  --n-workers 4 \
   --output-dir ./run/input \
   --output-name synthesised_spectra.pkl \
   --temp-file temp/eosT.0270000 \
@@ -168,8 +179,7 @@ synthesise-spectra \
   --crop-z "0 Mm" "20 Mm" \
   --downsample 1 \
   --precision float64 \
-  --mean-mol-wt 1.29 \
-  --limit-lines Fe12_195.1190
+  --mean-mol-wt 1.29
 
 # Show all available options
 synthesise-spectra --help
@@ -179,10 +189,14 @@ synthesise-spectra --help
 
 **Input/Output Paths:**
 - `--data-dir`: Directory containing simulation data (default: `data/atmosphere`)
-- `--goft-file`: Path to CHIANTI G(T,N) save file (default: `./data/gofnt.sav`)
 - `--output-dir`: Output directory for results (default: `./run/input`)
 - `--output-name`: Output filename (default: `synthesised_spectra.pkl`)
 
+**Line and Abundance Selection:**
+- `--lines`: Emission lines to synthesise, e.g., `--lines Fe12_195.1190 Fe12_195.1790` (required)
+- `--abundance`: CHIANTI abundance dataset name (default: `sun_coronal_2021_chianti`)
+- `--n-workers`: Number of parallel workers for the fiasco G(T, n_e) computation. Each distinct ion is computed in a separate process. `0` uses all available CPUs (default: `0`). Set to `1` for serial execution.
+
 **Simulation Files:**
 - `--temp-file`: Temperature file relative to data-dir (default: `temp/eosT.0270000`)
 - `--rho-file`: Density file relative to data-dir (default: `rho/result_prim_0.0270000`)
@@ -215,9 +229,6 @@ synthesise-spectra --help
 - `--precision`: Numerical precision `float32` or `float64` (default: `float64`)
 - `--mean-mol-wt`: Mean molecular weight (default: `1.29`)
 
-**Line Selection:**
-- `--limit-lines`: Limit to specific lines, e.g., `--limit-lines Fe12_195.1190 Fe12_195.1790`
-
 #### Dynamic Mode (Time-varying Atmospheres)
 
 For simulating raster scans over evolving atmospheres, use dynamic mode which combines MHD timesteps based on instrument scanning:
@@ -225,7 +236,8 @@ For simulating raster scans over evolving atmospheres, use dynamic mode which co
 ```bash
 synthesise-spectra \
   --data-dir ./data/atmosphere \
-  --goft-file ./data/gofnt.sav \
+  --lines Fe12_195.1190 \
+  --abundance sun_coronal_2021_chianti \
   --output-dir ./run/input \
   --slit-rest-time "40 s" \
   --slit-width "0.2 arcsec" \
@@ -263,7 +275,6 @@ The synthesis produces a pickle file containing:
 
 - Use `--downsample 2` or `--downsample 4` for initial testing
 - Use `--precision float32` to reduce memory usage (may affect accuracy)
-- Use `--limit-lines` to synthesise only specific lines for development
 - Use spatial cropping to focus on regions of interest and reduce computation time
 - Monitor memory usage - full resolution synthesis can require 50+ GB RAM
 - Side views (`--integration-axis x` or `y`) may require different velocity files
@@ -276,7 +287,7 @@ The synthesis results can be loaded and analyzed using the package API:
 import euvst_response
 
 # Load synthesis results - this sums all line cubes into a single cube
-# By default uses Fe XII 195.119 Å as reference for wavelength grid
+# By default uses Fe XII 195.119 Angstrom as reference for wavelength grid
 cube = euvst_response.load_atmosphere("./run/input/synthesised_spectra.pkl")
 print(f"Combined cube shape: {cube.data.shape}")
 
@@ -300,7 +311,7 @@ This step can require a lot of memory at full resolution. A fully synthesised at
 
 **Important:** You can place the synthesised atmosphere file anywhere and specify its location using the `synthesis_file` parameter in your YAML configuration file. The default location is `./run/input/synthesised_spectra.pkl`.
 
-### 3. Simulate the instrument response
+### 2. Simulate the instrument response
 
 #### Configuration File
 
@@ -324,7 +335,7 @@ instrument: SWC  # Options: SWC (EUVST Short Wavelength) or EIS (Hinode/EIS)
 synthesis_file: ./run/input/synthesised_spectra.pkl  # Default location
 
 # Reference line for wavelength grid and metadata when combining all spectral lines
-reference_line: Fe12_195.1190  # Default reference line (Fe XII 195.119 Å)
+reference_line: Fe12_195.1190  # Default reference line (Fe XII 195.119 Angstrom)
 
 # Point Spread Function
 psf: False  # Enable PSF convolution
@@ -358,20 +369,53 @@ aluminium_thickness: 1485 angstrom  # Default (expected value)
 ccd_temperature: -60 Celsius  # Default (expected operating temperature)
 
 # Visible stray light level
-vis_sl: 0 photon / (s * pixel)  # Default, (ideal case, no stray light)
+vis_sl: 0 photon / (s * cm**2)  # Default, (ideal case, no stray light)
 
 # Multi-component Gaussian fitting (optional, omit for single-Gaussian)
 fitting:
   primary_component: 0
+  constrain_positive_intensity: true
   components:
     - wavelength: 195.119 angstrom
+      amplitude_greater_than: 1  # must be brighter than component 1
     - wavelength: 195.179 angstrom
       tie_center: 0  # Centroid offset tied to component 0
       tie_width: 0  # Same width as component 0
 ```
 
+Off-chip binning in the slit direction can also be performed:
+
+```yaml
+offchip_bin_slit: 2          # Bin every 2 slit pixels
+offchip_bin_slit: [1, 2, 4]  # Sweep over multiple binning factors
+```
+
+Alternatively, you can specify paired slit width and off-chip binning values to only simulate specific combinations:
+
+```yaml
+# Paired slit width / off-chip binning
+# Only the listed (slit_width, offchip_bin_slit) pairs are simulated
+slit_bin_pairs:
+  - slit_width: 0.2 arcsec
+    offchip_bin_slit: 1
+  - slit_width: 0.4 arcsec
+    offchip_bin_slit: 2
+  - slit_width: 0.8 arcsec
+    offchip_bin_slit: 5
+  - slit_width: 1.6 arcsec
+    offchip_bin_slit: 10
+```
+
 For guidance on recommended values, see McKevitt et al. (2025) (in prep.).
 
+By default, both the DN and photon signals are fitted at every Monte Carlo iteration. To speed up the simulation when only one is needed, use the `fit_signals` option:
+
+```yaml
+fit_signals: dn       # Fit only the DN signal
+fit_signals: photon   # Fit only the photon signal
+fit_signals: both     # Fit both (default)
+```
+
 If you synthesised data in dynamic mode, your configuration must specify:
 - Exactly one slit width matching the synthesis slit width
 - Exactly one exposure time matching the synthesis exposure time
@@ -387,6 +431,12 @@ eclipse --config ./run/input/config.yaml
 - `--config`: Path to YAML configuration file (required)
 - `--debug`: Enable debug mode with IPython breakpoints on errors (optional)
 
+#### Multi-node MPI parallelisation
+
+When launched with multiple MPI ranks on a SLURM cluster (via `srun` or `mpirun`, and setting `--ntasks-per-node`), ECLIPSE automatically distributes Monte Carlo iterations across ranks and gathers results on rank 0. No code or configuration changes are needed - MPI is auto-detected at runtime. If `mpi4py` is not installed or only one rank is present, the code falls back to single-process mode.
+
+Requirements: `mpi4py` and `intel-mpi` (load with `module load intel-mpi` before launching).
+
 #### Output
 
 Results are saved as pickle files in the `run/result/` directory with the same base name as the configuration file. The output includes:

{solarc_eclipse-0.6.1.2 → solarc_eclipse-0.6.1.4}/README.md

@@ -30,7 +30,7 @@ After installation, you can run ECLIPSE from the command line:
 
 ```bash
 # Run synthesis script (convert 3D MHD data to synthetic spectra)
-synthesise-spectra --data-dir ./data/atmosphere --goft-file ./data/gofnt.sav --output-dir ./run/input
+synthesise-spectra --data-dir ./data/atmosphere --lines Fe12_195.1190 --output-dir ./run/input
 
 # Run instrument response simulation
 eclipse --config ./run/input/config.yaml
@@ -54,7 +54,7 @@ detector = Detector_SWC()
 print(f"Telescope collecting area: {telescope.collecting_area:.4f}")
 print(f"Detector QE (EUV): {detector.qe_euv:.2f}")
 
-# Calculate effective area at Fe XII 195.119 Å
+# Calculate effective area at Fe XII 195.119 Angstrom
 fe12_wl = 195.119 * u.AA
 effective_area = telescope.collecting_area * telescope.throughput(fe12_wl) * detector.qe_euv
 
@@ -84,22 +84,24 @@ from euvst_response import (
     create_sunpy_maps_from_combo,
     summary_table
 )
-```
-
-## Detailed instructions
 
-### 1. Generate contribution functions for the desired emission lines
+# Load results
+results = load_instrument_response_results("run/result/my_results.pkl")
 
-Edit `make_gofnt.pro` to specify the desired emission lines and the location of the CHIANTI files. You can use CHIANTI to identify the required lines.
+# Get results for a specific parameter combination:
+combo = get_results_for_combination(
+    results, exposure=40*u.s, slit_width=0.4*u.arcsec, offchip_bin_slit=2
+)
 
-Run the following command:
-```bash
-idl -e "make_goft"
+# Create SunPy maps
+maps = create_sunpy_maps_from_combo(combo, rest_wavelength=195.119*u.AA, data_type='dn')
 ```
 
-### 2. Run the line synthesis
+## Detailed instructions
+
+### 1. Run the line synthesis
 
-The synthesis script converts 3D MHD simulation data into synthetic solar spectra. It can be run directly from the command line with extensive configuration options.
+The synthesis script converts 3D MHD simulation data into synthetic solar spectra. Contribution functions G(T, n_e) are computed on-the-fly using [fiasco](https://fiasco.readthedocs.io/) (a Python interface to the CHIANTI atomic database).
 
 #### Basic Usage
 
@@ -107,7 +109,9 @@ The synthesis script converts 3D MHD simulation data into synthetic solar spectr
 # Example using all available command line options
 synthesise-spectra \
   --data-dir ./data/atmosphere \
-  --goft-file ./data/gofnt.sav \
+  --lines Fe12_195.1190 Fe12_195.1790 \
+  --abundance sun_coronal_2021_chianti \
+  --n-workers 4 \
   --output-dir ./run/input \
   --output-name synthesised_spectra.pkl \
   --temp-file temp/eosT.0270000 \
@@ -127,8 +131,7 @@ synthesise-spectra \
   --crop-z "0 Mm" "20 Mm" \
   --downsample 1 \
   --precision float64 \
-  --mean-mol-wt 1.29 \
-  --limit-lines Fe12_195.1190
+  --mean-mol-wt 1.29
 
 # Show all available options
 synthesise-spectra --help
@@ -138,10 +141,14 @@ synthesise-spectra --help
 
 **Input/Output Paths:**
 - `--data-dir`: Directory containing simulation data (default: `data/atmosphere`)
-- `--goft-file`: Path to CHIANTI G(T,N) save file (default: `./data/gofnt.sav`)
 - `--output-dir`: Output directory for results (default: `./run/input`)
 - `--output-name`: Output filename (default: `synthesised_spectra.pkl`)
 
+**Line and Abundance Selection:**
+- `--lines`: Emission lines to synthesise, e.g., `--lines Fe12_195.1190 Fe12_195.1790` (required)
+- `--abundance`: CHIANTI abundance dataset name (default: `sun_coronal_2021_chianti`)
+- `--n-workers`: Number of parallel workers for the fiasco G(T, n_e) computation. Each distinct ion is computed in a separate process. `0` uses all available CPUs (default: `0`). Set to `1` for serial execution.
+
 **Simulation Files:**
 - `--temp-file`: Temperature file relative to data-dir (default: `temp/eosT.0270000`)
 - `--rho-file`: Density file relative to data-dir (default: `rho/result_prim_0.0270000`)
@@ -174,9 +181,6 @@ synthesise-spectra --help
 - `--precision`: Numerical precision `float32` or `float64` (default: `float64`)
 - `--mean-mol-wt`: Mean molecular weight (default: `1.29`)
 
-**Line Selection:**
-- `--limit-lines`: Limit to specific lines, e.g., `--limit-lines Fe12_195.1190 Fe12_195.1790`
-
 #### Dynamic Mode (Time-varying Atmospheres)
 
 For simulating raster scans over evolving atmospheres, use dynamic mode which combines MHD timesteps based on instrument scanning:
@@ -184,7 +188,8 @@ For simulating raster scans over evolving atmospheres, use dynamic mode which co
 ```bash
 synthesise-spectra \
   --data-dir ./data/atmosphere \
-  --goft-file ./data/gofnt.sav \
+  --lines Fe12_195.1190 \
+  --abundance sun_coronal_2021_chianti \
   --output-dir ./run/input \
   --slit-rest-time "40 s" \
   --slit-width "0.2 arcsec" \
@@ -222,7 +227,6 @@ The synthesis produces a pickle file containing:
 
 - Use `--downsample 2` or `--downsample 4` for initial testing
 - Use `--precision float32` to reduce memory usage (may affect accuracy)
-- Use `--limit-lines` to synthesise only specific lines for development
 - Use spatial cropping to focus on regions of interest and reduce computation time
 - Monitor memory usage - full resolution synthesis can require 50+ GB RAM
 - Side views (`--integration-axis x` or `y`) may require different velocity files
@@ -235,7 +239,7 @@ The synthesis results can be loaded and analyzed using the package API:
 import euvst_response
 
 # Load synthesis results - this sums all line cubes into a single cube
-# By default uses Fe XII 195.119 Å as reference for wavelength grid
+# By default uses Fe XII 195.119 Angstrom as reference for wavelength grid
 cube = euvst_response.load_atmosphere("./run/input/synthesised_spectra.pkl")
 print(f"Combined cube shape: {cube.data.shape}")
 
@@ -259,7 +263,7 @@ This step can require a lot of memory at full resolution. A fully synthesised at
 
 **Important:** You can place the synthesised atmosphere file anywhere and specify its location using the `synthesis_file` parameter in your YAML configuration file. The default location is `./run/input/synthesised_spectra.pkl`.
 
-### 3. Simulate the instrument response
+### 2. Simulate the instrument response
 
 #### Configuration File
 
@@ -283,7 +287,7 @@ instrument: SWC  # Options: SWC (EUVST Short Wavelength) or EIS (Hinode/EIS)
 synthesis_file: ./run/input/synthesised_spectra.pkl  # Default location
 
 # Reference line for wavelength grid and metadata when combining all spectral lines
-reference_line: Fe12_195.1190  # Default reference line (Fe XII 195.119 Å)
+reference_line: Fe12_195.1190  # Default reference line (Fe XII 195.119 Angstrom)
 
 # Point Spread Function
 psf: False  # Enable PSF convolution
@@ -317,20 +321,53 @@ aluminium_thickness: 1485 angstrom  # Default (expected value)
 ccd_temperature: -60 Celsius  # Default (expected operating temperature)
 
 # Visible stray light level
-vis_sl: 0 photon / (s * pixel)  # Default, (ideal case, no stray light)
+vis_sl: 0 photon / (s * cm**2)  # Default, (ideal case, no stray light)
 
 # Multi-component Gaussian fitting (optional, omit for single-Gaussian)
 fitting:
   primary_component: 0
+  constrain_positive_intensity: true
   components:
     - wavelength: 195.119 angstrom
+      amplitude_greater_than: 1  # must be brighter than component 1
     - wavelength: 195.179 angstrom
       tie_center: 0  # Centroid offset tied to component 0
       tie_width: 0  # Same width as component 0
 ```
 
+Off-chip binning in the slit direction can also be performed:
+
+```yaml
+offchip_bin_slit: 2          # Bin every 2 slit pixels
+offchip_bin_slit: [1, 2, 4]  # Sweep over multiple binning factors
+```
+
+Alternatively, you can specify paired slit width and off-chip binning values to only simulate specific combinations:
+
+```yaml
+# Paired slit width / off-chip binning
+# Only the listed (slit_width, offchip_bin_slit) pairs are simulated
+slit_bin_pairs:
+  - slit_width: 0.2 arcsec
+    offchip_bin_slit: 1
+  - slit_width: 0.4 arcsec
+    offchip_bin_slit: 2
+  - slit_width: 0.8 arcsec
+    offchip_bin_slit: 5
+  - slit_width: 1.6 arcsec
+    offchip_bin_slit: 10
+```
+
 For guidance on recommended values, see McKevitt et al. (2025) (in prep.).
 
+By default, both the DN and photon signals are fitted at every Monte Carlo iteration. To speed up the simulation when only one is needed, use the `fit_signals` option:
+
+```yaml
+fit_signals: dn       # Fit only the DN signal
+fit_signals: photon   # Fit only the photon signal
+fit_signals: both     # Fit both (default)
+```
+
 If you synthesised data in dynamic mode, your configuration must specify:
 - Exactly one slit width matching the synthesis slit width
 - Exactly one exposure time matching the synthesis exposure time
@@ -346,6 +383,12 @@ eclipse --config ./run/input/config.yaml
 - `--config`: Path to YAML configuration file (required)
 - `--debug`: Enable debug mode with IPython breakpoints on errors (optional)
 
+#### Multi-node MPI parallelisation
+
+When launched with multiple MPI ranks on a SLURM cluster (via `srun` or `mpirun`, and setting `--ntasks-per-node`), ECLIPSE automatically distributes Monte Carlo iterations across ranks and gathers results on rank 0. No code or configuration changes are needed - MPI is auto-detected at runtime. If `mpi4py` is not installed or only one rank is present, the code falls back to single-process mode.
+
+Requirements: `mpi4py` and `intel-mpi` (load with `module load intel-mpi` before launching).
+
 #### Output
 
 Results are saved as pickle files in the `run/result/` directory with the same base name as the configuration file. The output includes:

{solarc_eclipse-0.6.1.2 → solarc_eclipse-0.6.1.4}/euvst_response/__init__.py

@@ -4,7 +4,7 @@ ECLIPSE: Emission Calculation and Line Prediction for SOLAR-C EUVST
 This package provides tools for modeling the performance of the EUV spectrograph EUVST, on SOLAR-C.
 """
 
-__version__ = "0.6.1.2"
+__version__ = "0.6.1.4"
 __author__ = "James McKevitt"
 __email__ = "jm2@mssl.ucl.ac.uk"
 

{solarc_eclipse-0.6.1.2 → solarc_eclipse-0.6.1.4}/euvst_response/analysis.py

@@ -150,6 +150,11 @@ def analyse_fit_statistics(
         raise ValueError(f"No {fit_stats_key} found in combination results")
     
     fit_stats = combination_results[fit_stats_key]
+    if fit_stats is None:
+        raise ValueError(
+            f"'{data_type}' signal was not fitted for this combination. "
+            f"Check the 'fit_signals' setting in your YAML config."
+        )
     fit_truth_data = combination_results["ground_truth"]["fit_truth_data"]
     fit_truth_units = combination_results["ground_truth"]["fit_truth_units"]
     
@@ -214,6 +219,7 @@ def get_results_for_combination(
     exposure: u.Quantity = None,
     psf: bool = None,
     enable_pinholes: bool = None,
+    offchip_bin_slit: int = None,
     debug: bool = False
 ) -> Dict[str, Any]:
     """
@@ -241,6 +247,8 @@ def get_results_for_combination(
         PSF setting (True or False). If None, uses first available.
     enable_pinholes : bool, optional
         Pinhole effects setting (True or False). If None, uses first available.
+    offchip_bin_slit : int, optional
+        Off-chip slit binning factor. If None, uses first available.
     debug : bool, optional
         If True, print debugging information about available keys.
         
@@ -268,7 +276,7 @@ def get_results_for_combination(
     
     # Check if no parameters were specified at all
     no_params_specified = all(param is None for param in [slit_width, oxide_thickness, c_thickness, 
-                                                          aluminium_thickness, ccd_temperature, vis_sl, exposure, psf, enable_pinholes])
+                                                          aluminium_thickness, ccd_temperature, vis_sl, exposure, psf, enable_pinholes, offchip_bin_slit])
     
     if no_params_specified and len(all_combinations) > 1:
         print(f"Error: No parameters specified, but {len(all_combinations)} combinations are available!")
@@ -286,15 +294,24 @@ def get_results_for_combination(
         'vis_sl': vis_sl,
         'exposure': exposure,
         'psf': psf,
-        'enable_pinholes': enable_pinholes
+        'enable_pinholes': enable_pinholes,
+        'offchip_bin_slit': offchip_bin_slit,
     }
     
+    # Detect key format: 10-element (new, includes offchip_bin_slit) or 9-element (legacy)
+    sample_key = next(iter(all_combinations.keys()))
+    has_offchip_key = len(sample_key) == 10
+    
     # FIRST: Check if the specified parameters match multiple combinations
     # before filling in any defaults
     matching_combinations = []
     
     for key in all_combinations.keys():
-        key_slit, key_oxide, key_carbon, key_aluminium, key_ccd, key_vis_sl, key_exposure, key_psf, key_enable_pinholes = key
+        if has_offchip_key:
+            key_slit, key_oxide, key_carbon, key_aluminium, key_ccd, key_vis_sl, key_exposure, key_psf, key_enable_pinholes, key_offchip = key
+        else:
+            key_slit, key_oxide, key_carbon, key_aluminium, key_ccd, key_vis_sl, key_exposure, key_psf, key_enable_pinholes = key
+            key_offchip = 1  # legacy default
         
         # Check if this combination matches all specified (non-None) parameters
         matches = True
@@ -318,6 +335,8 @@ def get_results_for_combination(
             matches = False
         if enable_pinholes is not None and key_enable_pinholes != enable_pinholes:
             matches = False
+        if offchip_bin_slit is not None and key_offchip != offchip_bin_slit:
+            matches = False
             
         if matches:
             matching_combinations.append(key)
@@ -328,9 +347,14 @@ def get_results_for_combination(
         print(f"Use summary_table(results) to see all available parameter combinations.")
         print(f"Matching combinations found:")
         for i, combo in enumerate(matching_combinations[:5]):  # Show first 5
-            slit, oxide, carbon, aluminium, ccd, vis_sl, exp, psf_val, enable_pinholes_val = combo
+            if has_offchip_key:
+                slit, oxide, carbon, aluminium, ccd, vis_sl, exp, psf_val, enable_pinholes_val, offchip = combo
+            else:
+                slit, oxide, carbon, aluminium, ccd, vis_sl, exp, psf_val, enable_pinholes_val = combo
+                offchip = 1
             print(f"  {i+1}: slit={slit:.2f}arcsec, oxide={oxide:.1f}nm, carbon={carbon:.1f}nm, "
-                  f"Al={aluminium:.0f}A, CCD={ccd:.1f}C, stray={vis_sl:.2g}, exp={exp:.1f}s, psf={psf_val}, pinholes={enable_pinholes_val}")
+                  f"Al={aluminium:.0f}A, CCD={ccd:.1f}C, stray={vis_sl:.2g}, exp={exp:.1f}s, "
+                  f"psf={psf_val}, pinholes={enable_pinholes_val}, offchip_bin={offchip}")
         if len(matching_combinations) > 5:
             print(f"  ... and {len(matching_combinations) - 5} more")
         raise ValueError(f"Multiple combinations match your parameters. Please specify more parameters to select a unique combination.")
@@ -357,6 +381,9 @@ def get_results_for_combination(
         psf = param_ranges["psf_settings"][0]
     if enable_pinholes is None:
         enable_pinholes = param_ranges["enable_pinholes_vals"][0]
+    if offchip_bin_slit is None:
+        offchip_bin_slits = param_ranges.get("offchip_bin_slits", [1])
+        offchip_bin_slit = offchip_bin_slits[0]
     
     # Convert units to the same format as stored in keys (without units)
     slit_width_val = slit_width.to_value(u.arcsec)
@@ -367,9 +394,15 @@ def get_results_for_combination(
     vis_sl_val = vis_sl.to_value() if hasattr(vis_sl, 'to_value') else vis_sl
     exposure_val = exposure.to_value(u.s)
     
-    # Find matching combination (9-element key format)
-    target_key = (slit_width_val, oxide_thickness_val, c_thickness_val, 
-                  aluminium_thickness_val, ccd_temperature_val, vis_sl_val, exposure_val, psf, enable_pinholes)
+    # Build target key in the appropriate format
+    if has_offchip_key:
+        target_key = (slit_width_val, oxide_thickness_val, c_thickness_val, 
+                      aluminium_thickness_val, ccd_temperature_val, vis_sl_val, exposure_val,
+                      psf, enable_pinholes, offchip_bin_slit)
+    else:
+        target_key = (slit_width_val, oxide_thickness_val, c_thickness_val, 
+                      aluminium_thickness_val, ccd_temperature_val, vis_sl_val, exposure_val,
+                      psf, enable_pinholes)
     
     if debug:
         print(f"Target key: {target_key}")
@@ -450,25 +483,38 @@ def summary_table(results: Dict[str, Any]) -> None:
     all_combinations = results["results"]["all_combinations"]
     param_ranges = results["results"]["parameter_ranges"]
     
+    # Detect key format
+    sample_key = next(iter(all_combinations.keys()))
+    has_offchip = len(sample_key) == 10
+    
     print("Parameter Combination Summary")
-    print("=" * 155)
-    print(f"{'Slit (arcsec)':<12} {'Oxide (nm)':<12} {'Carbon (nm)':<12} {'Al (A)':<10} {'CCD (C)':<10} {'Stray Light':<12} {'Exp (s)':<10} {'PSF':<5} {'Pinholes':<8}")
-    print("-" * 155)
+    print("=" * 165)
+    header = f"{'Slit (arcsec)':<12} {'Oxide (nm)':<12} {'Carbon (nm)':<12} {'Al (A)':<10} {'CCD (C)':<10} {'Stray Light':<12} {'Exp (s)':<10} {'PSF':<5} {'Pinholes':<8}"
+    if has_offchip:
+        header += f" {'Slit Bin':<8}"
+    print(header)
+    print("-" * 165)
     
     for key, combo_results in all_combinations.items():
-        slit, oxide, carbon, aluminium, ccd_temp, vis_sl, exposure, psf, enable_pinholes = key
-        params = combo_results["parameters"]
+        if has_offchip:
+            slit, oxide, carbon, aluminium, ccd_temp, vis_sl, exposure, psf, enable_pinholes, offchip = key
+        else:
+            slit, oxide, carbon, aluminium, ccd_temp, vis_sl, exposure, psf, enable_pinholes = key
+            offchip = 1
         
-        print(f"{slit:<12.2f} {oxide:<12.1f} {carbon:<12.1f} {aluminium:<10.0f} {ccd_temp:<10.1f} {vis_sl:<12.2g} {exposure:<10.1f} {str(psf):<5} {str(enable_pinholes):<8}")
+        row = f"{slit:<12.2f} {oxide:<12.1f} {carbon:<12.1f} {aluminium:<10.0f} {ccd_temp:<10.1f} {vis_sl:<12.2g} {exposure:<10.1f} {str(psf):<5} {str(enable_pinholes):<8}"
+        if has_offchip:
+            row += f" {offchip:<8}"
+        print(row)
     
-    print("-" * 155)
+    print("-" * 165)
     print(f"Total combinations: {len(all_combinations)}")
     print(f"Exposure times: {[exp.to_value(u.s) for exp in param_ranges['exposures']]}")
 
 
 def create_sunpy_maps_from_combo(
     combination_results: Dict[str, Any],
-    cube_reb,
+    cube_reb=None,
     rest_wavelength: u.Quantity = 195.119 * u.AA,
     data_type: str = "dn",
     precision_requirement: u.Quantity = 2.0 * u.km / u.s,
@@ -482,8 +528,9 @@ def create_sunpy_maps_from_combo(
     ----------
     combination_results : dict
         Results for a specific parameter combination from get_results_for_combination().
-    cube_reb : NDCube
+    cube_reb : NDCube, optional
         NDCube with helioprojective WCS to use for all maps.
+        If not provided, the WCS stored in the combination results is used.
     rest_wavelength : u.Quantity, optional
         Rest wavelength for velocity conversion (default: 195.119 A for Fe XII).
     data_type : str, optional
@@ -526,14 +573,22 @@ def create_sunpy_maps_from_combo(
     else:
         analysis_per_exp = None
     
-    # Extract 2D helioprojective WCS from the cube
-    wcs_2d = cube_reb.wcs.celestial.swapaxes(0, 1)
+    # Extract 2D helioprojective WCS from the cube or stored signal WCS
+    if cube_reb is not None:
+        wcs_2d = cube_reb.wcs.celestial.swapaxes(0, 1)
+    else:
+        wcs_2d = combination_results["first_signal_wcs"].celestial.swapaxes(0, 1)
     
     # Get the data arrays - now only first iteration is saved
     first_photon_signal = combination_results["first_photon_signal"]  # Shape: (nx, ny, nwave)
     first_dn_signal = combination_results["first_dn_signal"]         # Shape: (nx, ny, nwave)
     fit_stats_key = f"{data_type}_fit_stats"
     fit_stats = combination_results[fit_stats_key]          # Contains first_fit_data, mean_data, std_data, units
+    if fit_stats is None:
+        raise ValueError(
+            f"'{data_type}' signal was not fitted for this combination. "
+            f"Check the 'fit_signals' setting in your YAML config."
+        )
     
     maps = {}