Skip to content
Snippets Groups Projects
Commit c89bdfa8 authored by David Hammer's avatar David Hammer
Browse files

Revert "Unrelated: remove default values in output schemata for 2.19.x"

This reverts commit 4e0be11e.
parent ed63b244
No related branches found
No related tags found
2 merge requests!85Draft: Add simple tests for generated scenes,!82Move geometry devices, some utilities to own repositories
...@@ -80,7 +80,7 @@ def xtdf_output_schema(use_shmem_handle=True): ...@@ -80,7 +80,7 @@ def xtdf_output_schema(use_shmem_handle=True):
VECTOR_STRING_ELEMENT(res) VECTOR_STRING_ELEMENT(res)
.key("calngShmemPaths") .key("calngShmemPaths")
.assignmentOptional() .assignmentOptional()
.noDefaultValue() .defaultValue([])
.commit(), .commit(),
NODE_ELEMENT(res) NODE_ELEMENT(res)
...@@ -90,7 +90,7 @@ def xtdf_output_schema(use_shmem_handle=True): ...@@ -90,7 +90,7 @@ def xtdf_output_schema(use_shmem_handle=True):
STRING_ELEMENT(res) STRING_ELEMENT(res)
.key("metadata.source") .key("metadata.source")
.assignmentOptional() .assignmentOptional()
.noDefaultValue() .defaultValue("")
.commit(), .commit(),
NODE_ELEMENT(res) NODE_ELEMENT(res)
...@@ -100,7 +100,7 @@ def xtdf_output_schema(use_shmem_handle=True): ...@@ -100,7 +100,7 @@ def xtdf_output_schema(use_shmem_handle=True):
INT32_ELEMENT(res) INT32_ELEMENT(res)
.key("metadata.timestamp.tid") .key("metadata.timestamp.tid")
.assignmentOptional() .assignmentOptional()
.noDefaultValue() .defaultValue(0)
.commit(), .commit(),
NODE_ELEMENT(res) NODE_ELEMENT(res)
...@@ -110,37 +110,37 @@ def xtdf_output_schema(use_shmem_handle=True): ...@@ -110,37 +110,37 @@ def xtdf_output_schema(use_shmem_handle=True):
INT32_ELEMENT(res) INT32_ELEMENT(res)
.key("header.minorTrainFormatVersion") .key("header.minorTrainFormatVersion")
.assignmentOptional() .assignmentOptional()
.noDefaultValue() .defaultValue(0)
.commit(), .commit(),
INT32_ELEMENT(res) INT32_ELEMENT(res)
.key("header.majorTrainFormatVersion") .key("header.majorTrainFormatVersion")
.assignmentOptional() .assignmentOptional()
.noDefaultValue() .defaultValue(0)
.commit(), .commit(),
INT32_ELEMENT(res) INT32_ELEMENT(res)
.key("header.trainId") .key("header.trainId")
.assignmentOptional() .assignmentOptional()
.noDefaultValue() .defaultValue(0)
.commit(), .commit(),
INT64_ELEMENT(res) INT64_ELEMENT(res)
.key("header.linkId") .key("header.linkId")
.assignmentOptional() .assignmentOptional()
.noDefaultValue() .defaultValue(0)
.commit(), .commit(),
INT64_ELEMENT(res) INT64_ELEMENT(res)
.key("header.dataId") .key("header.dataId")
.assignmentOptional() .assignmentOptional()
.noDefaultValue() .defaultValue(0)
.commit(), .commit(),
INT64_ELEMENT(res) INT64_ELEMENT(res)
.key("header.pulseCount") .key("header.pulseCount")
.assignmentOptional() .assignmentOptional()
.noDefaultValue() .defaultValue(0)
.commit(), .commit(),
NDARRAY_ELEMENT(res) NDARRAY_ELEMENT(res)
...@@ -158,7 +158,7 @@ def xtdf_output_schema(use_shmem_handle=True): ...@@ -158,7 +158,7 @@ def xtdf_output_schema(use_shmem_handle=True):
INT32_ELEMENT(res) INT32_ELEMENT(res)
.key("detector.trainId") .key("detector.trainId")
.assignmentOptional() .assignmentOptional()
.noDefaultValue() .defaultValue(0)
.commit(), .commit(),
NDARRAY_ELEMENT(res) NDARRAY_ELEMENT(res)
...@@ -180,13 +180,13 @@ def xtdf_output_schema(use_shmem_handle=True): ...@@ -180,13 +180,13 @@ def xtdf_output_schema(use_shmem_handle=True):
INT32_ELEMENT(res) INT32_ELEMENT(res)
.key("trailer.status") .key("trailer.status")
.assignmentOptional() .assignmentOptional()
.noDefaultValue() .defaultValue(0)
.commit(), .commit(),
INT32_ELEMENT(res) INT32_ELEMENT(res)
.key("trailer.trainId") .key("trailer.trainId")
.assignmentOptional() .assignmentOptional()
.noDefaultValue() .defaultValue(0)
.commit(), .commit(),
) )
...@@ -217,7 +217,7 @@ def jf_output_schema(use_shmem_handle=True): ...@@ -217,7 +217,7 @@ def jf_output_schema(use_shmem_handle=True):
INT32_ELEMENT(res) INT32_ELEMENT(res)
.key("data.trainId") .key("data.trainId")
.assignmentOptional() .assignmentOptional()
.noDefaultValue() .defaultValue(0)
.commit(), .commit(),
NDARRAY_ELEMENT(res) NDARRAY_ELEMENT(res)
...@@ -239,7 +239,7 @@ def jf_output_schema(use_shmem_handle=True): ...@@ -239,7 +239,7 @@ def jf_output_schema(use_shmem_handle=True):
VECTOR_STRING_ELEMENT(res) VECTOR_STRING_ELEMENT(res)
.key("calngShmemPaths") .key("calngShmemPaths")
.assignmentOptional() .assignmentOptional()
.noDefaultValue() .defaultValue([])
.commit(), .commit(),
) )
if use_shmem_handle: if use_shmem_handle:
...@@ -269,7 +269,7 @@ def pnccd_output_schema(use_shmem_handle=True): ...@@ -269,7 +269,7 @@ def pnccd_output_schema(use_shmem_handle=True):
UINT64_ELEMENT(res) UINT64_ELEMENT(res)
.key("data.trainId") .key("data.trainId")
.assignmentOptional() .assignmentOptional()
.noDefaultValue() .defaultValue(0)
.commit(), .commit(),
) )
if use_shmem_handle: if use_shmem_handle:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment