dgm-dayabay-dev 0.2__tar.gz → 0.2.2__tar.gz

{dgm_dayabay_dev-0.2 → dgm_dayabay_dev-0.2.2}/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 Gonchar Maxim, Tsegelnik Nikita
+Copyright (c) 2025 Gonchar Maxim, Vitalii Zavadskyi
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{dgm_dayabay_dev-0.2/src/dgm_dayabay_dev.egg-info → dgm_dayabay_dev-0.2.2}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: dgm-dayabay-dev
-Version: 0.2
-Summary: Implementation of the Daya Bay modelfor dag-modelling framework. Development version.
+Version: 0.2.2
+Summary: Implementation of the Daya Bay model for dag-modelling framework. Development version.
 Author-email: DAGModelling Team <dagflow@jinr.ru>
 Maintainer-email: DAGModelling Team <dagflow@jinr.ru>
 License-Expression: MIT
@@ -17,9 +17,9 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: dag-modelling
-Requires-Dist: dgm-fit
-Requires-Dist: dgm-reactor-neutrino
+Requires-Dist: dag-modelling>=0.14
+Requires-Dist: dgm-fit>=0.2
+Requires-Dist: dgm-reactor-neutrino>=0.2.1
 Requires-Dist: more-itertools
 Provides-Extra: test
 Requires-Dist: coverage; extra == "test"
@@ -27,6 +27,9 @@ Requires-Dist: nbconvert; extra == "test"
 Requires-Dist: parameterized; extra == "test"
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: ipython; extra == "test"
+Requires-Dist: ipykernel; extra == "test"
+Requires-Dist: ipywidgets; extra == "test"
 Dynamic: license-file
 
 # dgm-dayabay-dev
@@ -39,7 +42,7 @@ Dynamic: license-file
 [![pages](https://img.shields.io/badge/pages-link-white.svg)](http://dagflow-team.pages.jinr.ru/dgm-dayabay-dev)
 -->
 
-Implementation of the Daya Bay modelfor `dag-modelling` framework. Development version.
+Implementation of the Daya Bay model for `dag-modelling` framework. Development version.
 
 ## Repositories
 

{dgm_dayabay_dev-0.2 → dgm_dayabay_dev-0.2.2}/README.md

@@ -8,7 +8,7 @@
 [![pages](https://img.shields.io/badge/pages-link-white.svg)](http://dagflow-team.pages.jinr.ru/dgm-dayabay-dev)
 -->
 
-Implementation of the Daya Bay modelfor `dag-modelling` framework. Development version.
+Implementation of the Daya Bay model for `dag-modelling` framework. Development version.
 
 ## Repositories
 

{dgm_dayabay_dev-0.2 → dgm_dayabay_dev-0.2.2}/pyproject.toml

@@ -5,8 +5,8 @@ requires = [ "packaging", "setuptools", "wheel" ]
 
 [project]
 name = "dgm-dayabay-dev"
-version = "0.2"
-description = "Implementation of the Daya Bay modelfor dag-modelling framework. Development version."
+version = "0.2.2"
+description = "Implementation of the Daya Bay model for dag-modelling framework. Development version."
 readme = "README.md"
 license = "MIT"
 maintainers = [ { name = "DAGModelling Team", email = "dagflow@jinr.ru" } ]
@@ -19,13 +19,13 @@ classifiers = [
   "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-  "dag-modelling",
-  "dgm-fit",
-  "dgm-reactor-neutrino",
+  "dag-modelling>=0.14",
+  "dgm-fit>=0.2",
+  "dgm-reactor-neutrino>=0.2.1",
   "more-itertools",
 ]
 
-optional-dependencies.test = [ "coverage", "nbconvert", "parameterized", "pytest", "pytest-cov" ]
+optional-dependencies.test = [ "coverage", "nbconvert", "parameterized", "pytest", "pytest-cov", "ipython", "ipykernel", "ipywidgets" ]
 
 urls."Bug Tracker" = "https://github.com/dagflow-team/dgm-dayabay-dev/issues"
 urls."DAGModelling Team" = "https://github.com/dagflow-team"

dgm_dayabay_dev-0.2.2/src/dgm_dayabay_dev/bundles/refine_detector_data.py

@@ -0,0 +1,46 @@
+from collections.abc import Sequence
+
+from nested_mapping import NestedMapping
+
+
+def refine_detector_data(
+    source: NestedMapping,
+    target: NestedMapping,
+    *,
+    detectors: Sequence[str],
+    periods: Sequence[str] = ("6AD", "8AD", "7AD"),
+    clean_source: bool = True,
+    columns=("livetime", "eff", "efflivetime"),
+    skip: Sequence[set[str]] | None = None,
+) -> None:
+    """Read arrays with detector data for the whole data taking period, write detector
+    data for each period in separate array.
+    """
+    target["days"] = (days_storage := {})
+    for det in detectors:
+        day = source["day", det]
+        step = day[1:] - day[:-1]
+        assert (step == 1).all(), "Expect detector data for each day"
+
+        ndet = source["n_det", det]
+        for periodname in periods:
+            period_ndet = int(periodname[0])
+            mask_period = ndet == period_ndet
+
+            for field in columns:
+                data = source[field, det]
+
+                key = (field, periodname, det)
+                if skip is not None and any(skipkey.issubset(key) for skipkey in skip):
+                    continue
+
+                target[key] = data[mask_period]
+
+            days = source["day", det][mask_period]
+            days_stored = days_storage.setdefault(periodname, days)
+            if days is not days_stored:
+                assert all(days == days_stored)
+
+    if clean_source:
+        for key in tuple(source.walkkeys()):
+            source.delete_with_parents(key)

{dgm_dayabay_dev-0.2 → dgm_dayabay_dev-0.2.2}/src/dgm_dayabay_dev/bundles/refine_lsnl_data.py

@@ -1,13 +1,12 @@
+from typing import Literal
+
+from nested_mapping.nested_mapping import NestedMapping
 from numpy import arange, concatenate, linspace
 from numpy.typing import NDArray
 from scipy.interpolate import interp1d
 
-from nested_mapping.nested_mapping import NestedMapping
 
-
-def refine_lsnl_data(
-    storage: NestedMapping, *, xname: str, nominalname: str, **kwargs
-) -> None:
+def refine_lsnl_data(storage: NestedMapping, *, xname: str, nominalname: str, **kwargs) -> None:
     xcoarse = storage[xname]
 
     refiner = RefineGraph(xcoarse, **kwargs)
@@ -32,6 +31,7 @@ class RefineGraph:
         "newmin",
         "newmax",
         "savgol_filter_smoothen",
+        "extrapolation_mode",
     )
     xcoarse: NDArray
     xfine_bound: NDArray
@@ -41,6 +41,7 @@ class RefineGraph:
     newmin: float
     newmax: float
     savgol_filter_smoothen: tuple[int, int] | None
+    extrapolation_mode: Literal["absolute", "relative"]
 
     def __init__(
         self,
@@ -50,12 +51,14 @@ class RefineGraph:
         newmin: float,
         newmax: float,
         savgol_filter_smoothen: tuple[int, int] | None = None,
+        extrapolation_mode: Literal["absolute", "relative"] = "absolute",
     ):
         self.xcoarse = xcoarse
         self.refine_times = refine_times
         self.newmin = newmin
         self.newmax = newmax
         self.savgol_filter_smoothen = savgol_filter_smoothen
+        self.extrapolation_mode = extrapolation_mode
 
         self._process_x()
 
@@ -83,9 +86,9 @@ class RefineGraph:
 
         if self.newmax is not None:
             stepright = self.xfine_bound[-1] - self.xfine_bound[-2]
-            xstack[-1] = arange(
-                self.xfine_bound[-1], self.newmax + stepright * 1.0e-6, stepright
-            )[1:]
+            xstack[-1] = arange(self.xfine_bound[-1], self.newmax + stepright * 1.0e-6, stepright)[
+                1:
+            ]
 
         self.xfine_extended = concatenate(xstack)
         self.xfine_extended_stack = tuple(xstack)
@@ -100,9 +103,20 @@ class RefineGraph:
         nominal: NDArray,
     ) -> NDArray:
         skip_diff = y is nominal
+
         yabs = self._method_reltoabs(y)
-        yfine = self._method_interpolate(yabs)
-        yunbound = self._method_extrapolate(yfine)
+        yfine_abs = self._method_interpolate(yabs)
+        match self.extrapolation_mode:
+            case "absolute":
+                yunbound = self._method_extrapolate(yfine_abs)
+
+            case "relative":
+                yfine_rel = yfine_abs / self.xfine_bound
+                yunbound_rel = self._method_extrapolate(yfine_rel)
+                yunbound = yunbound_rel * self.xfine_extended
+
+            case _:
+                raise RuntimeError(f"Invalid extrapolation mode {self.extrapolation_mode}")
 
         if skip_diff:
             return yunbound

dgm_dayabay_dev-0.2.2/src/dgm_dayabay_dev/bundles/refine_reactor_data.py

@@ -0,0 +1,304 @@
+from collections.abc import Sequence
+
+from numba import njit
+from numpy import empty, isnan
+from numpy.typing import NDArray
+
+from nested_mapping import NestedMapping
+
+
+@njit
+def weekly_to_daily(array: NDArray) -> NDArray:
+    ret = empty(array.shape[0] * 7)
+
+    for i in range(7):
+        ret[i::7] = array
+
+    return ret
+
+
+@njit
+def inperiod_to_daily(array: NDArray, ndays: int) -> NDArray:
+    ret = empty(array.shape[0] * ndays)
+
+    for i in range(ndays):
+        ret[i::ndays] = array
+
+    return ret
+
+
+@njit
+def periods_to_days(array: NDArray, ndays: int) -> NDArray:
+    ret = empty(array.shape[0] * ndays)
+
+    for i in range(ndays):
+        ret[i::ndays] = array
+        ret[i::ndays] += i
+
+    return ret
+
+
+@njit
+def weeks_to_days(array: NDArray) -> NDArray:
+    ret = empty(array.shape[0] * 7)
+
+    for i in range(7):
+        ret[i::7] = array
+        ret[i::7] += i
+
+    return ret
+
+
+def refine_reactor_data(
+    source: NestedMapping,
+    target: NestedMapping,
+    *,
+    reactors: Sequence[str],
+    isotopes: Sequence[str],
+    periods: Sequence[int] = (6, 8, 7),
+    clean_source: bool = True,
+) -> None:
+    """Refine reactor reactor data.
+
+    Does the following items:
+        - checks input consistency
+        - split arrays based on isotope number and period name
+        - provides similar data on a daily basis
+        - splits into multiple arrays based on the reactor index
+
+    Source should contain the following fields:
+        - period : int
+              period number
+        - day : int
+              number of the first day of the period, relative to some common day.
+        - ndays : int
+              length of the period in days. This function can deal only with periods of
+              equal length and with no gaps.
+        - core : int
+              number of the current reactor (1 to 6).
+        - ndet : int
+              number of active detectors during the period (6, 8 or 7).
+        - power : dict[str, NDArray]
+              thermal power as a fraction to nominal value (0 to 1) for each reactor
+              core.
+        - u235 : dict[str, NDArray]
+              fission fraction for the ²³⁵U ("U235" should be contained in isotopes) for
+              each reactor core.
+        - <isotope> : dict[str, NDArray]
+              fission fraction for the <isotope> according to isotopes for each reactor
+              core.
+
+    The target dictionary will be populated as follows:
+    ```python
+    target = {
+        "days": array(),
+        "power": {
+            "period_name": {
+                "reactor_name": array(),
+                ...
+            },
+            ...
+        },
+        "fission_fraction": {
+            "isotope_name": {
+                "period_name": {
+                    "reactor_name": array(),
+                    ...
+                },
+                ...
+            },
+        }
+    }
+    ```
+    with all the arrays of same lengths.
+
+    Parameters
+    ----------
+    source : NestedMapping
+        storage/record/mapping with source data.
+    target : NestedMapping
+        storage to write target arrays to.
+    reactors : Sequence[str]
+        reactor names to use when writing data.
+    isotopes : Sequence[str]
+        names of the isotopes to read and write fission fractions.
+    periods : Sequence[int], default=(6, 8, 7)
+        periods (number of active detectors) to select.
+    clean_source : bool, default=True
+        if True, remove used data from source.
+    """
+    for corename in reactors:
+        period = source["period", corename]
+        day = source["day", corename]
+        ndays = source["n_days", corename]
+        ndet = source["n_det", corename]
+
+        ndays0 = ndays[0]
+        if not (ndays[:-1] == ndays0).all():
+            raise ValueError(
+                "refine_reactor_data expects information with constant periodicity"
+            )
+
+        power = source["power"][corename]
+        fission_fractions = {key: source[key.lower(), corename] for key in isotopes}
+
+        step = period[1:] - period[:-1]
+        assert (
+            step == 1
+        ).all(), "Expect reactor data for with distinct period, no gaps"
+
+        target["days"] = (days_storage := {})
+        for period in periods:
+            mask_period = ndet == period
+            periodname = f"{period}AD"
+
+            mask = mask_period
+            key = (
+                periodname,
+                corename,
+            )
+            target[("power",) + key] = inperiod_to_daily(power[mask], ndays0)
+            for isotope in isotopes:
+                target[("fission_fraction",) + key + (isotope,)] = inperiod_to_daily(
+                    fission_fractions[isotope][mask], ndays0
+                )
+
+            days = periods_to_days(day[mask], ndays0)
+            days_stored = days_storage.setdefault(periodname, days)
+            if days is not days_stored:
+                assert all(days == days_stored)
+
+    for key, array in target.walkjoineditems():
+        if isnan(array).any():
+            raise ValueError(f"Invalid refined reactor data for {key}")
+
+    if clean_source:
+        for key in tuple(source.walkkeys()):
+            source.delete_with_parents(key)
+
+
+def split_refine_reactor_data(
+    source: NestedMapping,
+    target: NestedMapping,
+    *,
+    reactors: Sequence[str],
+    isotopes: Sequence[str],
+    periods: Sequence[int] = (6, 8, 7),
+    reactor_number_start: int = 1,
+    clean_source: bool = True,
+) -> None:
+    """Filter/split and refine reactor reactor data.
+
+    Does the following items:
+        - checks input consistency
+        - split arrays based on reactor number, isotope number and period name
+        - provides similar data on a daily basis
+        - splits into multiple arrays based on the reactor index
+
+    Source should contain the following fields:
+        - week : int
+              week/period number
+        - day : int
+              number of the first day of the period, relative to some common day.
+        - ndays : int
+              length of the period in days. This function can deal only with periods of
+              equal length and with no gaps.
+        - core : int
+              number of the current reactor (1 to 6).
+        - ndet : int
+              number of active detectors during the period (6, 8 or 7).
+        - power : float
+              thermal power as a fraction to nominal value (0 to 1).
+        - u235 : float
+              fission fraction for the ²³⁵U ("U235" should be contained in isotopes).
+        - <isotope> : float
+              fission fraction for the <isotope> according to isotopes.
+
+    The target dictionary will be populated as follows:
+    ```python
+    target = {
+        "days": array(),
+        "power": {
+            "period_name": {
+                "reactor_name": array(),
+                ...
+            },
+            ...
+        },
+        "fission_fraction": {
+            "isotope_name": {
+                "period_name": {
+                    "reactor_name": array(),
+                    ...
+                },
+                ...
+            },
+        }
+    }
+    ```
+    with all the arrays of same lengths.
+
+    Parameters
+    ----------
+    source : NestedMapping
+        storage/record/mapping with source data.
+    target : NestedMapping
+        storage to write target arrays to.
+    reactors : Sequence[str]
+        reactor names to use when writing data.
+    isotopes : Sequence[str]
+        names of the isotopes to read and write fission fractions.
+    periods : Sequence[int], default=(6, 8, 7)
+        periods (number of active detectors) to select.
+    reactor_number_start : int, default=1
+        number of the first reactor in the input data.
+    clean_source : bool, default=True
+        if True, remove used data from source.
+    """
+    week = source["week"]
+    day = source["day"]
+    ndays = source["ndays"]
+    core = source["core"]
+    ndet = source["n_det"]
+
+    if not (ndays == 7).all():
+        raise ValueError("refine_reactor_data expects weekly information")
+
+    power = source["power"]
+    fission_fractions = {key: source[key.lower()] for key in isotopes}
+
+    ncores = 6
+    for i in range(ncores):
+        rweek = week[i::ncores]
+        step = rweek[1:] - rweek[:-1]
+        assert (step == 1).all(), "Expect reactor data for each week, no gaps"
+
+    target["days"] = (days_storage := {})
+    for period in periods:
+        mask_period = ndet == period
+        periodname = f"{period}AD"
+
+        for icore, corename in enumerate(reactors, reactor_number_start):
+            mask = mask_period * (core == icore)
+            key = (
+                periodname,
+                corename,
+            )
+            target[("power",) + key] = weekly_to_daily(power[mask])
+            for isotope in isotopes:
+                target[("fission_fraction",) + key + (isotope,)] = weekly_to_daily(
+                    fission_fractions[isotope][mask]
+                )
+
+            days = weeks_to_days(day[mask])
+            days_stored = days_storage.setdefault(periodname, days)
+            if days is not days_stored:
+                assert all(days == days_stored)
+
+    for key, array in target.walkjoineditems():
+        if isnan(array).any():
+            raise ValueError(f"Invalid refined reactor data for {key}")
+
+    if clean_source:
+        for key in tuple(source.walkkeys()):
+            source.delete_with_parents(key)

{dgm_dayabay_dev-0.2 → dgm_dayabay_dev-0.2.2}/src/dgm_dayabay_dev/models/__init__.py

@@ -2,14 +2,15 @@ from typing import Mapping
 
 from dag_modelling.tools.logger import logger
 
+from .dayabay_labels import LATEX_SYMBOLS
 from .dayabay_v0 import model_dayabay_v0
 from .dayabay_v0b import model_dayabay_v0b
 from .dayabay_v0c import model_dayabay_v0c
 from .dayabay_v0d import model_dayabay_v0d
 from .dayabay_v0e import model_dayabay_v0e
-
-from .dayabay_labels import LATEX_SYMBOLS
-
+from .dayabay_v0f import model_dayabay_v0f
+from .dayabay_v1 import model_dayabay_v1
+from .dayabay_v1a import model_dayabay_v1a
 
 AD_TO_EH = {
     "AD11": "EH1",
@@ -28,8 +29,11 @@ _dayabay_models = {
     "v0c": model_dayabay_v0c,
     "v0d": model_dayabay_v0d,
     "v0e": model_dayabay_v0e,
+    "v0f": model_dayabay_v0f,
+    "v1": model_dayabay_v1,
+    "v1a": model_dayabay_v1a,
 }
-_dayabay_models["latest"] = _dayabay_models["v0e"]
+_dayabay_models["latest"] = _dayabay_models["v1a"]
 
 _available_sources = ("tsv", "hdf5", "root", "npz")
 
@@ -37,9 +41,31 @@ _available_sources = ("tsv", "hdf5", "root", "npz")
 def available_models() -> tuple[str, ...]:
     return tuple(_dayabay_models.keys())
 
+
+def available_models_limited(*, first: str, last: str | None = None) -> tuple[str,...]:
+    names = tuple(_dayabay_models.keys())
+    assert names
+    i = 0
+    for i, name in enumerate(names):
+        if name == first:
+            break
+
+    if last is None:
+        return names[i:]
+
+    ret = []
+    for i in range(i, len(names)):
+        ret.append(name := names[i])
+        if name == last:
+            break
+
+    return tuple(ret)
+
+
 def available_sources() -> tuple[str, ...]:
     return _available_sources
 
+
 def load_model(version, model_options: Mapping | str = {}, **kwargs):
     if isinstance(model_options, str):
         from yaml import Loader, load
@@ -47,9 +73,7 @@ def load_model(version, model_options: Mapping | str = {}, **kwargs):
         model_options = load(model_options, Loader)
 
     if not isinstance(model_options, dict):
-        raise RuntimeError(
-            "model_options expects a python dictionary or yaml dictionary"
-        )
+        raise RuntimeError("model_options expects a python dictionary or yaml dictionary")
 
     model_options = dict(model_options, **kwargs)
 

{dgm_dayabay_dev-0.2 → dgm_dayabay_dev-0.2.2}/src/dgm_dayabay_dev/models/dayabay_v0.py

@@ -94,13 +94,14 @@ class model_dayabay_v0:
         concatenation_mode: Literal["detector", "detector_period"] = "detector_period",
         merge_integration: bool = False,
         parameter_values: dict[str, float | str] = {},
+        path_data: str | Path = "data/dayabay-v0",
     ):
         self._strict = strict
         self._close = close
 
         self.graph = None
         self.storage = NodeStorage()
-        self._path_data = Path("data/dayabay-v0")
+        self._path_data = Path(path_data)
         self._source_type = source_type
         self._override_indices = override_indices
         self._spectrum_correction_mode = spectrum_correction_mode
@@ -410,6 +411,7 @@ class model_dayabay_v0:
             NueSurvivalProbability.replicate(
                 name="oscprob",
                 distance_unit="m",
+                leading_mass_splitting_3l_name="DeltaMSq32",
                 replicate_outputs=combinations["reactor.detector"],
                 surprobArgConversion = True
             )
@@ -728,7 +730,7 @@ class model_dayabay_v0:
                 columns = ("day", "ndet", "livetime", "eff", "efflivetime"),
                 skip = self.inactive_detectors
             )
-            from ..bundles.refine_detector_data import \
+            from ..bundles.refine_detector_data_v0ae import \
                 refine_detector_data
             refine_detector_data(
                 data("daily_data.detector_all"),
@@ -743,7 +745,7 @@ class model_dayabay_v0:
                 columns = ("week", "day", "ndet", "ndays", "core", "power") + index["isotope_lower"],
                 output_key_order = (("week", "core_data"), ("week",))
             )
-            from ..bundles.refine_reactor_data import split_refine_reactor_data
+            from ..bundles.refine_reactor_data_v0ae import split_refine_reactor_data
             split_refine_reactor_data(
                 data("daily_data.reactor_all"),
                 data.create_child("daily_data.reactor"),

{dgm_dayabay_dev-0.2 → dgm_dayabay_dev-0.2.2}/src/dgm_dayabay_dev/models/dayabay_v0b.py

@@ -118,6 +118,7 @@ class model_dayabay_v0b:
         concatenation_mode: Literal["detector", "detector_period"] = "detector_period",
         merge_integration: bool = False,
         parameter_values: dict[str, float | str] = {},
+        path_data: str | Path = "data/dayabay-v0b",
         future: Collection[
             Literal[
                 "all", "pdg", "xsec", "conversion", "hm-spectra",
@@ -135,7 +136,7 @@ class model_dayabay_v0b:
 
         self.graph = None
         self.storage = NodeStorage()
-        self._path_data = Path("data/dayabay-v0b")
+        self._path_data = Path(path_data)
         self._source_type = source_type
         self._override_indices = override_indices
         self._spectrum_correction_mode = spectrum_correction_mode
@@ -476,6 +477,7 @@ class model_dayabay_v0b:
             NueSurvivalProbability.replicate(
                 name="oscprob",
                 distance_unit="m",
+                leading_mass_splitting_3l_name="DeltaMSq32",
                 replicate_outputs=combinations["reactor.detector"],
                 surprobArgConversion = True
             )
@@ -820,7 +822,7 @@ class model_dayabay_v0b:
                 columns = ("day", "ndet", "livetime", "eff", "efflivetime"),
                 skip = self.inactive_detectors
             )
-            from ..bundles.refine_detector_data import \
+            from ..bundles.refine_detector_data_v0ae import \
                 refine_detector_data
             refine_detector_data(
                 data("daily_data.detector_all"),
@@ -835,7 +837,7 @@ class model_dayabay_v0b:
                 columns = ("week", "day", "ndet", "ndays", "core", "power") + index["isotope_lower"],
                 output_key_order = (("week", "core_data"), ("week",))
             )
-            from ..bundles.refine_reactor_data import split_refine_reactor_data
+            from ..bundles.refine_reactor_data_v0ae import split_refine_reactor_data
             split_refine_reactor_data(
                 data("daily_data.reactor_all"),
                 data.create_child("daily_data.reactor"),