|
1 | 1 | from __future__ import annotations |
2 | 2 |
|
3 | | -from abc import ABC, abstractmethod |
| 3 | +from dataclasses import dataclass |
| 4 | +from datetime import datetime |
4 | 5 | from typing import TYPE_CHECKING, Generator, Iterable, Optional |
5 | 6 |
|
6 | 7 | import numpy as np |
7 | | -from numpy.typing import ArrayLike |
8 | 8 |
|
| 9 | +from ._typing import ArrayLike |
9 | 10 | from .tools import index_of_x, integrate, read_csvs |
10 | 11 |
|
11 | 12 |
|
12 | | -class Spectrum(ABC): |
| 13 | +@dataclass |
| 14 | +class Spectrum: |
| 15 | + name: str |
| 16 | + energies: np.ndarray |
| 17 | + intensities: np.ndarray |
| 18 | + units: Optional[str] = None |
| 19 | + style: Optional[str] = None |
| 20 | + time: Optional[datetime] = None |
| 21 | + |
13 | 22 | def __init__( |
14 | 23 | self, |
15 | 24 | name: str, |
16 | 25 | energies: ArrayLike, |
17 | 26 | intensities: ArrayLike, |
18 | 27 | units: Optional[str] = None, |
19 | 28 | style: Optional[str] = None, |
20 | | - time=None, |
| 29 | + time: Optional[datetime] = None, |
21 | 30 | ): |
22 | | - energies = np.asarray(energies) |
23 | | - intensities = np.asarray(intensities) |
24 | | - assert len(energies.shape) == 1 |
25 | | - assert energies.shape == intensities.shape |
26 | | - |
27 | 31 | self.name = name |
28 | 32 | self.energies = np.asarray(energies, dtype=float) |
29 | 33 | self.intensities = np.asarray(intensities, dtype=float) |
30 | 34 | self.units = units |
31 | 35 | self.style = style |
32 | 36 | self.time = time |
33 | 37 |
|
| 38 | + def __post_init__(self): |
| 39 | + self.energies = np.asarray(self.energies, dtype=float) |
| 40 | + self.intensities = np.asarray(self.intensities, dtype=float) |
| 41 | + assert len(self.energies.shape) == 1 |
| 42 | + assert self.energies.shape == self.intensities.shape |
| 43 | + |
34 | 44 | def __repr__(self) -> str: |
35 | 45 | return f"<{self.__class__.__name__}: {self.name}>" |
36 | 46 |
|
37 | | - def __str__(self) -> str: |
38 | | - return repr(self) |
39 | | - |
40 | 47 | def __iter__(self) -> Generator[tuple[float, float], None, None]: |
41 | 48 | """ |
42 | 49 | Iterate over points in the Spectrum. |
@@ -73,9 +80,8 @@ def __abs__(self) -> Spectrum: |
73 | 80 | def __radd__(self, other: float) -> Spectrum: |
74 | 81 | return self.__add__(other) |
75 | 82 |
|
76 | | - @abstractmethod |
77 | 83 | def __add__(self, other: float) -> Spectrum: |
78 | | - pass |
| 84 | + raise NotImplementedError() |
79 | 85 |
|
80 | 86 | def __rtruediv__(self, other: float) -> Spectrum: |
81 | 87 | new = self.copy() |
@@ -282,9 +288,8 @@ def sliced(self, start: Optional[float] = None, end: Optional[float] = None) -> |
282 | 288 | new.intensities = new.intensities[start_i:end_i] |
283 | 289 | return new |
284 | 290 |
|
285 | | - @abstractmethod |
286 | 291 | def smoothed(self, box_pts: int | bool = True) -> Spectrum: |
287 | | - pass |
| 292 | + raise NotImplementedError() |
288 | 293 |
|
289 | 294 | @classmethod |
290 | 295 | def from_csvs(cls, *inps: str, names: Optional[Iterable[str]] = None): |
|
0 commit comments