From abdaaf99a1d8223293a5f8f65f06765eef8e9f6c Mon Sep 17 00:00:00 2001 From: Daniel Hollarek Date: Tue, 28 May 2024 18:39:38 +0200 Subject: [PATCH] core: Changed temp in kelvin to temp in celcius --- xrdpattern/core/labels.py | 4 ++-- xrdpattern/parsing/parser.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xrdpattern/core/labels.py b/xrdpattern/core/labels.py index 276f3f2..4ae4f13 100644 --- a/xrdpattern/core/labels.py +++ b/xrdpattern/core/labels.py @@ -121,7 +121,7 @@ def crystallite_size(self) -> float: @property def temp_in_celcius(self) -> float: - return self.powder.temp_in_kelvin + return self.powder.temp_in_celcius @property def crystal_structure(self) -> CrystalStructure: @@ -155,7 +155,7 @@ def as_list(self) -> list[float]: class PowderProperties: crystal_structure: CrystalStructure crystallite_size: float = 500 - temp_in_kelvin : int = 293 + temp_in_celcius : int = 20 class LabelTensor(Tensor): diff --git a/xrdpattern/parsing/parser.py b/xrdpattern/parsing/parser.py index 367382f..9afe536 100644 --- a/xrdpattern/parsing/parser.py +++ b/xrdpattern/parsing/parser.py @@ -118,7 +118,7 @@ def get_float(key: str) -> Optional[float]: secondary_wavelength=get_float('ALPHA2'), secondary_to_primary=get_float('ALPHA_RATIO') ) - experiment.powder.temp_in_kelvin = get_float('TEMP_CELCIUS') + 273.15 + experiment.powder.temp_in_celcius = get_float('TEMP_CELCIUS') return experiment