Skip to content
Open
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
2 changes: 1 addition & 1 deletion sasdata/data_util/nxsunit.py
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ def _format_unit_structure(unit: str | None = None) -> list[str]:
all_prefixes = list(PREFIX.keys())
all_prefixes.extend(list(SHORT_PREFIX.keys()))
for prefix in all_prefixes:
unit = unit.replace(prefix + "*", prefix)
unit = unit.replace("".join([prefix, "*"]), prefix)
# a^-m*b^-n -> a^-m b^-n
unit = unit.replace('*', ' ')
# invUnit or 1/unit -> /unit
Expand Down
4 changes: 2 additions & 2 deletions sasdata/dataloader/readers/cansas_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,13 +194,13 @@ def _parse_entry(self, dom: ElementTree, recurse: bool | None = False) -> (Data1
self.current_datainfo.meta_data["loader"] = "CanSAS XML 1D"
self.current_datainfo.meta_data[
PREPROCESS] = self.processing_instructions
self.base_ns = "{" + CANSAS_NS.get(self.cansas_version).get("ns") + "}"
self.base_ns = "".join(["{", CANSAS_NS.get(self.cansas_version).get("ns"), "}"])
if self._is_call_local() and not recurse:
self.current_datainfo.filename = self.filepath.name
# Create an empty dataset if no data has been passed to the reader
if self.current_dataset is None:
self._initialize_new_data_set(dom)
self.base_ns = "{" + CANSAS_NS.get(self.cansas_version).get("ns") + "}"
self.base_ns = "".join(["{", CANSAS_NS.get(self.cansas_version).get("ns"), "}"])

# Loop through each child in the parent element
for node in dom:
Expand Down