From 24ff79a729a6e75f38c30f1d646052a2d22d7ad0 Mon Sep 17 00:00:00 2001 From: Noe Brucy Date: Wed, 19 May 2021 17:20:33 +0200 Subject: [PATCH] [comparator] [log extractor] distintiguish ramses_ism and old ramses --- __pycache__/comparator.cpython-37.pyc | Bin 0 -> 16812 bytes comparator.py | 17 +++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 __pycache__/comparator.cpython-37.pyc diff --git a/__pycache__/comparator.cpython-37.pyc b/__pycache__/comparator.cpython-37.pyc new file mode 100644 index 0000000000000000000000000000000000000000..e38ea189721c34cadf48dcbd571e0bebb6b983cd GIT binary patch literal 16812 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 Jo{;|8{|`hZzQ6zg literal 0 HcmV?d00001 diff --git a/comparator.py b/comparator.py index d2da32b..388923b 100644 --- a/comparator.py +++ b/comparator.py @@ -576,6 +576,23 @@ class Comparator(Aggregator, HDF5Container): "emag": U.none, }, ), + "fine_step_from_log": Rule( + self, + partial( + self._from_log, + ["time", "fine_step", "dt", "a", "mempc1", "mempc2"], + self._extract_fine_step_from_log, + ), + group="/series", + unit={ + "time": "unit_time", + "fine_step": U.none, + "dt": "unit_time", + "a": U.none, + "mempc1": U.none, + "mempc2": U.none, + }, + ), "turb_power": Rule( self, self._turb_power,