Skip to content

Commit 5f35535

Browse files
committed
add camera metadata to nomad
1 parent 6cad852 commit 5f35535

File tree

4 files changed

+41
-3
lines changed

4 files changed

+41
-3
lines changed

multilog/devices/basler_camera.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ def __init__(self, config, name="BaslerCamera"):
2626
config.yml in the devices-section).
2727
name (str, optional): Device name.
2828
"""
29+
self.config = config
2930
logger.info(f"Initializing BaslerCamera device '{name}'")
3031
self.name = name
3132
self._timeout = config["timeout"]
@@ -114,6 +115,9 @@ def write_nomad_files(self, directory="./"):
114115
"./multilog/nomad/archive_template_Camera.yml",
115116
f"{directory}/{self.name}.archive.yaml",
116117
)
118+
with open(f"{self.base_directory}/{self.name}.archive.yaml", "a") as f:
119+
f.write(f" exposure_time: {self.config['exposure-time']}\n")
120+
f.write(f" ir_images_list:\n")
117121

118122
def save_measurement(self, time_abs, time_rel, sampling):
119123
"""Write measurement data to files:

multilog/devices/optris_ip640.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ def __init__(self, config, name="OptrisIP640", xml_dir="./"):
3232
xml_dir(str, optional): Directory for xml-file with device
3333
configuration. Defaults to "./".
3434
"""
35+
self.config = config
3536
logger.info(f"Initializing OptrisIP640 device '{name}'")
3637
self.name = name
3738
self.emissivity = config["emissivity"]
@@ -147,6 +148,13 @@ def write_nomad_files(self, directory="./"):
147148
"./multilog/nomad/archive_template_IR-Camera.yml",
148149
f"{directory}/{self.name}.archive.yaml",
149150
)
151+
with open(f"{self.base_directory}/{self.name}.archive.yaml", "a") as f:
152+
f.write(f" emissivity: {self.emissivity}\n")
153+
f.write(f" transmissivity: {self.transmissivity}\n")
154+
f.write(f" ambient_temperature: {self.t_ambient}\n")
155+
f.write(f" measurement_range: '{self.config['measurement-range']}'\n")
156+
f.write(f" extended_temperature_range: {self.config['extended-T-range']}\n")
157+
f.write(f" ir_images_list:\n")
150158

151159
def save_measurement(self, time_abs, time_rel, sampling):
152160
"""Write measurement data to files:
@@ -179,7 +187,7 @@ def save_measurement(self, time_abs, time_rel, sampling):
179187
f.write(
180188
f"{time_abs.isoformat(timespec='milliseconds').replace('T', ' ')},{time_rel},{img_name},\n"
181189
)
182-
with open(f"{self.base_directory}/{self.name}.archive.yaml", "a") as f: # todo
190+
with open(f"{self.base_directory}/{self.name}.archive.yaml", "a") as f:
183191
f.write(f" - name: {img_name}\n")
184192
f.write(f" image: {self.directory}/{img_name}.png\n")
185193
f.write(f" heat_map: {self.directory}/{img_name}.csv\n")

multilog/nomad/archive_template_Camera.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,14 @@ definitions:
3333
images_list:
3434
repeats: true
3535
section: '#/image'
36+
quantities:
37+
exposure_time:
38+
type: np.float64
39+
description: Exposure time in micro seconds
3640
data:
3741
m_def: camera
38-
images_list:
42+
# exposure_time: 10.e+3
43+
# images_list:
3944
# - name: test1
4045
# image: test1.png
4146
# heat_map: test1.dat

multilog/nomad/archive_template_IR-Camera.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,30 @@ definitions:
4141
ir_images_list:
4242
repeats: true
4343
section: '#/IR_image'
44+
quantities:
45+
emissivity:
46+
type: np.float64
47+
description: Emissivity of the measurement series
48+
transmissivity:
49+
type: np.float64
50+
description: Transmissivity of the measurement series
51+
ambient_temperature:
52+
type: np.float64
53+
description: Ambient temperature of the measurement series
54+
measurement_range:
55+
type: str
56+
description: Measurement range of the measurement series
57+
extended_temperature_range:
58+
type: int
59+
description: "0: off, 1: on"
4460
data:
4561
m_def: IR_camera
46-
ir_images_list:
62+
# emissivity: 1
63+
# transmissivity: 1
64+
# ambient_temperature: -1000
65+
# measurement_range: "[0, 250]"
66+
# extended_temperature_range: 0
67+
# ir_images_list:
4768
# - name: test1
4869
# image: test1.png
4970
# heat_map: test1.dat

0 commit comments

Comments
 (0)