reboost 0.7.0__tar.gz → 0.8.0__tar.gz

{reboost-0.7.0 → reboost-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reboost
-Version: 0.7.0
+Version: 0.8.0
 Summary: New LEGEND Monte-Carlo simulation post-processing
 Author-email: Manuel Huber <info@manuelhu.de>, Toby Dixon <toby.dixon.23@ucl.ac.uk>, Luigi Pertoldi <gipert@pm.me>
 Maintainer: The LEGEND Collaboration
@@ -700,7 +700,7 @@ Requires-Dist: hdf5plugin
 Requires-Dist: colorlog
 Requires-Dist: numpy
 Requires-Dist: scipy
-Requires-Dist: numba
+Requires-Dist: numba>=0.60
 Requires-Dist: legend-pydataobj>=1.15.1
 Requires-Dist: legend-pygeom-optics>=0.12.0
 Requires-Dist: legend-pygeom-tools>=0.0.11
@@ -728,6 +728,8 @@ Dynamic: license-file
 
 # reboost
 
+[![PyPI](https://img.shields.io/pypi/v/reboost?logo=pypi)](https://pypi.org/project/reboost/)
+[![conda-forge](https://img.shields.io/conda/vn/conda-forge/reboost.svg)](https://anaconda.org/conda-forge/reboost)
 ![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/legend-exp/reboost?logo=git)
 [![GitHub Workflow Status](https://img.shields.io/github/checks-status/legend-exp/reboost/main?label=main%20branch&logo=github)](https://github.com/legend-exp/reboost/actions)
 [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)

{reboost-0.7.0 → reboost-0.8.0}/README.md

@@ -1,5 +1,7 @@
 # reboost
 
+[![PyPI](https://img.shields.io/pypi/v/reboost?logo=pypi)](https://pypi.org/project/reboost/)
+[![conda-forge](https://img.shields.io/conda/vn/conda-forge/reboost.svg)](https://anaconda.org/conda-forge/reboost)
 ![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/legend-exp/reboost?logo=git)
 [![GitHub Workflow Status](https://img.shields.io/github/checks-status/legend-exp/reboost/main?label=main%20branch&logo=github)](https://github.com/legend-exp/reboost/actions)
 [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)

{reboost-0.7.0 → reboost-0.8.0}/pyproject.toml

@@ -36,7 +36,7 @@ dependencies = [
     "colorlog",
     "numpy",
     "scipy",
-    "numba",
+    "numba >=0.60",
     "legend-pydataobj >=1.15.1",
     "legend-pygeom-optics >=0.12.0",
     "legend-pygeom-tools >=0.0.11",

{reboost-0.7.0 → reboost-0.8.0}/src/reboost/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.7.0'
-__version_tuple__ = version_tuple = (0, 7, 0)
+__version__ = version = '0.8.0'
+__version_tuple__ = version_tuple = (0, 8, 0)
 
-__commit_id__ = commit_id = 'gbfb61789b'
+__commit_id__ = commit_id = 'g1c98fe8fc'

{reboost-0.7.0 → reboost-0.8.0}/src/reboost/core.py

@@ -325,8 +325,6 @@ def get_one_detector_mapping(
         out_list = list(output_detector_expression)
 
     for expression_tmp in out_list:
-        func, globs = utils.get_function_string(expression_tmp)
-
         # if no package was imported its just a name
         try:
             objs = evaluate_object(expression_tmp, local_dict={"ARGS": args, "OBJECTS": objects})

{reboost-0.7.0 → reboost-0.8.0}/src/reboost/optmap/cli.py

@@ -35,21 +35,7 @@ def optical_cli() -> None:
 
     subparsers = parser.add_subparsers(dest="command", required=True)
 
-    # STEP 1: build evt file from stp tier
-    evt_parser = subparsers.add_parser("evt", help="build optmap-evt file from remage stp file")
-    evt_parser_det_group = evt_parser.add_mutually_exclusive_group(required=True)
-    evt_parser_det_group.add_argument(
-        "--geom",
-        help="GDML geometry file",
-    )
-    evt_parser_det_group.add_argument(
-        "--detectors",
-        help="file with detector ids of all optical channels.",
-    )
-    evt_parser.add_argument("input", help="input stp LH5 file", metavar="INPUT_STP")
-    evt_parser.add_argument("output", help="output evt LH5 file", metavar="OUTPUT_EVT")
-
-    # STEP 2a: build map file from evt tier
+    # STEP 1a: build map file from evt tier
     map_parser = subparsers.add_parser("createmap", help="build optical map from evt file(s)")
     map_parser.add_argument(
         "--settings",
@@ -91,42 +77,67 @@ def optical_cli() -> None:
     )
     map_parser.add_argument("output", help="output map LH5 file", metavar="OUTPUT_MAP")
 
-    # STEP 2b: view maps
-    mapview_parser = subparsers.add_parser("viewmap", help="view optical map")
+    # STEP 1b: view maps
+    mapview_parser = subparsers.add_parser(
+        "viewmap",
+        help="view optical map (arrows: navigate slices/axes, 'c': channel selector)",
+        formatter_class=argparse.RawTextHelpFormatter,
+        description=(
+            "Interactively view optical maps stored in LH5 files.\n\n"
+            "Keyboard controls:\n"
+            "  left/right  - previous/next slice along the current axis\n"
+            "  up/down     - switch slicing axis (x, y, z)\n"
+            "  c           - open channel selector overlay to switch detector map\n\n"
+            "Display notes:\n"
+            "  - Cells where no primary photons were simulated are shown in white.\n"
+            "  - Cells where no photons were detected are shown in grey.\n"
+            "  - Cells with values above the colormap maximum are shown in red.\n"
+            "  - Use --hist to choose which histogram to display. 'prob_unc_rel' shows the\n"
+            "    relative uncertainty prob_unc / prob where defined.\n"
+            "  - Use --divide to show the ratio of two map files (this/other)."
+        ),
+        epilog=(
+            "Examples:\n"
+            "  reboost-optical viewmap mymap.lh5\n"
+            "  reboost-optical viewmap mymap.lh5 --channel _1067205\n"
+            "  reboost-optical viewmap mymap.lh5 --hist prob_unc_rel --min 0 --max 1\n"
+            "  reboost-optical viewmap mymap.lh5 --divide other.lh5 --title 'Comparison'"
+        ),
+    )
     mapview_parser.add_argument("input", help="input map LH5 file", metavar="INPUT_MAP")
     mapview_parser.add_argument(
         "--channel",
         action="store",
         default="all",
-        help="default: %(default)s",
+        help="channel to display ('all' or '_<detid>'). Press 'c' in the viewer to switch. default: %(default)s",
     )
     mapview_parser.add_argument(
         "--hist",
-        choices=("nr_gen", "nr_det", "p_det", "p_det_err", "p_det_err_rel"),
+        choices=("_nr_gen", "_nr_det", "prob", "prob_unc", "prob_unc_rel"),
         action="store",
-        default="p_det",
+        default="prob",
         help="select optical map histogram to show. default: %(default)s",
     )
     mapview_parser.add_argument(
         "--divide",
         action="store",
-        help="default: none",
+        help="divide by another map file before display (ratio). default: none",
     )
     mapview_parser.add_argument(
         "--min",
         default=1e-4,
         type=(lambda s: s if s == "auto" else float(s)),
-        help="colormap min value. default: %(default)e",
+        help="colormap min value; use 'auto' for automatic scaling. default: %(default)e",
     )
     mapview_parser.add_argument(
         "--max",
         default=1e-2,
         type=(lambda s: s if s == "auto" else float(s)),
-        help="colormap max value. default: %(default)e",
+        help="colormap max value; use 'auto' for automatic scaling. default: %(default)e",
     )
     mapview_parser.add_argument("--title", help="title of figure. default: stem of filename")
 
-    # STEP 2c: merge maps
+    # STEP 1c: merge maps
     mapmerge_parser = subparsers.add_parser("mergemap", help="merge optical maps")
     mapmerge_parser.add_argument(
         "input", help="input map LH5 files", metavar="INPUT_MAP", nargs="+"
@@ -151,49 +162,10 @@ def optical_cli() -> None:
         help="""Check map statistics after creation. default: %(default)s""",
     )
 
-    # STEP 2d: check map
+    # STEP 1d: check map
     checkmap_parser = subparsers.add_parser("checkmap", help="check optical maps")
     checkmap_parser.add_argument("input", help="input map LH5 file", metavar="INPUT_MAP")
 
-    # STEP 3: convolve with hits from non-optical simulations
-    convolve_parser = subparsers.add_parser(
-        "convolve", help="convolve non-optical hits with optical map"
-    )
-    convolve_parser.add_argument(
-        "--material",
-        action="store",
-        choices=("lar", "pen", "fiber"),
-        default="lar",
-        help="default: %(default)s",
-    )
-    convolve_parser.add_argument(
-        "--map",
-        action="store",
-        required=True,
-        metavar="INPUT_MAP",
-        help="input map LH5 file",
-    )
-    convolve_parser.add_argument(
-        "--edep",
-        action="store",
-        required=True,
-        metavar="INPUT_EDEP",
-        help="input non-optical LH5 hit file",
-    )
-    convolve_parser.add_argument(
-        "--edep-lgdo",
-        action="store",
-        required=True,
-        metavar="LGDO_PATH",
-        help="path to LGDO inside non-optical LH5 hit file (e.g. /stp/detXX)",
-    )
-    convolve_parser.add_argument(
-        "--dist-mode",
-        action="store",
-        default="poisson+no-fano",
-    )
-    convolve_parser.add_argument("--output", help="output hit LH5 file", metavar="OUTPUT_HIT")
-
     # STEP X: rebin maps
     rebin_parser = subparsers.add_parser("rebin", help="rebin optical maps")
     rebin_parser.add_argument("input", help="input map LH5 files", metavar="INPUT_MAP")
@@ -205,24 +177,7 @@ def optical_cli() -> None:
     log_level = (None, logging.INFO, logging.DEBUG)[min(args.verbose, 2)]
     setup_log(log_level)
 
-    # STEP 1: build evt file from hit tier
-    if args.command == "evt":
-        from .evt import build_optmap_evt, get_optical_detectors_from_geom
-
-        _check_input_file(parser, args.input)
-        _check_output_file(parser, args.output)
-
-        # load detector ids from the geometry.
-        if args.geom is not None:
-            _check_input_file(parser, args.geom, "geometry")
-            detectors = get_optical_detectors_from_geom(args.geom)
-        else:
-            _check_input_file(parser, args.detectors, "detectors")
-            detectors = dbetto.utils.load_dict(args.detectors)
-
-        build_optmap_evt(args.input, args.output, detectors, args.bufsize)
-
-    # STEP 2a: build map file from evt tier
+    # STEP 1a: build map file from evt tier
     if args.command == "createmap":
         from .create import create_optical_maps
 
@@ -250,7 +205,7 @@ def optical_cli() -> None:
             geom_fn=args.geom,
         )
 
-    # STEP 2b: view maps
+    # STEP 1b: view maps
     if args.command == "viewmap":
         from .mapview import view_optmap
 
@@ -267,7 +222,7 @@ def optical_cli() -> None:
             histogram_choice=args.hist,
         )
 
-    # STEP 2c: merge maps
+    # STEP 1c: merge maps
     if args.command == "mergemap":
         from .create import merge_optical_maps
 
@@ -281,29 +236,13 @@ def optical_cli() -> None:
             args.input, args.output, settings, check_after_create=args.check, n_procs=args.n_procs
         )
 
-    # STEP 2d: check maps
+    # STEP 1d: check maps
     if args.command == "checkmap":
         from .create import check_optical_map
 
         _check_input_file(parser, args.input)
         check_optical_map(args.input)
 
-    # STEP 3: convolve with hits from non-optical simulations
-    if args.command == "convolve":
-        from .convolve import convolve
-
-        _check_input_file(parser, [args.map, args.edep])
-        _check_output_file(parser, args.output, optional=True)
-        convolve(
-            args.map,
-            args.edep,
-            args.edep_lgdo,
-            args.material,
-            args.output,
-            args.bufsize,
-            dist_mode=args.dist_mode,
-        )
-
     # STEP X: rebin maps
     if args.command == "rebin":
         from .create import rebin_optical_maps

{reboost-0.7.0 → reboost-0.8.0}/src/reboost/optmap/convolve.py

@@ -10,12 +10,9 @@ import numba
 import numpy as np
 from legendoptics import fibers, lar, pen
 from lgdo import lh5
-from lgdo.lh5 import LH5Iterator
 from lgdo.types import Array, Histogram, Table
-from numba import njit, prange
-from numpy.lib.recfunctions import structured_to_unstructured
+from numba import njit
 from numpy.typing import NDArray
-from pint import Quantity
 
 from .numba_pdg import numba_pdgid_funcs
 
@@ -42,7 +39,7 @@ def open_optmap(optmap_fn: str) -> OptmapForConvolve:
     detids = np.array([int(m.lstrip("_")) for m in det_ntuples])
     detidx = np.arange(0, detids.shape[0])
 
-    optmap_all = lh5.read("/all/p_det", optmap_fn)
+    optmap_all = lh5.read("/all/prob", optmap_fn)
     assert isinstance(optmap_all, Histogram)
     optmap_edges = tuple([b.edges for b in optmap_all.binning])
 
@@ -50,7 +47,7 @@ def open_optmap(optmap_fn: str) -> OptmapForConvolve:
     # 0, ..., len(detidx)-1 AND OPTMAP_ANY_CH might be negative.
     ow[OPTMAP_ANY_CH] = optmap_all.weights.nda
     for i, nt in zip(detidx, det_ntuples, strict=True):
-        optmap = lh5.read(f"/{nt}/p_det", optmap_fn)
+        optmap = lh5.read(f"/{nt}/prob", optmap_fn)
         assert isinstance(optmap, Histogram)
         ow[i] = optmap.weights.nda
 
@@ -98,7 +95,7 @@ def open_optmap_single(optmap_fn: str, spm_det_uid: int) -> OptmapForConvolve:
     except lh5.exceptions.LH5DecodeError:  # the _hitcounts_exp might not be always present.
         pass
 
-    optmap = lh5.read(f"/_{spm_det_uid}/p_det", optmap_fn)
+    optmap = lh5.read(f"/_{spm_det_uid}/prob", optmap_fn)
     assert isinstance(optmap, Histogram)
     ow = np.empty((1, *optmap.weights.nda.shape), dtype=np.float64)
     ow[0] = optmap.weights.nda
@@ -107,67 +104,13 @@ def open_optmap_single(optmap_fn: str, spm_det_uid: int) -> OptmapForConvolve:
     return OptmapForConvolve(np.array([spm_det_uid]), np.array([0]), optmap_edges, ow)
 
 
-def iterate_stepwise_depositions(
-    edep_df: np.rec.recarray,
-    optmap: OptmapForConvolve,
-    scint_mat_params: sc.ComputedScintParams,
-    rng: np.random.Generator = None,
-    dist: str = "poisson",
-    mode: str = "no-fano",
-):
-    # those np functions are not supported by numba, but needed for efficient array access below.
-    if "xloc_pre" in edep_df.dtype.names:
-        x0 = structured_to_unstructured(edep_df[["xloc_pre", "yloc_pre", "zloc_pre"]], np.float64)
-        x1 = structured_to_unstructured(
-            edep_df[["xloc_post", "yloc_post", "zloc_post"]], np.float64
-        )
-    else:
-        x0 = structured_to_unstructured(edep_df[["xloc", "yloc", "zloc"]], np.float64)
-        x1 = None
-
-    rng = np.random.default_rng() if rng is None else rng
-    output_map, res = _iterate_stepwise_depositions(
-        edep_df,
-        x0,
-        x1,
-        rng,
-        optmap.detids,
-        optmap.detidx,
-        optmap.edges,
-        optmap.weights,
-        scint_mat_params,
-        dist,
-        mode,
-    )
-    if res["any_no_stats"] > 0 or res["det_no_stats"] > 0:
-        log.warning(
-            "had edep out in voxels without stats: %d (%.2f%%)",
-            res["any_no_stats"],
-            res["det_no_stats"],
-        )
-    if res["oob"] > 0:
-        log.warning(
-            "had edep out of map bounds: %d (%.2f%%)",
-            res["oob"],
-            (res["oob"] / (res["ib"] + res["oob"])) * 100,
-        )
-    log.debug(
-        "VUV_primary %d ->hits_any %d ->hits %d (%.2f %% primaries detected)",
-        res["vuv_primary"],
-        res["hits_any"],
-        res["hits"],
-        (res["hits_any"] / res["vuv_primary"]) * 100,
-    )
-    log.debug("hits/hits_any %.2f", res["hits"] / res["hits_any"])
-    return output_map
-
-
 def iterate_stepwise_depositions_pois(
     edep_hits: ak.Array,
     optmap: OptmapForConvolve,
     scint_mat_params: sc.ComputedScintParams,
     det_uid: int,
     map_scaling: float = 1,
+    map_scaling_sigma: float = 0,
     rng: np.random.Generator | None = None,
 ):
     if edep_hits.particle.ndim == 1:
@@ -180,6 +123,7 @@ def iterate_stepwise_depositions_pois(
         rng,
         np.where(optmap.detids == det_uid)[0][0],
         map_scaling,
+        map_scaling_sigma,
         optmap.edges,
         optmap.weights,
         scint_mat_params,
@@ -254,184 +198,6 @@ def _pdgid_to_particle(pdgid: int) -> sc.ParticleIndex:
 __counts_per_bin_key_type = numba.types.UniTuple(numba.types.int64, 3)
 
 
-# - run with NUMBA_FULL_TRACEBACKS=1 NUMBA_BOUNDSCHECK=1 for testing/checking
-# - cache=True does not work with outer prange, i.e. loading the cached file fails (numba bug?)
-# - the output dictionary is not threadsafe, so parallel=True is not working with it.
-@njit(parallel=False, nogil=True, cache=True)
-def _iterate_stepwise_depositions(
-    edep_df,
-    x0,
-    x1,
-    rng,
-    detids,
-    detidx,
-    optmap_edges,
-    optmap_weights,
-    scint_mat_params: sc.ComputedScintParams,
-    dist: str,
-    mode: str,
-):
-    pdgid_map = {}
-    output_map = {}
-    oob = ib = ph_cnt = ph_det = ph_det2 = any_no_stats = det_no_stats = 0  # for statistics
-    for rowid in prange(edep_df.shape[0]):
-        # if rowid % 100000 == 0:
-        #     print(rowid)
-        t = edep_df[rowid]
-
-        # get the particle information.
-        if t.particle not in pdgid_map:
-            pdgid_map[t.particle] = (_pdgid_to_particle(t.particle), _pdg_func.charge(t.particle))
-
-        # do the scintillation.
-        part, charge = pdgid_map[t.particle]
-
-        # if we have both pre and post step points use them
-        # else pass as None
-
-        scint_times = sc.scintillate(
-            scint_mat_params,
-            x0[rowid],
-            x1[rowid] if x1 is not None else None,
-            t.v_pre if x1 is not None else None,
-            t.v_post if x1 is not None else None,
-            t.time,
-            part,
-            charge,
-            t.edep,
-            rng,
-            emission_term_model=("poisson" if mode == "no-fano" else "normal_fano"),
-        )
-        if scint_times.shape[0] == 0:  # short-circuit if we have no photons at all.
-            continue
-        ph_cnt += scint_times.shape[0]
-
-        # coordinates -> bins of the optical map.
-        bins = np.empty((scint_times.shape[0], 3), dtype=np.int64)
-        for j in range(3):
-            bins[:, j] = np.digitize(scint_times[:, j + 1], optmap_edges[j])
-            # normalize all out-of-bounds bins just to one end.
-            bins[:, j][bins[:, j] == optmap_edges[j].shape[0]] = 0
-
-        # there are _much_ less unique bins, unfortunately np.unique(..., axis=n) does not work
-        # with numba; also np.sort(..., axis=n) also does not work.
-
-        counts_per_bin = numba.typed.Dict.empty(
-            key_type=__counts_per_bin_key_type,
-            value_type=np.int64,
-        )
-
-        # get probabilities from map.
-        hitcount = np.zeros((detidx.shape[0], bins.shape[0]), dtype=np.int64)
-        for j in prange(bins.shape[0]):
-            # note: subtract 1 from bins, to account for np.digitize output.
-            cur_bins = (bins[j, 0] - 1, bins[j, 1] - 1, bins[j, 2] - 1)
-            if cur_bins[0] == -1 or cur_bins[1] == -1 or cur_bins[2] == -1:
-                oob += 1
-                continue  # out-of-bounds of optmap
-            ib += 1
-
-            px_any = optmap_weights[OPTMAP_ANY_CH, cur_bins[0], cur_bins[1], cur_bins[2]]
-            if px_any < 0.0:
-                any_no_stats += 1
-                continue
-            if px_any == 0.0:
-                continue
-
-            if dist == "multinomial":
-                if rng.uniform() >= px_any:
-                    continue
-                ph_det += 1
-                # we detect this energy deposition; we should at least get one photon out here!
-
-                detsel_size = 1
-
-                px_sum = optmap_weights[OPTMAP_SUM_CH, cur_bins[0], cur_bins[1], cur_bins[2]]
-                assert px_sum >= 0.0  # should not be negative.
-                detp = np.empty(detidx.shape, dtype=np.float64)
-                had_det_no_stats = 0
-                for d in detidx:
-                    # normalize so that sum(detp) = 1
-                    detp[d] = optmap_weights[d, cur_bins[0], cur_bins[1], cur_bins[2]] / px_sum
-                    if detp[d] < 0.0:
-                        had_det_no_stats = 1
-                        detp[d] = 0.0
-                det_no_stats += had_det_no_stats
-
-                # should be equivalent to rng.choice(detidx, size=detsel_size, p=detp)
-                detsel = detidx[
-                    np.searchsorted(np.cumsum(detp), rng.random(size=(detsel_size,)), side="right")
-                ]
-                for d in detsel:
-                    hitcount[d, j] += 1
-                ph_det2 += detsel.shape[0]
-
-            elif dist == "poisson":
-                # store the photon count in each bin, to sample them all at once below.
-                if cur_bins not in counts_per_bin:
-                    counts_per_bin[cur_bins] = 1
-                else:
-                    counts_per_bin[cur_bins] += 1
-
-            else:
-                msg = "unknown distribution"
-                raise RuntimeError(msg)
-
-        if dist == "poisson":
-            for j, (cur_bins, ph_counts_to_poisson) in enumerate(counts_per_bin.items()):
-                had_det_no_stats = 0
-                had_any = 0
-                for d in detidx:
-                    detp = optmap_weights[d, cur_bins[0], cur_bins[1], cur_bins[2]]
-                    if detp < 0.0:
-                        had_det_no_stats = 1
-                        continue
-                    pois_cnt = rng.poisson(lam=ph_counts_to_poisson * detp)
-                    hitcount[d, j] += pois_cnt
-                    ph_det2 += pois_cnt
-                    had_any = 1
-                ph_det += had_any
-                det_no_stats += had_det_no_stats
-
-        assert scint_times.shape[0] >= hitcount.shape[1]  # TODO: use the right assertion here.
-        out_hits_len = np.sum(hitcount)
-        if out_hits_len > 0:
-            out_times = np.empty(out_hits_len, dtype=np.float64)
-            out_det = np.empty(out_hits_len, dtype=np.int64)
-            out_idx = 0
-            for d in detidx:
-                hc_d_plane_max = np.max(hitcount[d, :])
-                # untangle the hitcount array in "planes" that only contain the given number of hits per
-                # channel. example: assume a "histogram" of hits per channel:
-                #     x |   |    <-- this is plane 2 with 1 hit ("max plane")
-                #     x |   | x  <-- this is plane 1 with 2 hits
-                # ch: 1 | 2 | 3
-                for hc_d_plane_cnt in range(1, hc_d_plane_max + 1):
-                    hc_d_plane = hitcount[d, :] >= hc_d_plane_cnt
-                    hc_d_plane_len = np.sum(hc_d_plane)
-                    if hc_d_plane_len == 0:
-                        continue
-
-                    # note: we assume "immediate" propagation after scintillation. Here, a single timestamp
-                    # might be coipied to output/"detected" twice.
-                    out_times[out_idx : out_idx + hc_d_plane_len] = scint_times[hc_d_plane, 0]
-                    out_det[out_idx : out_idx + hc_d_plane_len] = detids[d]
-                    out_idx += hc_d_plane_len
-            assert out_idx == out_hits_len  # ensure that all of out_{det,times} is filled.
-            output_map[np.int64(rowid)] = (t.evtid, out_det, out_times)
-
-    stats = {
-        "oob": oob,
-        "ib": ib,
-        "vuv_primary": ph_cnt,
-        "hits_any": ph_det,
-        "hits": ph_det2,
-        "any_no_stats": any_no_stats,
-        "det_no_stats": det_no_stats,
-    }
-    return output_map, stats
-
-
 # - run with NUMBA_FULL_TRACEBACKS=1 NUMBA_BOUNDSCHECK=1 for testing/checking
 # - cache=True does not work with outer prange, i.e. loading the cached file fails (numba bug?)
 # - the output dictionary is not threadsafe, so parallel=True is not working with it.
@@ -441,6 +207,7 @@ def _iterate_stepwise_depositions_pois(
     rng,
     detidx: int,
     map_scaling: float,
+    map_scaling_sigma: float,
     optmap_edges,
     optmap_weights,
     scint_mat_params: sc.ComputedScintParams,
@@ -453,6 +220,10 @@ def _iterate_stepwise_depositions_pois(
         hit = edep_hits[rowid]
         hit_output = []
 
+        map_scaling_evt = map_scaling
+        if map_scaling_sigma > 0:
+            map_scaling_evt = rng.normal(loc=map_scaling, scale=map_scaling_sigma)
+
         assert len(hit.particle) == len(hit.num_scint_ph)
         # iterate steps inside the hit
         for si in range(len(hit.particle)):
@@ -473,7 +244,7 @@ def _iterate_stepwise_depositions_pois(
             ib += 1
 
             # get probabilities from map.
-            detp = optmap_weights[detidx, cur_bins[0], cur_bins[1], cur_bins[2]] * map_scaling
+            detp = optmap_weights[detidx, cur_bins[0], cur_bins[1], cur_bins[2]] * map_scaling_evt
             if detp < 0.0:
                 det_no_stats += 1
                 continue
@@ -563,50 +334,6 @@ def get_output_table(output_map):
     return ph_count_o, tbl
 
 
-def convolve(
-    map_file: str,
-    edep_file: str,
-    edep_path: str,
-    material: str | tuple[sc.ScintConfig, tuple[Quantity, ...]],
-    output_file: str | None = None,
-    buffer_len: int = int(1e6),
-    dist_mode: str = "poisson+no-fano",
-):
-    scint_mat_params = _get_scint_params(material)
-
-    # special handling of distributions and flags.
-    dist, mode = dist_mode.split("+")
-    if (
-        dist not in ("multinomial", "poisson")
-        or mode not in ("", "no-fano")
-        or (dist == "poisson" and mode != "no-fano")
-    ):
-        msg = f"unsupported statistical distribution {dist_mode} for scintillation emission"
-        raise ValueError(msg)
-
-    log.info("opening map %s", map_file)
-    optmap_for_convolve = open_optmap(map_file)
-
-    log.info("opening energy deposition hit output %s", edep_file)
-    it = LH5Iterator(edep_file, edep_path, buffer_len=buffer_len)
-
-    for it_count, edep_lgdo in enumerate(it):
-        edep_df = _reflatten_scint_vov(edep_lgdo.view_as("ak")).to_numpy()
-
-        log.info("start event processing (%d)", it_count)
-        output_map = iterate_stepwise_depositions(
-            edep_df, optmap_for_convolve, scint_mat_params, dist=dist, mode=mode
-        )
-
-        log.info("store output photon hits (%d)", it_count)
-        ph_count_o, tbl = get_output_table(output_map)
-        log.debug(
-            "output photons: %d energy depositions -> %d photons", len(output_map), ph_count_o
-        )
-        if output_file is not None:
-            lh5.write(tbl, "optical", lh5_file=output_file, group="stp", wo_mode="append")
-
-
 def _reflatten_scint_vov(arr: ak.Array) -> ak.Array:
     if all(arr[f].ndim == 1 for f in ak.fields(arr)):
         return arr