diff --git a/Framework/PythonInterface/plugins/algorithms/GenerateLogbook.py b/Framework/PythonInterface/plugins/algorithms/GenerateLogbook.py
index 54cd919abf976c50d8f8f945aecace363d704aaf..a9f2b8fa9285423671ae90848f3188f721586fc0 100644
--- a/Framework/PythonInterface/plugins/algorithms/GenerateLogbook.py
+++ b/Framework/PythonInterface/plugins/algorithms/GenerateLogbook.py
@@ -127,10 +127,74 @@ class GenerateLogbook(PythonAlgorithm):
raise RuntimeError("There are no files in {} with specified numors.".format(self._data_directory))
return file_list
- def _get_default_entries(self):
+ def _get_optional_entries(self, parameters):
+ try:
+ logbook_optional_parameters = parameters.getStringParameter('logbook_optional_parameters')[0]
+ except IndexError:
+ raise RuntimeError("Optional headers are requested but are not defined for {}.".format(self._instrument))
+ else:
+ logbook_optional_parameters = logbook_optional_parameters.split(',')
+ # create tmp dictionary with headers and paths read from IPF with whitespaces removed from the header
+ optional_entries = dict()
+ for entry in logbook_optional_parameters:
+ optional_entry = entry.split(':')
+ if len(optional_entry) < 3:
+ optional_entry.append('s')
+ optional_entries[(optional_entry[2], str(optional_entry[0]).strip())] = optional_entry[1]
+ requested_headers = self.getPropertyValue('OptionalHeaders')
+ if str(requested_headers).casefold() == 'all':
+ for type, header in optional_entries:
+ self._metadata_headers.append((type, header))
+ self._metadata_entries.append(optional_entries[(type, header)])
+ else:
+ for header in requested_headers.split(','):
+ for type in ['s', 'd', 'f']:
+ if (type, header) in optional_entries:
+ self._metadata_headers.append((type, header))
+ self._metadata_entries.append(optional_entries[(type, header)])
+ break
+ if (('s', header) not in optional_entries and ('d', header) not in optional_entries
+ and ('f', header) not in optional_entries):
+ raise RuntimeError("Header {} requested, but not defined for {}.".format(header, self._instrument))
+
+ def _get_custom_entries(self):
+ logbook_custom_entries = self.getPropertyValue('CustomEntries')
+ logbook_custom_entries = logbook_custom_entries.split(',')
+ for entry in logbook_custom_entries:
+ self._metadata_entries.append(entry.split(':')[0])
+ logbook_custom_headers = [""] * len(logbook_custom_entries)
+ operators = ["+", "-", "*", "//"]
+ columnType = 's'
+ if self.getProperty('CustomHeaders').isDefault:
+ # derive headers from custom entries:
+ for entry_no, entry in enumerate(logbook_custom_entries):
+ entry_content = entry.split(':')
+ if len(entry_content) > 1:
+ columnType = entry_content[1]
+ if any(op in entry_content[0] for op in operators):
+ list_entries, binary_operations = self._process_regex(entry_content[0])
+ header = ""
+ for split_entry_no, split_entry in enumerate(list_entries):
+ # always use two strings around the final '/' for more informative header
+ partial_header = split_entry[split_entry.rfind('/', 0,
+ split_entry.rfind('/') - 1) + 1:]
+ header += partial_header
+ header += binary_operations[split_entry_no] \
+ if split_entry_no < len(binary_operations) else ""
+ logbook_custom_headers[entry_no] = (columnType, header)
+ else:
+ # always use two strings around the final '/' for more informative header
+ logbook_custom_headers[entry_no] = \
+ (columnType, (entry_content[0])[entry_content[0].rfind('/', 0, entry_content[0].rfind('/') - 1) + 1:])
+ else:
+ logbook_custom_headers = self.getPropertyValue('CustomHeaders')
+ logbook_custom_headers = [(columnType, header) for header in logbook_custom_headers.split(',')]
+ return logbook_custom_headers
+
+ def _get_entries(self):
"""Gets default and optional metadata entries using the specified instrument IPF."""
self._metadata_entries = []
- self._metadata_headers = ['run_number']
+ self._metadata_headers = [('d', 'run_number')]
tmp_instr = self._instrument + '_tmp'
# Load empty instrument to access parameters defining metadata entries to be searched
LoadEmptyInstrument(Filename=self._instrument + "_Definition.xml", OutputWorkspace=tmp_instr)
@@ -139,69 +203,27 @@ class GenerateLogbook(PythonAlgorithm):
logbook_default_parameters = (parameters.getStringParameter('logbook_default_parameters')[0]).split(',')
for parameter in logbook_default_parameters:
parameter = parameter.split(':')
- self._metadata_headers.append(str(parameter[0]).strip()) # removes whitespaces
+ if len(parameter) < 3:
+ parameter.append('s')
+ # type, header, strip removes whitespaces
+ self._metadata_headers.append((parameter[2], str(parameter[0]).strip()))
self._metadata_entries.append(parameter[1])
except IndexError:
raise RuntimeError("The default logbook entries and headers are not defined for {}".format(self._instrument))
default_entries = list(self._metadata_entries)
if not self.getProperty('OptionalHeaders').isDefault:
- try:
- logbook_optional_parameters = parameters.getStringParameter('logbook_optional_parameters')[0]
- except IndexError:
- raise RuntimeError("Optional headers are requested but are not defined for {}.".format(self._instrument))
- else:
- logbook_optional_parameters = logbook_optional_parameters.split(',')
- # create tmp dictionary with headers and paths read from IPF with whitespaces removed from the header
- optional_entries = {str(entry.split(':')[0]).strip() : entry.split(':')[1]
- for entry in logbook_optional_parameters}
- requested_headers = self.getPropertyValue('OptionalHeaders')
- if str(requested_headers).casefold() == 'all':
- for header in optional_entries:
- self._metadata_headers.append(header)
- self._metadata_entries.append(optional_entries[header])
- else:
- for header in requested_headers.split(','):
- if header in optional_entries:
- self._metadata_headers.append(header)
- self._metadata_entries.append(optional_entries[header])
- else:
- raise RuntimeError("Header {} requested, but not defined for {}.".format(header,
- self._instrument))
+ self._get_optional_entries(parameters)
if not self.getProperty('CustomEntries').isDefault:
- logbook_custom_entries = self.getPropertyValue('CustomEntries')
- logbook_custom_entries = logbook_custom_entries.split(',')
- self._metadata_entries += logbook_custom_entries
- logbook_custom_headers = [""]*len(logbook_custom_entries)
- operators = ["+", "-", "*", "//"]
- if self.getProperty('CustomHeaders').isDefault:
- # derive headers from custom entries:
- for entry_no, entry in enumerate(logbook_custom_entries):
- if any(op in entry for op in operators):
- list_entries, binary_operations = self._process_regex(entry)
- header = ""
- for split_entry_no, split_entry in enumerate(list_entries):
- # always use two strings around the final '/' for more informative header
- partial_header = split_entry[split_entry.rfind('/', 0,
- split_entry.rfind('/') - 1) + 1:]
- header += partial_header
- header += binary_operations[split_entry_no]\
- if split_entry_no < len(binary_operations) else ""
- logbook_custom_headers[entry_no] = header
- else:
- # always use two strings around the final '/' for more informative header
- logbook_custom_headers[entry_no] = entry[entry.rfind('/', 0, entry.rfind('/') - 1) + 1:]
- else:
- logbook_custom_headers = self.getPropertyValue('CustomHeaders')
- logbook_custom_headers = logbook_custom_headers.split(',')
+ logbook_custom_headers = self._get_custom_entries()
self._metadata_headers += logbook_custom_headers
DeleteWorkspace(Workspace=tmp_instr)
return default_entries
def _verify_contains_metadata(self, data_array):
"""Verifies that the raw data indeed contains the desired meta-data to be logged."""
- default_entries = self._get_default_entries()
+ default_entries = self._get_entries()
data_path = os.path.join(self._data_directory, data_array[0] + '.nxs')
# check only if default entries exist in the first file in the directory
with h5py.File(data_path, 'r') as f:
@@ -215,8 +237,9 @@ class GenerateLogbook(PythonAlgorithm):
"""Prepares the TableWorkspace logbook for filling with entries, sets up the headers."""
logbook_ws = self.getPropertyValue('OutputWorkspace')
CreateEmptyTableWorkspace(OutputWorkspace=logbook_ws)
- for headline in self._metadata_headers:
- mtd[logbook_ws].addColumn("str", headline)
+ type_dict = {'s': 'str', 'd': 'int', 'f': 'float'}
+ for type, headline in self._metadata_headers:
+ mtd[logbook_ws].addColumn(type_dict[type], headline)
return logbook_ws
def _perform_binary_operations(self, values, binary_operations, operations):
@@ -272,6 +295,22 @@ class GenerateLogbook(PythonAlgorithm):
list_entries.append(entry[prev_pos:]) # add the last remaining file
return list_entries, binary_operations
+ @staticmethod
+ def _perform_cast(data, type):
+ if type == 'f':
+ try:
+ data = float(data)
+ except ValueError:
+ data = np.nan
+ elif type == 'd':
+ try:
+ data = int(data)
+ except ValueError:
+ data = -99999
+ elif type == 's':
+ data = str(data)
+ return data
+
def _fill_logbook(self, logbook_ws, data_array, progress):
"""Fills out the logbook with the requested meta-data."""
n_entries = len(self._metadata_headers)
@@ -286,7 +325,7 @@ class GenerateLogbook(PythonAlgorithm):
file_path = os.path.join(self._data_directory, file_name + '.nxs')
with h5py.File(file_path, 'r') as f:
rowData = np.empty(n_entries, dtype=object)
- rowData[0] = str(file_name)
+ rowData[0] = int(file_name)
for entry_no, entry in enumerate(self._metadata_entries, 1):
if any(op in entry for op in operators):
if entry in cache_entries_ops:
@@ -327,24 +366,26 @@ class GenerateLogbook(PythonAlgorithm):
tmp_data += str(value) + ','
rowData[entry_no] = tmp_data[:-1]
else:
- rowData[entry_no] = str(values[0]).strip()
+ data = self._perform_cast(values[0], self._metadata_headers[entry_no][0])
+ rowData[entry_no] = data
else:
try:
entry, index = self._get_index(entry)
data = f.get(entry)[index]
except TypeError:
- rowData[entry_no] = "Not found"
+ data = "Not found"
self.log().warning(entry_not_found_msg.format(entry))
- else:
- if isinstance(data, np.ndarray):
- tmp_data = ""
- for array in data:
- tmp_data += ",".join(array)
- data = tmp_data
- elif isinstance(data, np.bytes_):
- data = data.decode('utf-8')
- data = data.replace(',', ';') # needed for CSV output
- rowData[entry_no] = str(data).strip()
+
+ if isinstance(data, np.ndarray):
+ tmp_data = ""
+ for array in data:
+ tmp_data += ",".join(array)
+ data = tmp_data
+ elif isinstance(data, np.bytes_):
+ data = data.decode('utf-8')
+ data = str(data.replace(',', ';')).strip() # needed for CSV output
+ data = self._perform_cast(data, self._metadata_headers[entry_no][0])
+ rowData[entry_no] = data
mtd[logbook_ws].addRow(rowData)
def _store_logbook_as_csv(self, logbook_ws):
diff --git a/Testing/SystemTests/tests/framework/GenerateLogbookTest.py b/Testing/SystemTests/tests/framework/GenerateLogbookTest.py
index 5d5371e846aefc8e74b6ce47f334e228bc83c82b..716f9491b1530cba1c97bf69f3202d9f926f5e86 100644
--- a/Testing/SystemTests/tests/framework/GenerateLogbookTest.py
+++ b/Testing/SystemTests/tests/framework/GenerateLogbookTest.py
@@ -28,7 +28,7 @@ class D11_GenerateLogbook_Test(systemtesting.MantidSystemTest):
data_dirs = config['datasearch.directories'].split(';')
test_data_dir = [p for p in data_dirs if 'SystemTest' in p][0]
- d11_dir = 'ILL/D11'
+ d11_dir = os.path.join('ILL', 'D11')
if 'ILL' in test_data_dir:
d11_dir = 'D11'
self._data_directory = os.path.abspath(os.path.join(test_data_dir, d11_dir))
@@ -65,7 +65,7 @@ class D11B_GenerateLogbook_Test(systemtesting.MantidSystemTest):
data_dirs = config['datasearch.directories'].split(';')
test_data_dir = [p for p in data_dirs if 'SystemTest' in p][0]
- d11b_dir = 'ILL/D11B'
+ d11b_dir = os.path.join('ILL', 'D11B')
if 'ILL' in test_data_dir:
d11b_dir = 'D11B'
self._data_directory = os.path.abspath(os.path.join(test_data_dir, d11b_dir))
@@ -103,7 +103,7 @@ class D22_GenerateLogbook_Test(systemtesting.MantidSystemTest):
data_dirs = config['datasearch.directories'].split(';')
test_data_dir = [p for p in data_dirs if 'SystemTest' in p][0]
- d22_dir = 'ILL/D22'
+ d22_dir = os.path.join('ILL', 'D22')
if 'ILL' in test_data_dir:
d22_dir = 'D22'
self._data_directory = os.path.abspath(os.path.join(test_data_dir, d22_dir))
@@ -141,7 +141,7 @@ class D22B_GenerateLogbook_Test(systemtesting.MantidSystemTest):
data_dirs = config['datasearch.directories'].split(';')
test_data_dir = [p for p in data_dirs if 'SystemTest' in p][0]
- d22b_dir = 'ILL/D22B'
+ d22b_dir = os.path.join('ILL', 'D22B')
if 'ILL' in test_data_dir:
d22b_dir = 'D22B'
self._data_directory = os.path.abspath(os.path.join(test_data_dir, d22b_dir))
@@ -179,7 +179,7 @@ class IN4_GenerateLogbook_Test(systemtesting.MantidSystemTest):
data_dirs = config['datasearch.directories'].split(';')
test_data_dir = [p for p in data_dirs if 'SystemTest' in p][0]
- in4_dir = 'ILL/IN4'
+ in4_dir = os.path.join('ILL', 'IN4')
if 'ILL' in test_data_dir:
in4_dir = 'IN4'
self._data_directory = os.path.abspath(os.path.join(test_data_dir, in4_dir))
@@ -217,7 +217,7 @@ class IN5_GenerateLogbook_Test(systemtesting.MantidSystemTest):
data_dirs = config['datasearch.directories'].split(';')
test_data_dir = [p for p in data_dirs if 'SystemTest' in p][0]
- in5_dir = 'ILL/IN5'
+ in5_dir = os.path.join('ILL', 'IN5')
if 'ILL' in test_data_dir:
in5_dir = 'IN5'
self._data_directory = os.path.abspath(os.path.join(test_data_dir, in5_dir))
@@ -255,7 +255,7 @@ class IN6_GenerateLogbook_Test(systemtesting.MantidSystemTest):
data_dirs = config['datasearch.directories'].split(';')
test_data_dir = [p for p in data_dirs if 'SystemTest' in p][0]
- in6_dir = 'ILL/IN6'
+ in6_dir = os.path.join('ILL', 'IN6')
if 'ILL' in test_data_dir:
in6_dir = 'IN6'
self._data_directory = os.path.abspath(os.path.join(test_data_dir, in6_dir))
@@ -293,7 +293,7 @@ class D33_GenerateLogbook_Test(systemtesting.MantidSystemTest):
data_dirs = config['datasearch.directories'].split(';')
test_data_dir = [p for p in data_dirs if 'SystemTest' in p][0]
- d33_dir = 'ILL/D33'
+ d33_dir = os.path.join('ILL', 'D33')
if 'ILL' in test_data_dir:
d33_dir = 'D33'
self._data_directory = os.path.abspath(os.path.join(test_data_dir, d33_dir))
@@ -331,10 +331,10 @@ class D16_GenerateLogbook_Test(systemtesting.MantidSystemTest):
data_dirs = config['datasearch.directories'].split(';')
test_data_dir = [p for p in data_dirs if 'SystemTest' in p][0]
- d33_dir = 'ILL/D16'
+ d16_dir = os.path.join('ILL', 'D16')
if 'ILL' in test_data_dir:
- d33_dir = 'D16'
- self._data_directory = os.path.abspath(os.path.join(test_data_dir, d33_dir))
+ d16_dir = 'D16'
+ self._data_directory = os.path.abspath(os.path.join(test_data_dir, d16_dir))
def cleanup(self):
mtd.clear()
diff --git a/Testing/SystemTests/tests/framework/reference/D11B_Logbook_Reference.nxs.md5 b/Testing/SystemTests/tests/framework/reference/D11B_Logbook_Reference.nxs.md5
index 298c4bf5527b195ebc5d6b39e62810c8ed03e313..6b797a4cf491461607c9a62a2e1e304a6aea8307 100644
--- a/Testing/SystemTests/tests/framework/reference/D11B_Logbook_Reference.nxs.md5
+++ b/Testing/SystemTests/tests/framework/reference/D11B_Logbook_Reference.nxs.md5
@@ -1 +1 @@
-2b1f7951b15fca02375ebc975979c93a
+c96686dbc789453baf978772ba5c529d
diff --git a/Testing/SystemTests/tests/framework/reference/D11_Logbook_Reference.nxs.md5 b/Testing/SystemTests/tests/framework/reference/D11_Logbook_Reference.nxs.md5
index af69a9709ab62a355459c54edc304852bcb324b3..0a6f48ab2acbf3d81ec0207b1448e62e794cb4d5 100644
--- a/Testing/SystemTests/tests/framework/reference/D11_Logbook_Reference.nxs.md5
+++ b/Testing/SystemTests/tests/framework/reference/D11_Logbook_Reference.nxs.md5
@@ -1 +1 @@
-e0ac4f36057d882aa3c5645e471357b5
+22eefc6ba2019ad5c7ea5c844992b77e
diff --git a/Testing/SystemTests/tests/framework/reference/D16_Logbook_Reference.nxs.md5 b/Testing/SystemTests/tests/framework/reference/D16_Logbook_Reference.nxs.md5
index 46430a4690058189be7818c71ae4d061cfdb185a..3e7072efa89b6563407fd8051b2dbcda7f20ae67 100644
--- a/Testing/SystemTests/tests/framework/reference/D16_Logbook_Reference.nxs.md5
+++ b/Testing/SystemTests/tests/framework/reference/D16_Logbook_Reference.nxs.md5
@@ -1 +1 @@
-80415cf8496a981a3829d3882f69d640
+b0563d7ce052f4a9b56cd4e79960b023
diff --git a/Testing/SystemTests/tests/framework/reference/D22B_Logbook_Reference.nxs.md5 b/Testing/SystemTests/tests/framework/reference/D22B_Logbook_Reference.nxs.md5
index 311a92917bc9a2f1d36295d48556e5d894447494..7bc6ad892f7e2d3e3b09b631b0b8bfbb6bfe4ec0 100644
--- a/Testing/SystemTests/tests/framework/reference/D22B_Logbook_Reference.nxs.md5
+++ b/Testing/SystemTests/tests/framework/reference/D22B_Logbook_Reference.nxs.md5
@@ -1 +1 @@
-bf493c30907b261a4c1b3e63f45c8cba
+f155940307563b8c2f3b910a6645ef86
diff --git a/Testing/SystemTests/tests/framework/reference/D22_Logbook_Reference.nxs.md5 b/Testing/SystemTests/tests/framework/reference/D22_Logbook_Reference.nxs.md5
index c18506d5102f050748a45cb660b89d291366f4e5..e908e14a61bb8cb6175b11b7a7743f535454b66f 100644
--- a/Testing/SystemTests/tests/framework/reference/D22_Logbook_Reference.nxs.md5
+++ b/Testing/SystemTests/tests/framework/reference/D22_Logbook_Reference.nxs.md5
@@ -1 +1 @@
-840ab02b3f81afaa497c8dbb4c1517df
+39cbf889548d799e34b1a4617367e47e
diff --git a/Testing/SystemTests/tests/framework/reference/D33_Logbook_Reference.nxs.md5 b/Testing/SystemTests/tests/framework/reference/D33_Logbook_Reference.nxs.md5
index a551ee059df00bf6717fcacd82f65e11fab84add..0e28a4eb4cbc9345cc99077d2621e3564ded158e 100644
--- a/Testing/SystemTests/tests/framework/reference/D33_Logbook_Reference.nxs.md5
+++ b/Testing/SystemTests/tests/framework/reference/D33_Logbook_Reference.nxs.md5
@@ -1 +1 @@
-1d9fec71735f380892668eea28c8b7b3
+d879e1f85261841dfb96326a2d758682
diff --git a/Testing/SystemTests/tests/framework/reference/IN4_Logbook_Reference.nxs.md5 b/Testing/SystemTests/tests/framework/reference/IN4_Logbook_Reference.nxs.md5
index c188c3f8d6cb65301c53afb8eca346dbe3161429..5c97a1bfd293e2e61d7999f87a9b95bd8c7d37e0 100644
--- a/Testing/SystemTests/tests/framework/reference/IN4_Logbook_Reference.nxs.md5
+++ b/Testing/SystemTests/tests/framework/reference/IN4_Logbook_Reference.nxs.md5
@@ -1 +1 @@
-d6b5e23810e538cdaa81e9bf93dbf024
+362e6ff25c25bda2d07b95cdf65710a4
diff --git a/Testing/SystemTests/tests/framework/reference/IN5_Logbook_Reference.nxs.md5 b/Testing/SystemTests/tests/framework/reference/IN5_Logbook_Reference.nxs.md5
index 89d4c16886be802bbfb99048b1e7d93015ab9231..5bcf172b65a0e3eea2e2557278fd92f3f1d90cdb 100644
--- a/Testing/SystemTests/tests/framework/reference/IN5_Logbook_Reference.nxs.md5
+++ b/Testing/SystemTests/tests/framework/reference/IN5_Logbook_Reference.nxs.md5
@@ -1 +1 @@
-d76718b8119d6e6be0e916e88be3d790
+2570b1c0ef3989fe6d889b5ab17f1571
diff --git a/Testing/SystemTests/tests/framework/reference/IN6_Logbook_Reference.nxs.md5 b/Testing/SystemTests/tests/framework/reference/IN6_Logbook_Reference.nxs.md5
index b143237a352bc43cd505e216c01cd1e8c1439256..18c42eb69389c6837f14b46e5f6e3fcbd419711d 100644
--- a/Testing/SystemTests/tests/framework/reference/IN6_Logbook_Reference.nxs.md5
+++ b/Testing/SystemTests/tests/framework/reference/IN6_Logbook_Reference.nxs.md5
@@ -1 +1 @@
-2b3efd1c722dcc1b54b81ec5f1482bdd
+83893c13ab0191b3230ece1aab7e354f
diff --git a/instrument/D11B_Parameters.xml b/instrument/D11B_Parameters.xml
index 88772630efd01f6796f4b8e85cd8557044f15676..e1390042da94a73a59130a90de88dc954c931663 100644
--- a/instrument/D11B_Parameters.xml
+++ b/instrument/D11B_Parameters.xml
@@ -25,75 +25,75 @@
</parameter>
<!-- These parameters are used to define headers and entries for GenerateLogbook algorithm -->
<parameter name="logbook_default_parameters" type="string">
- <value val="SampleDescription:/entry0/sample_description,
- TotalTime:/entry0/duration,
- RateMonitor1:/entry0/monitor1/monrate,
- TotalCountsDetMain:/entry0/D11/Detector 1/detsum,
- RateCountsDetMain:/entry0/D11/Detector 1/detrate,
- StartTime:/entry0/start_time,
- Wavelength:/entry0/D11/selector/wavelength,
- Attenuator:/entry0/D11/attenuator/attenuation_value,
- Collimation:/entry0/D11/collimation/actual_position,
- SD:/entry0/D11/Detector 1/det_actual,
- BeamStopY:/entry0/D11/beamstop/by_actual" />
+ <value val="SampleDescription:/entry0/sample_description:s,
+ TotalTime:/entry0/duration:d,
+ RateMonitor1:/entry0/monitor1/monrate:f,
+ TotalCountsDetMain:/entry0/D11/Detector 1/detsum:d,
+ RateCountsDetMain:/entry0/D11/Detector 1/detrate:d,
+ StartTime:/entry0/start_time:s,
+ Wavelength:/entry0/D11/selector/wavelength:f,
+ Attenuator:/entry0/D11/attenuator/attenuation_value:f,
+ Collimation:/entry0/D11/collimation/actual_position:f,
+ SD:/entry0/D11/Detector 1/det_actual:f,
+ BeamStopY:/entry0/D11/beamstop/by_actual:f" />
</parameter>
<parameter name="logbook_optional_parameters" type="string">
- <value val="AcquisitionMode:/entry0/acquisition_mode,
- TotalCountsDetAll:/entry0/D11/Detector 1/detsum+/entry0/D11/Detector 2/detsum+/entry0/D11/Detector 3/detsum,
- Beamstop:/entry0/D11/beamstop/actual_beamstop_number,
- VelocitySelectorSpeed:/entry0/D11/selector/rotation_speed,
- VelocitySelectorTilt:/entry0/D11/selector/selrot_actual,
- AttenuationFactor:/entry0/D11/attenuator/attenuation_coefficient,
- Diaphragm1:/entry0/D11/collimation/diaphragm1_position,
- Diaphragm2:/entry0/D11/collimation/diaphragm2_position,
- Diaphragm3:/entry0/D11/collimation/diaphragm3_position,
- Diaphragm4:/entry0/D11/collimation/diaphragm4_position,
- Diaphragm5:/entry0/D11/collimation/diaphragm5_position,
- Diaphragm6:/entry0/D11/collimation/diaphragm6_position,
- Guide1:/entry0/D11/collimation/col1_actual_state,
- Guide2:/entry0/D11/collimation/col2_actual_state,
- Guide3:/entry0/D11/collimation/col3_actual_state,
- Guide4:/entry0/D11/collimation/col4_actual_state,
- Guide5:/entry0/D11/collimation/col5_actual_state,
- Guide6:/entry0/D11/collimation/col6_actual_state,
- Guide7:/entry0/D11/collimation/col7_actual_state,
- Guide8:/entry0/D11/collimation/col8_actual_state,
- Guide9:/entry0/D11/collimation/col9_actual_state,
- Guide10:/entry0/D11/collimation/col10_actual_state,
- Guide11:/entry0/D11/collimation/col11_actual_state,
- Guide12:/entry0/D11/collimation/col12_actual_state,
- Guide13:/entry0/D11/collimation/col13_actual_state,
- TotalCountsMonitor1:/entry0/monitor1/monsum,
- ReactorPower:/entry0/reactor_power,
- BeamstopX:/entry0/D11/beamstop/bx_actual,
- BeamstopX2:/entry0/D11/beamstop/bx2_actual,
- TotalCountsDetLeft:/entry0/D11/Detector 2/detsum,
- TotalCountsDetRight:/entry0/D11/Detector 3/detsum,
- RateCountsDetLeft:/entry0/D11/Detector 2/detrate,
- RateCountsDetRight:/entry0/D11/Detector 3/detrate,
- san:/entry0/sample/san_actual,
- omega:/entry0/sample/omega_actual,
- phi:/entry0/sample/phi_actual,
- sdi:/entry0/sample/sdi_actual,
- sht:/entry0/sample/sht_actual,
- str:/entry0/sample/str_actual,
- trs:/entry0/sample/trs_actual,
- SampleTemperature:/entry0/sample/temperature,
- AirTemperature:/entry0/sample/air_temperature,
- RackTemperature:/entry0/sample/rack_temperature,
- Bath1Temperature:/entry0/sample/bath1_regulation_temperature,
- Bath2Temperature:/entry0/sample/bath2_regulation_temperature,
- BathSelector:/entry0/sample/Actual bath,
- Thermocouple1:/entry0/sample/thermo_temperature1,
- Thermocouple2:/entry0/sample/thermo_temperature2,
- SampleChanger:/entry0/sample/sample_changer_nickname,
- Position:/entry0/sample/sample_changer_slot_value,
- SampleThickness:/entry0/sample/thickness,
- MeasurementType:/entry0/D11/MeasurementType/typeOfMeasure,
- SampleType:/entry0/D11/MeasurementType/typeOfSample,
- SampleSubType:/entry0/D11/MeasurementType/subType,
- SampleApertureWidth:/entry0/D11/Beam/sample_ap_x_or_diam,
- SampleApertureHeight:/entry0/D11/Beam/sample_ap_y" />
+ <value val="AcquisitionMode:/entry0/acquisition_mode:d,
+ TotalCountsDetAll:/entry0/D11/Detector 1/detsum+/entry0/D11/Detector 2/detsum+/entry0/D11/Detector 3/detsum:d,
+ Beamstop:/entry0/D11/beamstop/actual_beamstop_number:f,
+ VelocitySelectorSpeed:/entry0/D11/selector/rotation_speed:f,
+ VelocitySelectorTilt:/entry0/D11/selector/selrot_actual:f,
+ AttenuationFactor:/entry0/D11/attenuator/attenuation_coefficient:f,
+ Diaphragm1:/entry0/D11/collimation/diaphragm1_position:f,
+ Diaphragm2:/entry0/D11/collimation/diaphragm2_position:f,
+ Diaphragm3:/entry0/D11/collimation/diaphragm3_position:f,
+ Diaphragm4:/entry0/D11/collimation/diaphragm4_position:f,
+ Diaphragm5:/entry0/D11/collimation/diaphragm5_position:f,
+ Diaphragm6:/entry0/D11/collimation/diaphragm6_position:f,
+ Guide1:/entry0/D11/collimation/col1_actual_state:f,
+ Guide2:/entry0/D11/collimation/col2_actual_state:f,
+ Guide3:/entry0/D11/collimation/col3_actual_state:f,
+ Guide4:/entry0/D11/collimation/col4_actual_state:f,
+ Guide5:/entry0/D11/collimation/col5_actual_state:f,
+ Guide6:/entry0/D11/collimation/col6_actual_state:f,
+ Guide7:/entry0/D11/collimation/col7_actual_state:f,
+ Guide8:/entry0/D11/collimation/col8_actual_state:f,
+ Guide9:/entry0/D11/collimation/col9_actual_state:f,
+ Guide10:/entry0/D11/collimation/col10_actual_state:f,
+ Guide11:/entry0/D11/collimation/col11_actual_state:f,
+ Guide12:/entry0/D11/collimation/col12_actual_state:f,
+ Guide13:/entry0/D11/collimation/col13_actual_state:f,
+ TotalCountsMonitor1:/entry0/monitor1/monsum:d,
+ ReactorPower:/entry0/reactor_power:f,
+ BeamstopX:/entry0/D11/beamstop/bx_actual:f,
+ BeamstopX2:/entry0/D11/beamstop/bx2_actual:f,
+ TotalCountsDetLeft:/entry0/D11/Detector 2/detsum:d,
+ TotalCountsDetRight:/entry0/D11/Detector 3/detsum:d,
+ RateCountsDetLeft:/entry0/D11/Detector 2/detrate:f,
+ RateCountsDetRight:/entry0/D11/Detector 3/detrate:f,
+ san:/entry0/sample/san_actual:f,
+ omega:/entry0/sample/omega_actual:f,
+ phi:/entry0/sample/phi_actual:f,
+ sdi:/entry0/sample/sdi_actual:f,
+ sht:/entry0/sample/sht_actual:f,
+ str:/entry0/sample/str_actual:f,
+ trs:/entry0/sample/trs_actual:f,
+ SampleTemperature:/entry0/sample/temperature:f,
+ AirTemperature:/entry0/sample/air_temperature:f,
+ RackTemperature:/entry0/sample/rack_temperature:f,
+ Bath1Temperature:/entry0/sample/bath1_regulation_temperature:f,
+ Bath2Temperature:/entry0/sample/bath2_regulation_temperature:f,
+ BathSelector:/entry0/sample/Actual bath:s,
+ Thermocouple1:/entry0/sample/thermo_temperature1:f,
+ Thermocouple2:/entry0/sample/thermo_temperature2:f,
+ SampleChanger:/entry0/sample/sample_changer_nickname:s,
+ Position:/entry0/sample/sample_changer_slot_value:s,
+ SampleThickness:/entry0/sample/thickness:f,
+ MeasurementType:/entry0/D11/MeasurementType/typeOfMeasure:s,
+ SampleType:/entry0/D11/MeasurementType/typeOfSample:s,
+ SampleSubType:/entry0/D11/MeasurementType/subType:s,
+ SampleApertureWidth:/entry0/D11/Beam/sample_ap_x_or_diam:f,
+ SampleApertureHeight:/entry0/D11/Beam/sample_ap_y:f" />
</parameter>
</component-link>
<!-- These parameters are used in ParallaxCorrection algorithm -->
diff --git a/instrument/D11_Parameters.xml b/instrument/D11_Parameters.xml
index 5ad42b67740e1fadcca3b200f47015ac7fc55f9c..3ac26e34bd157cf1bdd4e5da05cf7aae848f723d 100644
--- a/instrument/D11_Parameters.xml
+++ b/instrument/D11_Parameters.xml
@@ -26,71 +26,71 @@
<!-- These parameters are used to define headers and entries for GenerateLogbook algorithm -->
<parameter name="logbook_default_parameters" type="string">
- <value val="SampleDescription:/entry0/sample_description,
- TotalTime:/entry0/duration,
- RateMonitor1:/entry0/monitor1/monrate,
- TotalCountsDetMain:/entry0/D11/detector/detsum,
- RateCountsDetMain:/entry0/D11/detector/detrate,
- StartTime:/entry0/start_time,
- Wavelength:/entry0/D11/selector/wavelength,
- Attenuator:/entry0/D11/attenuator/attenuation_value,
- Collimation:/entry0/D11/collimation/actual_position,
- SD:/entry0/D11/detector/det_actual,
- BeamStopY:/entry0/D11/beamstop/by_actual" />
+ <value val="SampleDescription:/entry0/sample_description:s,
+ TotalTime:/entry0/duration:d,
+ RateMonitor1:/entry0/monitor1/monrate:d,
+ TotalCountsDetMain:/entry0/D11/detector/detsum:d,
+ RateCountsDetMain:/entry0/D11/detector/detrate:f,
+ StartTime:/entry0/start_time:s,
+ Wavelength:/entry0/D11/selector/wavelength:f,
+ Attenuator:/entry0/D11/attenuator/attenuation_value:f,
+ Collimation:/entry0/D11/collimation/actual_position:f,
+ SD:/entry0/D11/detector/det_actual:f,
+ BeamStopY:/entry0/D11/beamstop/by_actual:f" />
</parameter>
<parameter name="logbook_optional_parameters" type="string">
- <value val="AcquisitionMode:/entry0/acquisition_mode,
- TotalCountsDetAll:/entry0/D11/detector/detsum+/entry0/D11/detectorLeft/detsum+/entry0/D11/detectorRight/detsum,
- Beamstop:/entry0/D11/beamstop/actual_beamstop_number,
- VelocitySelectorSpeed:/entry0/D11/selector/rotation_speed,
- VelocitySelectorTilt:/entry0/D11/selector/selrot_actual,
- AttenuationFactor:/entry0/D11/attenuator/attenuation_coefficient,
- Diaphragm1:/entry0/D11/collimation/diaphragm1_position,
- Diaphragm2:/entry0/D11/collimation/diaphragm2_position,
- Diaphragm3:/entry0/D11/collimation/diaphragm3_position,
- Diaphragm4:/entry0/D11/collimation/diaphragm4_position,
- Diaphragm5:/entry0/D11/collimation/diaphragm5_position,
- Diaphragm6:/entry0/D11/collimation/diaphragm6_position,
- Guide1:/entry0/D11/collimation/col1_actual_state,
- Guide2:/entry0/D11/collimation/col2_actual_state,
- Guide3:/entry0/D11/collimation/col3_actual_state,
- Guide4:/entry0/D11/collimation/col4_actual_state,
- Guide5:/entry0/D11/collimation/col5_actual_state,
- Guide6:/entry0/D11/collimation/col6_actual_state,
- Guide7:/entry0/D11/collimation/col7_actual_state,
- Guide8:/entry0/D11/collimation/col8_actual_state,
- Guide9:/entry0/D11/collimation/col9_actual_state,
- Guide10:/entry0/D11/collimation/col10_actual_state,
- Guide11:/entry0/D11/collimation/col11_actual_state,
- Guide12:/entry0/D11/collimation/col12_actual_state,
- Guide13:/entry0/D11/collimation/col13_actual_state,
- TotalCountsMonitor1:/entry0/monitor1/monsum,
- ReactorPower:/entry0/reactor_power,
- BeamstopX:/entry0/D11/beamstop/bx_actual,
- TotalCountsDetLeft:/entry0/D11/detectorLeft/detsum,
- TotalCountsDetRight:/entry0/D11/detectorRight/detsum,
- RateCountsDetLeft:/entry0/D11/detectorLeft/detrate,
- RateCountsDetRight:/entry0/D11/detectorRight/detrate,
- san:/entry0/sample/san_actual,
- omega:/entry0/sample/omega_actual,
- phi:/entry0/sample/phi_actual,
- sdi:/entry0/sample/sdi_actual,
- sht:/entry0/sample/sht_actual,
- str:/entry0/sample/str_actual,
- trs:/entry0/sample/trs_actual,
- SampleTemperature:/entry0/sample/temperature,
- AirTemperature:/entry0/sample/air_temperature,
- RackTemperature:/entry0/sample/rack_temperature,
- Bath1Temperature:/entry0/sample/bath1_regulation_temperature,
- Bath2Temperature:/entry0/sample/bath2_regulation_temperature,
- BathSelector:/entry0/sample/Actual bath,
- Thermocouple1:/entry0/sample/thermo_temperature1,
- Thermocouple2:/entry0/sample/thermo_temperature2,
- SampleChanger:/entry0/sample/sample_changer_nickname,
- Position:/entry0/sample/sample_changer_slot_value,
- SampleThickness:/entry0/sample/thickness,
- SampleApertureWidth:/entry0/D11/Beam/sample_ap_x_or_diam,
- SampleApertureHeight:/entry0/D11/Beam/sample_ap_y" />
+ <value val="AcquisitionMode:/entry0/acquisition_mode:d,
+ TotalCountsDetAll:/entry0/D11/detector/detsum+/entry0/D11/detectorLeft/detsum+/entry0/D11/detectorRight/detsum:d,
+ Beamstop:/entry0/D11/beamstop/actual_beamstop_number:f,
+ VelocitySelectorSpeed:/entry0/D11/selector/rotation_speed:f,
+ VelocitySelectorTilt:/entry0/D11/selector/selrot_actual:f,
+ AttenuationFactor:/entry0/D11/attenuator/attenuation_coefficient:f,
+ Diaphragm1:/entry0/D11/collimation/diaphragm1_position:f,
+ Diaphragm2:/entry0/D11/collimation/diaphragm2_position:f,
+ Diaphragm3:/entry0/D11/collimation/diaphragm3_position:f,
+ Diaphragm4:/entry0/D11/collimation/diaphragm4_position:f,
+ Diaphragm5:/entry0/D11/collimation/diaphragm5_position:f,
+ Diaphragm6:/entry0/D11/collimation/diaphragm6_position:f,
+ Guide1:/entry0/D11/collimation/col1_actual_state:f,
+ Guide2:/entry0/D11/collimation/col2_actual_state:f,
+ Guide3:/entry0/D11/collimation/col3_actual_state:f,
+ Guide4:/entry0/D11/collimation/col4_actual_state:f,
+ Guide5:/entry0/D11/collimation/col5_actual_state:f,
+ Guide6:/entry0/D11/collimation/col6_actual_state:f,
+ Guide7:/entry0/D11/collimation/col7_actual_state:f,
+ Guide8:/entry0/D11/collimation/col8_actual_state:f,
+ Guide9:/entry0/D11/collimation/col9_actual_state:f,
+ Guide10:/entry0/D11/collimation/col10_actual_state:f,
+ Guide11:/entry0/D11/collimation/col11_actual_state:f,
+ Guide12:/entry0/D11/collimation/col12_actual_state:f,
+ Guide13:/entry0/D11/collimation/col13_actual_state:f,
+ TotalCountsMonitor1:/entry0/monitor1/monsum:d,
+ ReactorPower:/entry0/reactor_power:f,
+ BeamstopX:/entry0/D11/beamstop/bx_actual:f,
+ TotalCountsDetLeft:/entry0/D11/detectorLeft/detsum:d,
+ TotalCountsDetRight:/entry0/D11/detectorRight/detsum:d,
+ RateCountsDetLeft:/entry0/D11/detectorLeft/detrate:f,
+ RateCountsDetRight:/entry0/D11/detectorRight/detrate:f,
+ san:/entry0/sample/san_actual:f,
+ omega:/entry0/sample/omega_actual:f,
+ phi:/entry0/sample/phi_actual:f,
+ sdi:/entry0/sample/sdi_actual:f,
+ sht:/entry0/sample/sht_actual:f,
+ str:/entry0/sample/str_actual:f,
+ trs:/entry0/sample/trs_actual:f,
+ SampleTemperature:/entry0/sample/temperature:f,
+ AirTemperature:/entry0/sample/air_temperature:f,
+ RackTemperature:/entry0/sample/rack_temperature:f,
+ Bath1Temperature:/entry0/sample/bath1_regulation_temperature:f,
+ Bath2Temperature:/entry0/sample/bath2_regulation_temperature:f,
+ BathSelector:/entry0/sample/Actual bath:s,
+ Thermocouple1:/entry0/sample/thermo_temperature1:f,
+ Thermocouple2:/entry0/sample/thermo_temperature2:f,
+ SampleChanger:/entry0/sample/sample_changer_nickname:s,
+ Position:/entry0/sample/sample_changer_slot_value:s,
+ SampleThickness:/entry0/sample/thickness:f,
+ SampleApertureWidth:/entry0/D11/Beam/sample_ap_x_or_diam:f,
+ SampleApertureHeight:/entry0/D11/Beam/sample_ap_y:f" />
</parameter>
</component-link>
diff --git a/instrument/D16_Parameters.xml b/instrument/D16_Parameters.xml
index 8e555f85f44f64422f49acfedc7c43cbb41ec76d..30dfe80355f927b44714e75c1963becd6099a0bf 100644
--- a/instrument/D16_Parameters.xml
+++ b/instrument/D16_Parameters.xml
@@ -29,45 +29,45 @@
<!-- These parameters are used to define headers and entries for GenerateLogbook algorithm -->
<parameter name="logbook_default_parameters" type="string">
- <value val="SampleDescription:/entry0/experiment_identifier,
- TotalTime:/entry0/duration,
- RateMonitor1:/entry0/monitor1/monrate,
- TotalCountsDet:/entry0/instrument/Detector1/detsum,
- RateCountsDet:/entry0/instrument/Detector1/detrate,
- StartTime:/entry0/start_time,
- Wavelength:/entry0/instrument/Beam/wavelength,
- Attenuator:/entry0/instrument/attenuator/attenuation_value,
- Det:/entry0/instrument/Det/value" />
+ <value val="SampleDescription:/entry0/experiment_identifier:s,
+ TotalTime:/entry0/duration:f,
+ RateMonitor1:/entry0/monitor1/monrate:f,
+ TotalCountsDet:/entry0/instrument/Detector1/detsum:d,
+ RateCountsDet:/entry0/instrument/Detector1/detrate:f,
+ StartTime:/entry0/start_time:s,
+ Wavelength:/entry0/instrument/Beam/wavelength:f,
+ Attenuator:/entry0/instrument/attenuator/attenuation_value:f,
+ Det:/entry0/instrument/Det/value:f" />
</parameter>
<parameter name="logbook_optional_parameters" type="string">
- <value val="AcquisitionMode:/entry0/acquisition_mode,
- Mode:/entry0/mode,
- BeamStopYOffset:/entry0/instrument/BStopY/offset_value,
- BeamStopYValue:/entry0/instrument/BStopY/value,
- BeamStopXOffset:/entry0/instrument/BStopX/offset_value,
- BeamStopXValue:/entry0/instrument/BStopX/value,
- BeamstopX:/entry0/instrument/beamstop/bx_actual,
- BeamstopY:/entry0/instrument/beamstop/by_actual,
- TotalCountsMonitor1:/entry0/monitor1/monsum,
- TotalCountsMonitor2:/entry0/monitor2/monsum,
- RateMonitor2:/entry0/monitor2/monrate,
- ReactorPower:/entry0/reactor_power,
- Omega:/entry0/instrument/Omega/value,
- OmegaOffset:/entry0/instrument/Omega/offset_value,
- Phi:/entry0/instrument/Phi/value,
- PhiOffset:/entry0/instrument/Phi/offset_value,
- Khi:/entry0/instrument/Khi/value,
- KhiOffset:/entry0/instrument/Khi/offset_value,
- Str:/entry0/instrument/Str/value,
- StrOffset:/entry0/instrument/Str/offset_value,
- Slitr:/entry0/instrument/Slitr/value,
- SlitrOffset:/entry0/instrument/Slitr/offset_value,
- SampleTemperature:/entry0/sample/temperature,
- SetpointTemperature:/entry0/sample/setpoint_temperature,
- RegulationTemperature:/entry0/sample/regulation_temperature,
- Bath1Temperature:/entry0/sample/bath1_regulation_temperature,
- Bath2Temperature:/entry0/sample/bath2_regulation_temperature,
- SampleChangerPos:/entry0/instrument/VirtualSampleChanger/sample_changer_slot_value" />
+ <value val="AcquisitionMode:/entry0/acquisition_mode:d,
+ Mode:/entry0/mode:d,
+ BeamStopYOffset:/entry0/instrument/BStopY/offset_value:f,
+ BeamStopYValue:/entry0/instrument/BStopY/value:f,
+ BeamStopXOffset:/entry0/instrument/BStopX/offset_value:f,
+ BeamStopXValue:/entry0/instrument/BStopX/value:f,
+ BeamstopX:/entry0/instrument/beamstop/bx_actual:f,
+ BeamstopY:/entry0/instrument/beamstop/by_actual:f,
+ TotalCountsMonitor1:/entry0/monitor1/monsum:d,
+ TotalCountsMonitor2:/entry0/monitor2/monsum:d,
+ RateMonitor2:/entry0/monitor2/monrate:f,
+ ReactorPower:/entry0/reactor_power:f,
+ Omega:/entry0/instrument/Omega/value:f,
+ OmegaOffset:/entry0/instrument/Omega/offset_value:f,
+ Phi:/entry0/instrument/Phi/value:f,
+ PhiOffset:/entry0/instrument/Phi/offset_value:f,
+ Khi:/entry0/instrument/Khi/value:f,
+ KhiOffset:/entry0/instrument/Khi/offset_value:f,
+ Str:/entry0/instrument/Str/value:f,
+ StrOffset:/entry0/instrument/Str/offset_value:f,
+ Slitr:/entry0/instrument/Slitr/value:f,
+ SlitrOffset:/entry0/instrument/Slitr/offset_value:f,
+ SampleTemperature:/entry0/sample/temperature:f,
+ SetpointTemperature:/entry0/sample/setpoint_temperature:f,
+ RegulationTemperature:/entry0/sample/regulation_temperature:f,
+ Bath1Temperature:/entry0/sample/bath1_regulation_temperature:f,
+ Bath2Temperature:/entry0/sample/bath2_regulation_temperature:f,
+ SampleChangerPos:/entry0/instrument/VirtualSampleChanger/sample_changer_slot_value:f" />
</parameter>
</component-link>
diff --git a/instrument/D22B_Parameters.xml b/instrument/D22B_Parameters.xml
index 633a4ead585096f0c07c48d166b0f6c04d5adc50..d74a7729e0765dc78a42ae0fbc0b7076c74e31d7 100644
--- a/instrument/D22B_Parameters.xml
+++ b/instrument/D22B_Parameters.xml
@@ -30,68 +30,68 @@
<!-- These parameters are used to define headers and entries for GenerateLogbook algorithm -->
<parameter name="logbook_default_parameters" type="string">
- <value val="SampleDescription:/entry0/sample_description,
- TotalTime:/entry0/duration,
- RateMonitor1:/entry0/monitor1/monrate,
- TotalCountsDet1:/entry0/D22/Detector 1/det1_sum,
- RateCountsDet1:/entry0/D22/Detector 1/det1_rate,
- TotalCountsDet2:/entry0/D22/Detector 2/det2_sum,
- RateCountsDet2:/entry0/D22/Detector 2/det2_rate,
- StartTime:/entry0/start_time,
- Wavelength:/entry0/D22/selector/wavelength,
- Attenuator:/entry0/D22/attenuator/attenuation_value,
- Collimation:/entry0/D22/collimation/actual_position,
- SD1:/entry0/D22/Detector 1/det1_actual,
- SD2:/entry0/D22/Detector 2/det2_actual,
- BeamStopY:/entry0/D22/beamstop/by1_actual" />
+ <value val="SampleDescription:/entry0/sample_description:s,
+ TotalTime:/entry0/duration:d,
+ RateMonitor1:/entry0/monitor1/monrate:f,
+ TotalCountsDet1:/entry0/D22/Detector 1/det1_sum:d,
+ RateCountsDet1:/entry0/D22/Detector 1/det1_rate:f,
+ TotalCountsDet2:/entry0/D22/Detector 2/det2_sum:d,
+ RateCountsDet2:/entry0/D22/Detector 2/det2_rate:f,
+ StartTime:/entry0/start_time:s,
+ Wavelength:/entry0/D22/selector/wavelength:f,
+ Attenuator:/entry0/D22/attenuator/attenuation_value:f,
+ Collimation:/entry0/D22/collimation/actual_position:f,
+ SD1:/entry0/D22/Detector 1/det1_actual:f,
+ SD2:/entry0/D22/Detector 2/det2_actual:f,
+ BeamStopY:/entry0/D22/beamstop/by1_actual:f" />
</parameter>
<parameter name="logbook_optional_parameters" type="string">
- <value val="AcquisitionMode:/entry0/acquisition_mode,
- TotalCountsDetAll:/entry0/D22/Detector 1/det1_sum+/entry0/D22/Detector 2/det2_sum,
- Beamstop:/entry0/D22/beamstop/actual_beamstop_number,
- VelocitySelectorSpeed:/entry0/D22/selector/rotation_speed,
- VelocitySelectorTilt:/entry0/D22/selector/selrot_actual,
- Diaphragm1:/entry0/D22/collimation/Dia1_actual_position,
- Diaphragm2:/entry0/D22/collimation/Dia2_actual_position,
- Diaphragm3:/entry0/D22/collimation/Dia3_actual_position,
- Diaphragm4:/entry0/D22/collimation/Dia4_actual_position,
- Diaphragm5:/entry0/D22/collimation/Dia5_actual_position,
- Diaphragm6:/entry0/D22/collimation/Dia6_actual_position,
- Diaphragm7:/entry0/D22/collimation/Dia7_actual_position,
- Diaphragm8:/entry0/D22/collimation/Dia8_actual_position,
- Guide1:/entry0/D22/collimation/Coll1_actual_position,
- Guide2:/entry0/D22/collimation/Coll2_actual_position,
- Guide3:/entry0/D22/collimation/Coll3_actual_position,
- Guide4:/entry0/D22/collimation/Coll4_actual_position,
- Guide5:/entry0/D22/collimation/Coll5_actual_position,
- Guide6:/entry0/D22/collimation/Coll6_actual_position,
- Guide7:/entry0/D22/collimation/Coll7_actual_position,
- TotalCountsMonitor1:/entry0/monitor1/monsum,
- TotalCountsMonitor2:/entry0/monitor2/monsum,
- RateMonitor2:/entry0/monitor2/monrate,
- ReactorPower:/entry0/reactor_power,
- BeamstopX:/entry0/D22/beamstop/bx1_actual,
- BeamstopX2:/entry0/D22/beamstop/bx2_actual,
- san:/entry0/sample/san_actual,
- omega:/entry0/sample/omega_actual,
- phi:/entry0/sample/phi_actual,
- sdi:/entry0/sample/sdi_actual,
- sht:/entry0/sample/sht_actual,
- str:/entry0/sample/str_actual,
- trs:/entry0/sample/trs_actual,
- SampleTemperature:/entry0/sample/temperature,
- AirTemperature:/entry0/sample/air_temperature,
- RackTemperature:/entry0/sample/rack_temperature,
- Bath1Temperature:/entry0/sample/bath1_regulation_temperature,
- Bath2Temperature:/entry0/sample/bath2_regulation_temperature,
- BathSelector:/entry0/sample/bath_selector_actual,
- Position:/entry0/sample/sample_changer_value,
- SampleThickness:/entry0/sample/thickness,
- MeasurementType:/entry0/D22/MeasurementType/typeOfMeasure,
- SampleType:/entry0/D22/MeasurementType/typeOfSample,
- SampleSubType:/entry0/D22/MeasurementType/subType,
- SampleApertureWidth:/entry0/D22/Beam/sample_ap_x_or_diam,
- SampleApertureHeight:/entry0/D22/Beam/sample_ap_y" />
+ <value val="AcquisitionMode:/entry0/acquisition_mode:d,
+ TotalCountsDetAll:/entry0/D22/Detector 1/det1_sum+/entry0/D22/Detector 2/det2_sum:d,
+ Beamstop:/entry0/D22/beamstop/actual_beamstop_number:f,
+ VelocitySelectorSpeed:/entry0/D22/selector/rotation_speed:f,
+ VelocitySelectorTilt:/entry0/D22/selector/selrot_actual:f,
+ Diaphragm1:/entry0/D22/collimation/Dia1_actual_position:f,
+ Diaphragm2:/entry0/D22/collimation/Dia2_actual_position:f,
+ Diaphragm3:/entry0/D22/collimation/Dia3_actual_position:f,
+ Diaphragm4:/entry0/D22/collimation/Dia4_actual_position:f,
+ Diaphragm5:/entry0/D22/collimation/Dia5_actual_position:f,
+ Diaphragm6:/entry0/D22/collimation/Dia6_actual_position:f,
+ Diaphragm7:/entry0/D22/collimation/Dia7_actual_position:f,
+ Diaphragm8:/entry0/D22/collimation/Dia8_actual_position:f,
+ Guide1:/entry0/D22/collimation/Coll1_actual_position:f,
+ Guide2:/entry0/D22/collimation/Coll2_actual_position:f,
+ Guide3:/entry0/D22/collimation/Coll3_actual_position:f,
+ Guide4:/entry0/D22/collimation/Coll4_actual_position:f,
+ Guide5:/entry0/D22/collimation/Coll5_actual_position:f,
+ Guide6:/entry0/D22/collimation/Coll6_actual_position:f,
+ Guide7:/entry0/D22/collimation/Coll7_actual_position:f,
+ TotalCountsMonitor1:/entry0/monitor1/monsum:d,
+ TotalCountsMonitor2:/entry0/monitor2/monsum:d,
+ RateMonitor2:/entry0/monitor2/monrate:f,
+ ReactorPower:/entry0/reactor_power:f,
+ BeamstopX:/entry0/D22/beamstop/bx1_actual:f,
+ BeamstopX2:/entry0/D22/beamstop/bx2_actual:f,
+ san:/entry0/sample/san_actual:f,
+ omega:/entry0/sample/omega_actual:f,
+ phi:/entry0/sample/phi_actual:f,
+ sdi:/entry0/sample/sdi_actual:f,
+ sht:/entry0/sample/sht_actual:f,
+ str:/entry0/sample/str_actual:f,
+ trs:/entry0/sample/trs_actual:f,
+ SampleTemperature:/entry0/sample/temperature:f,
+ AirTemperature:/entry0/sample/air_temperature:f,
+ RackTemperature:/entry0/sample/rack_temperature:f,
+ Bath1Temperature:/entry0/sample/bath1_regulation_temperature:f,
+ Bath2Temperature:/entry0/sample/bath2_regulation_temperature:f,
+ BathSelector:/entry0/sample/bath_selector_actual:f,
+ Position:/entry0/sample/sample_changer_value:f,
+ SampleThickness:/entry0/sample/thickness:f,
+ MeasurementType:/entry0/D22/MeasurementType/typeOfMeasure:s,
+ SampleType:/entry0/D22/MeasurementType/typeOfSample:s,
+ SampleSubType:/entry0/D22/MeasurementType/subType:s,
+ SampleApertureWidth:/entry0/D22/Beam/sample_ap_x_or_diam:f,
+ SampleApertureHeight:/entry0/D22/Beam/sample_ap_y:f" />
</parameter>
</component-link>
<!-- These parameters are used in ParallaxCorrection algorithm -->
diff --git a/instrument/D22_Parameters.xml b/instrument/D22_Parameters.xml
index 88ae6e5ea3d45248a43fd60100a167357b524743..8bc839b1d94a7faeaaf5772a25788a81d26ff510 100644
--- a/instrument/D22_Parameters.xml
+++ b/instrument/D22_Parameters.xml
@@ -26,60 +26,60 @@
<!-- These parameters are used to define headers and entries for GenerateLogbook algorithm -->
<parameter name="logbook_default_parameters" type="string">
- <value val="SampleDescription:/entry0/sample_description,
- TotalTime:/entry0/duration,
- RateMonitor1:/entry0/monitor1/monrate,
- TotalCountsDet:/entry0/D22/detector/detsum,
- RateCountsDet:/entry0/D22/detector/detrate,
- StartTime:/entry0/start_time,
- Wavelength:/entry0/D22/selector/wavelength,
- Attenuator:/entry0/D22/attenuator/attenuation_value,
- Collimation:/entry0/D22/collimation/actual_position,
- SD:/entry0/D22/detector/det_actual,
- BeamStopY:/entry0/D22/beamstop/by_actual" />
+ <value val="SampleDescription:/entry0/sample_description:s,
+ TotalTime:/entry0/duration:d,
+ RateMonitor1:/entry0/monitor1/monrate:f,
+ TotalCountsDet:/entry0/D22/detector/detsum:d,
+ RateCountsDet:/entry0/D22/detector/detrate:f,
+ StartTime:/entry0/start_time:s,
+ Wavelength:/entry0/D22/selector/wavelength:f,
+ Attenuator:/entry0/D22/attenuator/attenuation_value:f,
+ Collimation:/entry0/D22/collimation/actual_position:f,
+ SD:/entry0/D22/detector/det_actual:f,
+ BeamStopY:/entry0/D22/beamstop/by_actual:f" />
</parameter>
<parameter name="logbook_optional_parameters" type="string">
- <value val="AcquisitionMode:/entry0/acquisition_mode,
- Beamstop:/entry0/D22/beamstop/actual_beamstop_number,
- VelocitySelectorSpeed:/entry0/D22/selector/rotation_speed,
- VelocitySelectorTilt:/entry0/D22/selector/selrot_actual,
- Diaphragm1:/entry0/D22/collimation/Dia1_actual_position,
- Diaphragm2:/entry0/D22/collimation/Dia2_actual_position,
- Diaphragm3:/entry0/D22/collimation/Dia3_actual_position,
- Diaphragm4:/entry0/D22/collimation/Dia4_actual_position,
- Diaphragm5:/entry0/D22/collimation/Dia5_actual_position,
- Diaphragm6:/entry0/D22/collimation/Dia6_actual_position,
- Diaphragm7:/entry0/D22/collimation/Dia7_actual_position,
- Diaphragm8:/entry0/D22/collimation/Dia8_actual_position,
- Guide1:/entry0/D22/collimation/Coll1_actual_position,
- Guide2:/entry0/D22/collimation/Coll2_actual_position,
- Guide3:/entry0/D22/collimation/Coll3_actual_position,
- Guide4:/entry0/D22/collimation/Coll4_actual_position,
- Guide5:/entry0/D22/collimation/Coll5_actual_position,
- Guide6:/entry0/D22/collimation/Coll6_actual_position,
- Guide7:/entry0/D22/collimation/Coll7_actual_position,
- TotalCountsMonitor1:/entry0/monitor1/monsum,
- TotalCountsMonitor2:/entry0/monitor2/monsum,
- RateMonitor2:/entry0/monitor2/monrate,
- ReactorPower:/entry0/reactor_power,
- BeamstopX:/entry0/D22/beamstop/bx_actual,
- san:/entry0/sample/san_actual,
- omega:/entry0/sample/omega_actual,
- phi:/entry0/sample/phi_actual,
- sdi:/entry0/sample/sdi_actual,
- sht:/entry0/sample/sht_actual,
- str:/entry0/sample/str_actual,
- trs:/entry0/sample/trs_actual,
- SampleTemperature:/entry0/sample/temperature,
- AirTemperature:/entry0/sample/air_temperature,
- RackTemperature:/entry0/sample/rack_temperature,
- Bath1Temperature:/entry0/sample/bath1_regulation_temperature,
- Bath2Temperature:/entry0/sample/bath2_regulation_temperature,
- BathSelector:/entry0/sample/bath_selector_actual,
- Position:/entry0/sample/sample_changer_value,
- SampleThickness:/entry0/sample/thickness,
- SampleApertureWidth:/entry0/D22/Beam/sample_ap_x_or_diam,
- SampleApertureHeight:/entry0/D22/Beam/sample_ap_y" />
+ <value val="AcquisitionMode:/entry0/acquisition_mode:d,
+ Beamstop:/entry0/D22/beamstop/actual_beamstop_number:f,
+ VelocitySelectorSpeed:/entry0/D22/selector/rotation_speed:f,
+ VelocitySelectorTilt:/entry0/D22/selector/selrot_actual:f,
+ Diaphragm1:/entry0/D22/collimation/Dia1_actual_position:f,
+ Diaphragm2:/entry0/D22/collimation/Dia2_actual_position:f,
+ Diaphragm3:/entry0/D22/collimation/Dia3_actual_position:f,
+ Diaphragm4:/entry0/D22/collimation/Dia4_actual_position:f,
+ Diaphragm5:/entry0/D22/collimation/Dia5_actual_position:f,
+ Diaphragm6:/entry0/D22/collimation/Dia6_actual_position:f,
+ Diaphragm7:/entry0/D22/collimation/Dia7_actual_position:f,
+ Diaphragm8:/entry0/D22/collimation/Dia8_actual_position:f,
+ Guide1:/entry0/D22/collimation/Coll1_actual_position:f,
+ Guide2:/entry0/D22/collimation/Coll2_actual_position:f,
+ Guide3:/entry0/D22/collimation/Coll3_actual_position:f,
+ Guide4:/entry0/D22/collimation/Coll4_actual_position:f,
+ Guide5:/entry0/D22/collimation/Coll5_actual_position:f,
+ Guide6:/entry0/D22/collimation/Coll6_actual_position:f,
+ Guide7:/entry0/D22/collimation/Coll7_actual_position:f,
+ TotalCountsMonitor1:/entry0/monitor1/monsum:d,
+ TotalCountsMonitor2:/entry0/monitor2/monsum:d,
+ RateMonitor2:/entry0/monitor2/monrate:f,
+ ReactorPower:/entry0/reactor_power:f,
+ BeamstopX:/entry0/D22/beamstop/bx_actual:f,
+ san:/entry0/sample/san_actual:f,
+ omega:/entry0/sample/omega_actual:f,
+ phi:/entry0/sample/phi_actual:f,
+ sdi:/entry0/sample/sdi_actual:f,
+ sht:/entry0/sample/sht_actual:f,
+ str:/entry0/sample/str_actual:f,
+ trs:/entry0/sample/trs_actual:f,
+ SampleTemperature:/entry0/sample/temperature:f,
+ AirTemperature:/entry0/sample/air_temperature:f,
+ RackTemperature:/entry0/sample/rack_temperature:f,
+ Bath1Temperature:/entry0/sample/bath1_regulation_temperature:f,
+ Bath2Temperature:/entry0/sample/bath2_regulation_temperature:f,
+ BathSelector:/entry0/sample/bath_selector_actual:f,
+ Position:/entry0/sample/sample_changer_value:f,
+ SampleThickness:/entry0/sample/thickness:f,
+ SampleApertureWidth:/entry0/D22/Beam/sample_ap_x_or_diam:f,
+ SampleApertureHeight:/entry0/D22/Beam/sample_ap_y:f" />
</parameter>
</component-link>
diff --git a/instrument/D33_Parameters.xml b/instrument/D33_Parameters.xml
index 386869be4d5d98744326da481367010fe3a9e2c0..4493934759e05aac0d245c6d268f19268c96eade 100644
--- a/instrument/D33_Parameters.xml
+++ b/instrument/D33_Parameters.xml
@@ -39,51 +39,51 @@
<!-- These parameters are used to define headers and entries for GenerateLogbook algorithm -->
<parameter name="logbook_default_parameters" type="string">
- <value val="SampleDescription:/entry0/sample_description,
- TotalTime:/entry0/duration,
- RateMonitor1:/entry0/monitor1/monrate,
- TotalCountsDetAll:/entry0/D33/detector/detsum,
- RateCountsDetAll:/entry0/D33/detector/detrate,
- StartTime:/entry0/start_time,
- Wavelength:/entry0/D33/selector/wavelength,
- Attenuator:/entry0/D33/attenuator/attenuation_value,
- Collimation:/entry0/D33/collimation/actual_position,
- SD1:/entry0/D33/detector/det1_actual,
- SD2:/entry0/D33/detector/det2_actual,
- BeamStopY:/entry0/D33/beamstop/by_actual" />
+ <value val="SampleDescription:/entry0/sample_description:s,
+ TotalTime:/entry0/duration:f,
+ RateMonitor1:/entry0/monitor1/monrate:f,
+ TotalCountsDetAll:/entry0/D33/detector/detsum:d,
+ RateCountsDetAll:/entry0/D33/detector/detrate:f,
+ StartTime:/entry0/start_time:s,
+ Wavelength:/entry0/D33/selector/wavelength:f,
+ Attenuator:/entry0/D33/attenuator/attenuation_value:f,
+ Collimation:/entry0/D33/collimation/actual_position:f,
+ SD1:/entry0/D33/detector/det1_actual:f,
+ SD2:/entry0/D33/detector/det2_actual:f,
+ BeamStopY:/entry0/D33/beamstop/by_actual:f" />
</parameter>
<parameter name="logbook_optional_parameters" type="string">
- <value val="AcquisitionMode:/entry0/mode,
- VelocitySelectorSpeed:/entry0/D33/selector/rotation_speed,
- VelocitySelectorTilt:/entry0/D33/selector/selrot_actual,
- Diaphragm1:/entry0/D33/collimation/Dia1_actual_position,
- Diaphragm2:/entry0/D33/collimation/Dia2_actual_position,
- Diaphragm3:/entry0/D33/collimation/Dia3_actual_position,
- Diaphragm4:/entry0/D33/collimation/Dia4_actual_position,
- Diaphragm5:/entry0/D33/collimation/Dia5_actual_position,
- Guide1:/entry0/D33/collimation/Coll1_actual_position,
- Guide2:/entry0/D33/collimation/Coll2_actual_position,
- Guide3:/entry0/D33/collimation/Coll3_actual_position,
- Guide4:/entry0/D33/collimation/Coll4_actual_position,
- TotalCountsMonitor1:/entry0/monitor1/monsum,
- ReactorPower:/entry0/reactor_power,
- BeamstopX:/entry0/D33/beamstop/bx_actual,
- san:/entry0/sample/san_actual,
- omega:/entry0/sample/omega_actual,
- phi:/entry0/sample/phi_actual,
- sdi1:/entry0/sample/sdi1_actual,
- sdi2:/entry0/sample/sdi2_actual,
- sht:/entry0/sample/sht_actual,
- str:/entry0/sample/str_actual,
- trs:/entry0/sample/trs_actual,
- SampleTemperature:/entry0/sample/temperature,
- AirTemperature:/entry0/sample/air_temperature,
- RackTemperature:/entry0/sample/rack_temperature,
- Bath1Temperature:/entry0/sample/bath1_regulation_temperature,
- Bath2Temperature:/entry0/sample/bath2_regulation_temperature,
- Position:/entry0/sample/sample_changer_value,
- SampleApertureWidth:/entry0/D33/Beam/sample_ap_x_or_diam,
- SampleApertureHeight:/entry0/D33/Beam/sample_ap_y" />
+ <value val="AcquisitionMode:/entry0/mode:d,
+ VelocitySelectorSpeed:/entry0/D33/selector/rotation_speed:f,
+ VelocitySelectorTilt:/entry0/D33/selector/selrot_actual:f,
+ Diaphragm1:/entry0/D33/collimation/Dia1_actual_position:f,
+ Diaphragm2:/entry0/D33/collimation/Dia2_actual_position:f,
+ Diaphragm3:/entry0/D33/collimation/Dia3_actual_position:f,
+ Diaphragm4:/entry0/D33/collimation/Dia4_actual_position:f,
+ Diaphragm5:/entry0/D33/collimation/Dia5_actual_position:f,
+ Guide1:/entry0/D33/collimation/Coll1_actual_position:f,
+ Guide2:/entry0/D33/collimation/Coll2_actual_position:f,
+ Guide3:/entry0/D33/collimation/Coll3_actual_position:f,
+ Guide4:/entry0/D33/collimation/Coll4_actual_position:f,
+ TotalCountsMonitor1:/entry0/monitor1/monsum:d,
+ ReactorPower:/entry0/reactor_power:f,
+ BeamstopX:/entry0/D33/beamstop/bx_actual:f,
+ san:/entry0/sample/san_actual:f,
+ omega:/entry0/sample/omega_actual:f,
+ phi:/entry0/sample/phi_actual:f,
+ sdi1:/entry0/sample/sdi1_actual:f,
+ sdi2:/entry0/sample/sdi2_actual:f,
+ sht:/entry0/sample/sht_actual:f,
+ str:/entry0/sample/str_actual:f,
+ trs:/entry0/sample/trs_actual:f,
+ SampleTemperature:/entry0/sample/temperature:f,
+ AirTemperature:/entry0/sample/air_temperature:f,
+ RackTemperature:/entry0/sample/rack_temperature:f,
+ Bath1Temperature:/entry0/sample/bath1_regulation_temperature:f,
+ Bath2Temperature:/entry0/sample/bath2_regulation_temperature:f,
+ Position:/entry0/sample/sample_changer_value:f,
+ SampleApertureWidth:/entry0/D33/Beam/sample_ap_x_or_diam:f,
+ SampleApertureHeight:/entry0/D33/Beam/sample_ap_y:f" />
</parameter>
</component-link>
diff --git a/instrument/D7_Parameters.xml b/instrument/D7_Parameters.xml
index 8e4b7f8b1076a2b53197a0a30fdffa51fee44ef0..70679864a73919d6e53f929f6afeaca325612e24 100644
--- a/instrument/D7_Parameters.xml
+++ b/instrument/D7_Parameters.xml
@@ -21,15 +21,15 @@
</parameter>
<parameter name="logbook_default_parameters" type="string">
- <value val="wavelength:/entry0/D7/monochromator/wavelength,
- experiment_identifier:/entry0/experiment_identifier,
- start_time:/entry0/start_time,
- end_time:/entry0/end_time,
- duration:/entry0/duration" />
+ <value val="wavelength:/entry0/D7/monochromator/wavelength:f,
+ experiment_identifier:/entry0/experiment_identifier:s,
+ start_time:/entry0/start_time:s,
+ end_time:/entry0/end_time:s,
+ duration:/entry0/duration:d" />
</parameter>
<parameter name="logbook_optional_parameters" type="string">
- <value val="TOF:/entry0/acquisition_mode,
- polarisation:/entry0/D7/POL/actual_state+/entry0/D7/POL/actual_stateB1B2" />
+ <value val="TOF:/entry0/acquisition_mode:d,
+ polarisation:/entry0/D7/POL/actual_state+/entry0/D7/POL/actual_stateB1B2:s" />
</parameter>
</component-link>
diff --git a/instrument/IN4_Parameters.xml b/instrument/IN4_Parameters.xml
index ff8c55038edf86f5546c33f943fc4483e361afdd..e458f9f79bf04007873ac3ab450999b83743c088 100644
--- a/instrument/IN4_Parameters.xml
+++ b/instrument/IN4_Parameters.xml
@@ -69,42 +69,42 @@
<!-- These parameters are used to define headers and entries for GenerateLogbook algorithm -->
<parameter name="logbook_default_parameters" type="string">
- <value val="acq_mode:/entry0/mode,
- start_time:/entry0/start_time,
- end_time:/entry0/end_time,
- BC2:/entry0/instrument/BC2/rotation_speed,
- Ph2:/entry0/instrument/BC2/phase,
- FC:/entry0/instrument/FC/rotation_speed,
- PhF:/entry0/instrument/FC/setpoint_phase,
- Monrate:/entry0/monitor/monsum/,
- cps:/entry0/instrument/Detector/detrate,
- Treg:/entry0/sample/regulation_temperature,
- Tsamp:/entry0/sample/temperature,
- subtitle:/entry0/experiment_identifier" />
+ <value val="acq_mode:/entry0/mode:s,
+ start_time:/entry0/start_time:s,
+ end_time:/entry0/end_time:s,
+ BC2:/entry0/instrument/BC2/rotation_speed:f,
+ Ph2:/entry0/instrument/BC2/phase:f,
+ FC:/entry0/instrument/FC/rotation_speed:f,
+ PhF:/entry0/instrument/FC/setpoint_phase:f,
+ Monrate:/entry0/monitor/monsum:f,
+ cps:/entry0/instrument/Detector/detrate:f,
+ Treg:/entry0/sample/regulation_temperature:f,
+ Tsamp:/entry0/sample/temperature:f,
+ subtitle:/entry0/experiment_identifier:s" />
</parameter>
<parameter name="logbook_optional_parameters" type="string">
- <value val="lambda:/entry0/wavelength,
- NCH:/entry0/monitor/time_of_flight/1,
- CHW:/entry0/monitor/time_of_flight/0,
- delay:/entry0/monitor/time_of_flight/2,
- duration:/entry0/duration,
- BC1:/entry0/instrument/BC1/rotation_speed,
- Tset:/entry0/sample/setpoint_temperature,
- Monsum:/entry0/monitor/monsum,
- Detrate:/entry0/instrument/Detector/detrate,
- BCTR:/entry0/instrument/bctr/value,
- HD:/entry0/instrument/hd/value,
- FCP:/entry0/instrument/fcp/value,
- MBA:/entry0/instrument/mba/value,
- MCR:/entry0/instrument/mcr/value,
- MFC:/entry0/instrument/mfc/value,
- MHCU111:/entry0/instrument/mhcu111/value,
- MHCU220:/entry0/instrument/mhcu220/value,
- MHGR:/entry0/instrument/mhgr/value,
- MHSPARE:/entry0/instrument/mhspare/value,
- MNA:/entry0/instrument/mna/value,
- MTR:/entry0/instrument/mtr/value,
- MVC:/entry0/instrument/mvc/value" />
+ <value val="lambda:/entry0/wavelength:f,
+ NCH:/entry0/monitor/time_of_flight/1:d,
+ CHW:/entry0/monitor/time_of_flight/0:f,
+ delay:/entry0/monitor/time_of_flight/2:f,
+ duration:/entry0/duration:d,
+ BC1:/entry0/instrument/BC1/rotation_speed:f,
+ Tset:/entry0/sample/setpoint_temperature:f,
+ Monsum:/entry0/monitor/monsum:d,
+ Detrate:/entry0/instrument/Detector/detrate:f,
+ BCTR:/entry0/instrument/bctr/value:f,
+ HD:/entry0/instrument/hd/value:f,
+ FCP:/entry0/instrument/fcp/value:f,
+ MBA:/entry0/instrument/mba/value:f,
+ MCR:/entry0/instrument/mcr/value:f,
+ MFC:/entry0/instrument/mfc/value:f,
+ MHCU111:/entry0/instrument/mhcu111/value:f,
+ MHCU220:/entry0/instrument/mhcu220/value:f,
+ MHGR:/entry0/instrument/mhgr/value:f,
+ MHSPARE:/entry0/instrument/mhspare/value:f,
+ MNA:/entry0/instrument/mna/value:f,
+ MTR:/entry0/instrument/mtr/value:f,
+ MVC:/entry0/instrument/mvc/value:f" />
</parameter>
</component-link>
diff --git a/instrument/IN5_Parameters.xml b/instrument/IN5_Parameters.xml
index 380f634fea70d150e7746eaf02c1602668c1a000..4b629726a3750a71d80d9b2e1e881c4631b42906 100644
--- a/instrument/IN5_Parameters.xml
+++ b/instrument/IN5_Parameters.xml
@@ -82,30 +82,30 @@
<!-- These parameters are used to define headers and entries for GenerateLogbook algorithm -->
<parameter name="logbook_default_parameters" type="string">
- <value val="acq_mode:/entry0/acquisition_mode,
- start_time:/entry0/start_time,
- end_time:/entry0/end_time,
- SRot:/entry0/instrument/SRot/value,
- CO:/entry0/instrument/CO/rotation_speed,
- PhC:/entry0/instrument/CO/setpoint_phase,
- FO:/entry0/instrument/FO/rotation_speed,
- PhF:/entry0/instrument/FO/setpoint_phase,
- Monrate:/entry0/monitor/monrate,
- cps:/entry0/instrument/Detector/detrate,
- Treg:/entry0/sample/regulation_temperature,
- Tsamp:/entry0/sample/temperature,
- subtitle:/entry0/experiment_identifier" />
+ <value val="acq_mode:/entry0/acquisition_mode:s,
+ start_time:/entry0/start_time:s,
+ end_time:/entry0/end_time:s,
+ SRot:/entry0/instrument/SRot/value:f,
+ CO:/entry0/instrument/CO/rotation_speed:f,
+ PhC:/entry0/instrument/CO/setpoint_phase:f,
+ FO:/entry0/instrument/FO/rotation_speed:f,
+ PhF:/entry0/instrument/FO/setpoint_phase:f,
+ Monrate:/entry0/monitor/monrate:f,
+ cps:/entry0/instrument/Detector/detrate:f,
+ Treg:/entry0/sample/regulation_temperature:f,
+ Tsamp:/entry0/sample/temperature:f,
+ subtitle:/entry0/experiment_identifier:s" />
</parameter>
<parameter name="logbook_optional_parameters" type="string">
- <value val="lambda:/entry0/wavelength,
- NCH:/entry0/monitor/time_of_flight/1,
- CHW:/entry0/monitor/time_of_flight/0,
- delay:/entry0/monitor/time_of_flight/2,
- duration:/entry0/duration,
- Tset:/entry0/sample/setpoint_temperature,
- Monsum:/entry0/monitor/monsum,
- ReactorPower:/entry0/reactor_power,
- ScannedVariables:/entry0/data_scan/scanned_variables/variables_names/name" />
+ <value val="lambda:/entry0/wavelength:f,
+ NCH:/entry0/monitor/time_of_flight/1:f,
+ CHW:/entry0/monitor/time_of_flight/0:f,
+ delay:/entry0/monitor/time_of_flight/2:f,
+ duration:/entry0/duration:d,
+ Tset:/entry0/sample/setpoint_temperature:f,
+ Monsum:/entry0/monitor/monsum:d,
+ ReactorPower:/entry0/reactor_power:f,
+ ScannedVariables:/entry0/data_scan/scanned_variables/variables_names/name:s" />
</parameter>
</component-link>
diff --git a/instrument/IN6_Parameters.xml b/instrument/IN6_Parameters.xml
index 5ce363e211922f5177571e5eded1fa2811b65967..048ef25b47de1103a69ddaacdbf68a0bebe061ee 100644
--- a/instrument/IN6_Parameters.xml
+++ b/instrument/IN6_Parameters.xml
@@ -81,31 +81,31 @@
<!-- These parameters are used to define headers and entries for GenerateLogbook algorithm -->
<parameter name="logbook_default_parameters" type="string">
- <value val="acq_mode:/entry0/acquisition_mode,
- start_time:/entry0/start_time,
- end_time:/entry0/end_time,
- Fermi:/entry0/instrument/Fermi/rotation_speed,
- Ph:/entry0/instrument/Fermi/setpoint_phase,
- Mon2rate:/entry0/monitor2/monrate,
- cps:/entry0/instrument/Detector/detrate,
- Treg:/entry0/sample/regulation_temperature,
- Tsamp:/entry0/sample/temperature,
- subtitle:/entry0/experiment_identifier" />
+ <value val="acq_mode:/entry0/acquisition_mode:s,
+ start_time:/entry0/start_time:s,
+ end_time:/entry0/end_time:s,
+ Fermi:/entry0/instrument/Fermi/rotation_speed:f,
+ Ph:/entry0/instrument/Fermi/setpoint_phase:f,
+ Mon2rate:/entry0/monitor2/monrate:f,
+ cps:/entry0/instrument/Detector/detrate:f,
+ Treg:/entry0/sample/regulation_temperature:f,
+ Tsamp:/entry0/sample/temperature:f,
+ subtitle:/entry0/experiment_identifier:s" />
</parameter>
<parameter name="logbook_optional_parameters" type="string">
- <value val="lambda:/entry0/wavelength,
- NCH:/entry0/monitor1/time_of_flight/1,
- CHW:/entry0/monitor1/time_of_flight/0,
- delay:/entry0/monitor1/time_of_flight/2,
- duration:/entry0/duration,
- Suppressor:/entry0/instrument/Suppressor/rotation_speed,
- SuppressorPh:/entry0/instrument/Suppressor/setpoint_phase,
- Tset:/entry0/sample/setpoint_temperature,
- Mon1sum:/entry0/monitor1/monsum,
- Mon1rate:/entry0/monitor1/monrate,
- Mon2sum:/entry0/monitor2/monsum,
- Mon3sum:/entry0/monitor3/monsum,
- Mon3rate:/entry0/monitor3/monrate" />
+ <value val="lambda:/entry0/wavelength:f,
+ NCH:/entry0/monitor1/time_of_flight/1:d,
+ CHW:/entry0/monitor1/time_of_flight/0:f,
+ delay:/entry0/monitor1/time_of_flight/2:f,
+ duration:/entry0/duration:d,
+ Suppressor:/entry0/instrument/Suppressor/rotation_speed:f,
+ SuppressorPh:/entry0/instrument/Suppressor/setpoint_phase:f,
+ Tset:/entry0/sample/setpoint_temperature:f,
+ Mon1sum:/entry0/monitor1/monsum:d,
+ Mon1rate:/entry0/monitor1/monrate:f,
+ Mon2sum:/entry0/monitor2/monsum:d,
+ Mon3sum:/entry0/monitor3/monsum:d,
+ Mon3rate:/entry0/monitor3/monrate:f" />
</parameter>
</component-link>
diff --git a/instrument/PANTHER_Parameters.xml b/instrument/PANTHER_Parameters.xml
index 9aec0924cdcdfb9df9c75a9b94943e9fbe1d5967..d418235ed7d8268a4b0bee8c868175247fe73c16 100644
--- a/instrument/PANTHER_Parameters.xml
+++ b/instrument/PANTHER_Parameters.xml
@@ -89,48 +89,48 @@
<!-- These parameters are used to define headers and entries for GenerateLogbook algorithm -->
<parameter name="logbook_default_parameters" type="string">
- <value val="acq_mode:/entry0/acquisition_mode,
- start_time:/entry0/start_time,
- end_time:/entry0/end_time,
- Sapphire:/entry0/instrument/SapphirFilter/value_string,
- A2:/entry0/instrument/a2/value,
- A1:/entry0/instrument/a1/value,
- TM:/entry0/instrument/tm/value,
- GM:/entry0/instrument/gm/value,
- DCV:/entry0/instrument/dcv/value,
- DCH:/entry0/instrument/dch/value,
- RMVpg:/entry0/instrument/rmvpg/value,
- RMHpg:/entry0/instrument/rmhpg/value,
- L12:/entry0/instrument/bctr/value,
- BC2:/entry0/instrument/BC2/rotation_speed,
- Ph2:/entry0/instrument/BC2/phase,
- FC:/entry0/instrument/FC/rotation_speed,
- PhF:/entry0/instrument/FC/setpoint_phase,
- NCH:/entry0/monitor/time_of_flight/1,
- CHW:/entry0/monitor/time_of_flight/0,
- delay:/entry0/monitor/time_of_flight/2,
- D1h:/entry0/instrument/d1t/value+/entry0/instrument/d1b/value,
- D1w:/entry0/instrument/d1l/value+/entry0/instrument/d1r/value,
- Monrate:/entry0/monitor/monsum//entry0/actual_time,
- cps:/entry0/instrument/Detector/detsum//entry0/actual_time,
- Treg:/entry0/sample/regulation_temperature,
- Tsamp:/entry0/sample/temperature,
- subtitle:/entry0/experiment_identifier" />
+ <value val="acq_mode:/entry0/acquisition_mode:d,
+ start_time:/entry0/start_time:s,
+ end_time:/entry0/end_time:s,
+ Sapphire:/entry0/instrument/SapphirFilter/value_string:s,
+ A2:/entry0/instrument/a2/value:f,
+ A1:/entry0/instrument/a1/value:f,
+ TM:/entry0/instrument/tm/value:f,
+ GM:/entry0/instrument/gm/value:f,
+ DCV:/entry0/instrument/dcv/value:f,
+ DCH:/entry0/instrument/dch/value:f,
+ RMVpg:/entry0/instrument/rmvpg/value:f,
+ RMHpg:/entry0/instrument/rmhpg/value:f,
+ L12:/entry0/instrument/bctr/value:f,
+ BC2:/entry0/instrument/BC2/rotation_speed:f,
+ Ph2:/entry0/instrument/BC2/phase:f,
+ FC:/entry0/instrument/FC/rotation_speed:f,
+ PhF:/entry0/instrument/FC/setpoint_phase:f,
+ NCH:/entry0/monitor/time_of_flight/1:f,
+ CHW:/entry0/monitor/time_of_flight/0:f,
+ delay:/entry0/monitor/time_of_flight/2:f,
+ D1h:/entry0/instrument/d1t/value+/entry0/instrument/d1b/value:f,
+ D1w:/entry0/instrument/d1l/value+/entry0/instrument/d1r/value:f,
+ Monrate:/entry0/monitor/monsum//entry0/actual_time:f,
+ cps:/entry0/instrument/Detector/detsum//entry0/actual_time:f,
+ Treg:/entry0/sample/regulation_temperature:f,
+ Tsamp:/entry0/sample/temperature:f,
+ subtitle:/entry0/experiment_identifier:f" />
</parameter>
<parameter name="logbook_optional_parameters" type="string">
- <value val="lambda:/entry0/wavelength,
- duration:/entry0/duration,
- FilterVal:/entry0/instrument/SapphirFilter/value,
- BC1:/entry0/instrument/BC1/rotation_speed,
- CH:/entry0/instrument/ch/value,
- D1t:/entry0/instrument/d1t/value,
- D1b:/entry0/instrument/d1b/value,
- D1l:/entry0/instrument/d1l/value,
- D1r:/entry0/instrument/d1r/value,
- Tset:/entry0/sample/setpoint_temperature,
- NTubes:/entry0/instrument/Detector/num_tubes,
- Monsum:/entry0/monitor/monsum,
- Detrate:entry0/instrument/Detector/detrate" />
+ <value val="lambda:/entry0/wavelength:f,
+ duration:/entry0/duration:d,
+ FilterVal:/entry0/instrument/SapphirFilter/value:f,
+ BC1:/entry0/instrument/BC1/rotation_speed:f,
+ CH:/entry0/instrument/ch/value:f,
+ D1t:/entry0/instrument/d1t/value:f,
+ D1b:/entry0/instrument/d1b/value:f,
+ D1l:/entry0/instrument/d1l/value:f,
+ D1r:/entry0/instrument/d1r/value:f,
+ Tset:/entry0/sample/setpoint_temperature:f,
+ NTubes:/entry0/instrument/Detector/num_tubes:d,
+ Monsum:/entry0/monitor/monsum:d,
+ Detrate:entry0/instrument/Detector/detrate:f" />
</parameter>
</component-link>