Skip to content

Commit

Permalink
reset metadata and config
Browse files Browse the repository at this point in the history
  • Loading branch information
rettigl committed Jan 22, 2025
1 parent d8ad464 commit b1e19d3
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
11 changes: 6 additions & 5 deletions src/specsanalyzer/config.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""This module contains a config library for loading yaml/json files into dicts"""
from __future__ import annotations

import copy
import json
import os
import platform
Expand Down Expand Up @@ -75,15 +76,15 @@ def parse_config(
config = {}

if isinstance(config, dict):
config_dict = config
config_dict = copy.deepcopy(config)
else:
config_dict = load_config(config)
if verbose:
logger.info(f"Configuration loaded from: [{str(Path(config).resolve())}]")

folder_dict: dict = None
if isinstance(folder_config, dict):
folder_dict = folder_config
folder_dict = copy.deepcopy(folder_config)
else:
if folder_config is None:
folder_config = "./specs_config.yaml"
Expand All @@ -94,7 +95,7 @@ def parse_config(

user_dict: dict = None
if isinstance(user_config, dict):
user_dict = user_config
user_dict = copy.deepcopy(user_config)
else:
if user_config is None:
user_config = str(USER_CONFIG_PATH.joinpath("config_v1.yaml"))
Expand All @@ -105,7 +106,7 @@ def parse_config(

system_dict: dict = None
if isinstance(system_config, dict):
system_dict = system_config
system_dict = copy.deepcopy(system_config)
else:
if system_config is None:
system_config = str(SYSTEM_CONFIG_PATH.joinpath("config_v1.yaml"))
Expand All @@ -115,7 +116,7 @@ def parse_config(
logger.info(f"System config loaded from: [{str(Path(system_config).resolve())}]")

if isinstance(default_config, dict):
default_dict = default_config
default_dict = copy.deepcopy(default_config)
else:
default_dict = load_config(default_config)
if verbose:
Expand Down
6 changes: 6 additions & 0 deletions src/specsscan/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,9 @@ def load_scan(
except KeyError:
pass

# reset metadata
self.metadata = {}

self.metadata.update(
**handle_meta(
df_lut=df_lut,
Expand Down Expand Up @@ -540,6 +543,9 @@ def check_scan(
fast_axes = set(res_xarray.dims) - slow_axes
projection = "reciprocal" if "Angle" in fast_axes else "real"

# reset metadata
self.metadata = {}

self.metadata.update(
**handle_meta(
df_lut=df_lut,
Expand Down

0 comments on commit b1e19d3

Please sign in to comment.