feat: experimental data calibration pipeline with ROOT I/O
- Fix chi2 calculation bug in calibration.py (remove incorrect coeffs[::-1] reversal in np.polyval) - Fix broken beta_spectrum/cli.py (remove orphaned detector response add_argument calls and unused imports) - Add ExpSpectrum.apply_calibration() and EnergyCalibrator.from_am241_spectrum() - Add LivetimeDetermination class for pulser-based livetime - Add SpectrumPipeline orchestration (read→subtract→calibrate→livetime→validate) - Add ROOT I/O with PyROOT primary + uproot fallback - Add bs_exp CLI with process, livetime, export subcommands - Add exp_calibration notebook with pre-calibration visualization - Add comprehensive tests (73 passing) - Add bs_exp console script and [root] extra to pyproject.toml - Remove obsolete detector_response module and unused notebooks
This commit is contained in:
@@ -24,7 +24,6 @@ if TYPE_CHECKING:
|
||||
from matplotlib.figure import Figure
|
||||
|
||||
from beta_spectrum.spectrum import BetaSpectrum, SpectrumConfig
|
||||
from beta_spectrum.components.detector_response import DetectorResponse
|
||||
|
||||
|
||||
class BetaSpectrumAnalyzer:
|
||||
@@ -108,48 +107,6 @@ class BetaSpectrumAnalyzer:
|
||||
|
||||
return total
|
||||
|
||||
def convolved_spectrum(
|
||||
self,
|
||||
detector_response: Optional["DetectorResponse"] = None,
|
||||
normalize: bool = True,
|
||||
) -> np.ndarray:
|
||||
"""
|
||||
Calculate spectrum convolved with detector response.
|
||||
|
||||
If detector_response is None and use_detector_response is True in config,
|
||||
creates a detector response from config parameters.
|
||||
|
||||
Parameters
|
||||
----------
|
||||
detector_response : DetectorResponse, optional
|
||||
Detector response to convolve with. Created from config if None.
|
||||
normalize : bool
|
||||
If True, normalize to unit area.
|
||||
|
||||
Returns
|
||||
-------
|
||||
np.ndarray
|
||||
Convolved spectrum.
|
||||
"""
|
||||
if detector_response is None and self.config.use_detector_response:
|
||||
detector_response = BetaSpectrum.create_detector_from_config(self.config)
|
||||
|
||||
if detector_response is None:
|
||||
raise ValueError(
|
||||
"detector_response must be provided, or set "
|
||||
"use_detector_response=True in config"
|
||||
)
|
||||
|
||||
convolved = self.spectrum.convolve_with_detector(
|
||||
detector_response, W=self.W, config=self.config
|
||||
)
|
||||
|
||||
if normalize:
|
||||
integral = np.trapezoid(convolved, detector_response.channel_energies)
|
||||
if integral > 0:
|
||||
convolved = convolved / integral
|
||||
|
||||
return convolved
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Unified branch view
|
||||
@@ -536,15 +493,6 @@ class BetaSpectrumAnalyzer:
|
||||
f"intensity={branch.intensity:.4f}"
|
||||
)
|
||||
|
||||
if self.config.use_detector_response:
|
||||
header_lines.append(
|
||||
f"# detector: {self.config.detector_model} "
|
||||
f"(sigma={self.config.detector_sigma_a_keV} keV, "
|
||||
f"tail={self.config.detector_tail_fraction})"
|
||||
)
|
||||
else:
|
||||
header_lines.append("# detector: disabled")
|
||||
|
||||
header_lines.append(f"# git_commit: {get_git_short_hash()}")
|
||||
|
||||
data: Dict[str, np.ndarray] = {
|
||||
|
||||
Reference in New Issue
Block a user