last cleanup

rs-station · Oct 28, 2024 · 569f939 · 569f939
1 parent 33ec00c
commit 569f939
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/meteor/iterative.py b/meteor/iterative.py
@@ -139,7 +139,7 @@ def _complex_derivative_from_iterative_tv(  # noqa: PLR0913
         )
         if verbose:
             log.info(
-                f"  iter {num_iterations:03d}",  # noqa: G004
+                f"  iteration {num_iterations:04d}",  # noqa: G004
                 phase_change=round(phase_change, 4),
                 negentropy=round(tv_metadata.optimal_negentropy, 4),
                 tv_weight=tv_metadata.optimal_tv_weight,

diff --git a/meteor/scripts/common.py b/meteor/scripts/common.py
@@ -319,7 +319,7 @@ def write_combined_metadata(
     *, filename: Path, it_tv_metadata: pd.DataFrame, final_tv_metadata: TvDenoiseResult
 ) -> None:
     combined_metadata = {
-        "iterative_tv": it_tv_metadata.to_json(),
+        "iterative_tv": it_tv_metadata.to_json(orient="records", indent=4),
         "final_tv_pass": final_tv_metadata.json(),
     }
     with filename.open("w") as f:

diff --git a/meteor/scripts/compute_iterative_tv_map.py b/meteor/scripts/compute_iterative_tv_map.py
@@ -88,7 +88,7 @@ def main(command_line_arguments: list[str] | None = None) -> None:
     log.info(
         "Optimal TV weight found",
         weight=final_tv_metadata.optimal_tv_weight,
-        final_negentropy=f"{final_tv_metadata.optimal_negentropy:.2e}",
+        final_negentropy=round(final_tv_metadata.optimal_negentropy, 4),
     )
 
     log.info("Writing output.", file=str(args.mtzout))