Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 11 additions & 4 deletions sasdata/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,17 @@ def __init__(
abscissae: Abscissa,
mask: Quantity,
dependents: list["SasData"],
metadata: Metadata,
metadata: Metadata | None = None,
):
self.name = name
self._ordinate = ordinate
self._abscissae = abscissae
self._mask = mask
self.dependents = dependents
self.metadata = metadata
if metadata:
self.metadata = metadata
else:
self.metadata = Metadata.initialise_empty()

@property
def ordinate(self) -> Quantity:
Expand Down Expand Up @@ -72,7 +75,7 @@ def __init__(
name: str,
data_contents: dict[str, Quantity],
dataset_type: DatasetType,
metadata: Metadata,
metadata: Metadata | None = None,
verbose: bool = False,
):
self.name = name
Expand All @@ -82,7 +85,11 @@ def __init__(
self._data_contents = data_contents
self._verbose = verbose

self.metadata = metadata
if metadata:
self.metadata = metadata
else:
self.metadata = Metadata.initialise_empty()


# TODO: Could this be optional?
self.dataset_type: DatasetType = dataset_type
Expand Down
13 changes: 13 additions & 0 deletions sasdata/metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,19 @@ def from_json(obj):
raw=MetaNode.from_json(obj["raw"]),
)

@staticmethod
def initialise_empty():
return Metadata(
title=None,
run=[],
definition=None,
process=[],
sample=None,
instrument=None,
magnetic=None,
raw=None
)

def serialise_json(self):
serialized = {
"instrument": None,
Expand Down
Loading