From 67543b7111a0a54de1c7700bcda1c56f3767a870 Mon Sep 17 00:00:00 2001
From: Egor Sobolev <egor.sobolev@xfel.eu>
Date: Thu, 29 Jun 2023 00:01:12 +0200
Subject: [PATCH] Add physical names of detector modules
---
src/geomtools/motor/__init__.py | 23 +++++++++++++++++++++++
src/geomtools/sfx/report.py | 12 ++++++++----
2 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/src/geomtools/motor/__init__.py b/src/geomtools/motor/__init__.py
index d426d2c..b1b9e08 100644
--- a/src/geomtools/motor/__init__.py
+++ b/src/geomtools/motor/__init__.py
@@ -1,6 +1,9 @@
import numpy as np
+import os
+import yaml
from extra_data import SourceNameError
+from extra_data.read_machinery import find_proposal
AGIPD1M_MOTOR_KEYS = ([f"q{i // 2 + 1}m{i % 2 + 1}" for i in range(8)] +
@@ -55,3 +58,23 @@ def read_motor_positions(dc, motor_devices, data_selector_id=""):
motors[motor_id] = float(med_pos)
return ts, motors
+
+
+def get_physical_names(det_type, propno, runs):
+ propdir = find_proposal(f"p{propno:06d}")
+ for runno in runs:
+ cal_conf_fn = os.path.join(
+ propdir, f"proc/r{runno:04d}/calibration_metadata.yml")
+ if not os.path.exists(cal_conf_fn):
+ continue
+ with open(cal_conf_fn, "r") as f:
+ cal_conf = yaml.load(f, Loader=yaml.FullLoader)
+
+ phys_names = dict(
+ (modname, conf['physical-detector-unit'])
+ for modname, conf in cal_conf['retrieved-constants'].items()
+ if modname.startswith('AGIPD')
+ )
+ return phys_names
+
+ return None
diff --git a/src/geomtools/sfx/report.py b/src/geomtools/sfx/report.py
index 3e8a35d..8e19bca 100644
--- a/src/geomtools/sfx/report.py
+++ b/src/geomtools/sfx/report.py
@@ -12,14 +12,16 @@ from extra_data import open_run
from .xwizio import parse_xwiz_summary
from .crystfelio import extract_geometry
from geomtools.motor import (
- read_motor_positions, AGIPD1M_MOTORS, AGIPD1M_DATA_SELECTOR
+ read_motor_positions, AGIPD1M_MOTORS, AGIPD1M_DATA_SELECTOR,
+ get_physical_names,
)
REPO = pathlib.Path("/gpfs/exfel/data/scratch/spb_geom")
DET = {
- "AGIPD1M": ("*AGIPD1MCTRL*", AGIPD1M_MOTORS, AGIPD1M_DATA_SELECTOR),
- "Jungfrau4M": ("*JNGFRCTRL*", {}, ""),
+ "AGIPD1M": ("AGIPD", "*AGIPD1MCTRL*",
+ AGIPD1M_MOTORS, AGIPD1M_DATA_SELECTOR),
+ "Jungfrau4M": ("JNGFR", "*JNGFRCTRL*", {}, ""),
}
@@ -100,7 +102,7 @@ def push_geometry():
print("Crystfel stream file:", stream_file)
- ctrlaggr, motors, data_selector = DET[args.detector]
+ detname, ctrlaggr, motors, data_selector = DET[args.detector]
dc = open_run(propno, runs[0], data='raw', include=ctrlaggr)
date = dc.run_metadata()['creationDate']
@@ -126,6 +128,7 @@ def push_geometry():
dc = dc.union(open_run(propno, runno, include="*-DA??-*"))
ts, motor_pos = read_motor_positions(dc, motors, data_selector)
+ phys_names = get_physical_names(detname, propno, runs)
meta = {
'proposal': propno,
@@ -136,6 +139,7 @@ def push_geometry():
'sample': args.sample,
'date': date,
'motors': motor_pos,
+ 'modules': phys_names,
}
geom_file.with_suffix(".yaml").write_text(yaml.dump(meta))
--
GitLab