Merge pull request #5 from ggmarshall/xtalk

Xtalk

pyproject.toml

@@ -37,6 +37,7 @@ dependencies = [
     "iminuit",
     "legend-daq2lh5>=1.2.1",
     "legend-pydataobj>=1.6",
+    "legendmeta>=0.9",
     "matplotlib",
     "numba!=0.53.*,!=0.54.*,!=0.57",
     "numpy>=1.21",

src/pygama/evt/modules/xtalk.py

@@ -4,8 +4,6 @@
 
 from __future__ import annotations
 
-import importlib
-
 import awkward as ak
 import numpy as np
 from legendmeta.catalog import Props
@@ -145,9 +143,6 @@ def filter_hits(
         group = datainfo._asdict()[tier].group
         logic = logic.replace(f"{group}.", f"{group}___")
 
-    # replace remaining . with __ as these are module calls
-    logic = logic.replace(".", "__")
-
     c = compile(logic, "gcc -O3 -ffast-math build_hit.py", "eval")
 
     tier_params = []
@@ -158,11 +153,6 @@ def filter_hits(
             file = datainfo._asdict()[tier].file
             if (file, group, column) not in tier_params:
                 tier_params.append((file, group, column))
-        elif "__" in name:
-            # get module and function names
-            package, func = name.rsplit("__", 1)
-            # import function into current namespace
-            importlib.import_module(package)
 
     for idx_chan, channel in enumerate(rawids):
         tbl = types.Table()

src/pygama/math/distributions.py

@@ -5,14 +5,14 @@
 
 # nopycln: file
 
+from pygama.math.functions.crystal_ball import crystal_ball  # noqa: F401
 from pygama.math.functions.crystal_ball import (  # noqa: F401
-    crystal_ball,
     nb_crystal_ball_cdf,
     nb_crystal_ball_pdf,
 )
 from pygama.math.functions.error_function import nb_erf, nb_erfc  # noqa: F401
+from pygama.math.functions.exgauss import exgauss  # noqa: F401
 from pygama.math.functions.exgauss import (  # noqa: F401
-    exgauss,
     nb_exgauss_cdf,
     nb_exgauss_pdf,
     nb_gauss_tail_approx,