Skip to content

fix: xrf-map bugs described in #389 #390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
keara-soloway merged 1 commit into from
Nov 3, 2026
Merged

fix: xrf-map bugs described in #389 #390

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions CHAP/xrf/raw_data_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
`NXentry` structure with :class:`~CHAP.common.processor.MapProcessor`.
"""
import argparse
import json
import logging
import os
import sys
from typing import Literal
import yaml

from CHAP.common.map_utils import SpecScanToMapConfigProcessor
from CHAP.common.processor import MapProcessor
Expand All @@ -17,7 +19,7 @@
VORTEX_CONFIG = {
'detectors': [
{'id': i}
for i in range(3)
for i in range(4)
]
}

Expand Down Expand Up @@ -114,7 +116,7 @@ def __call__(self, parser, namespace, values, option_string=None):
if os.path.isfile(values):
# Try loading detector_config from .yaml file
with open(values, 'r') as inf:
detector_config = yaml.load(inf)
detector_config = yaml.safe_load(inf)
elif isinstance(values, str):
# Try loading detector_config from JSON string
detector_config = json.loads(values)
Expand Down Expand Up @@ -225,6 +227,7 @@ def run():

logger.info(f'Using detector configuration {args.detector_config}')
map_config = get_map_config(args)
map_config['spec_scans'][0]['spec_file'] = args.spec_file
logger.info(f'Using map configuration {map_config}')
mapprocessor_config = {
'config': map_config,
Expand Down
Loading