diff --git a/.github/workflows/plugin_test.yaml b/.github/workflows/plugin_test.yaml index b62aaf17d..764d12067 100644 --- a/.github/workflows/plugin_test.yaml +++ b/.github/workflows/plugin_test.yaml @@ -32,12 +32,12 @@ jobs: - plugin: pynxtools-mpes branch: main tests_to_run: tests/. - - plugin: pynxtools-raman - branch: main - tests_to_run: tests/. - - plugin: pynxtools-stm - branch: main - tests_to_run: tests/. + # - plugin: pynxtools-raman + # branch: main + # tests_to_run: tests/. + # - plugin: pynxtools-spm + # branch: main + # tests_to_run: tests/. - plugin: pynxtools-xps branch: main tests_to_run: tests/. diff --git a/src/pynxtools/definitions b/src/pynxtools/definitions index 4931f392c..6e3134567 160000 --- a/src/pynxtools/definitions +++ b/src/pynxtools/definitions @@ -1 +1 @@ -Subproject commit 4931f392cdba15b71776c0f29e281813855dd30d +Subproject commit 6e3134567d715198a03499d2ff1811389b2e6462 diff --git a/src/pynxtools/nexus-version.txt b/src/pynxtools/nexus-version.txt index af992a2e5..1b7006aa6 100644 --- a/src/pynxtools/nexus-version.txt +++ b/src/pynxtools/nexus-version.txt @@ -1 +1 @@ -v2022.07-1518-g4931f392 \ No newline at end of file +v2022.07-1520-g6e313456 \ No newline at end of file diff --git a/src/pynxtools/nexus/nexus.py b/src/pynxtools/nexus/nexus.py index 177074df4..fec2eda66 100644 --- a/src/pynxtools/nexus/nexus.py +++ b/src/pynxtools/nexus/nexus.py @@ -526,7 +526,10 @@ def get_default_plotable(root, logger): nxgroup = nxgroup[default_group_name] default_group_name = decode_if_string(nxgroup.attrs.get("default")) except KeyError: - pass + logger.debug(f"""No default group with a name + {default_group_name} for {nxgroup} has been found.""") + break + if nxgroup == nxentry: nxdata = nxdata_helper(nxentry) else: @@ -833,7 +836,7 @@ def process_nexus_master_file(self, parser): self.full_visit(self.in_file, self.in_file, "", self.visit_node) - if self.d_inq_nd is None and self.c_inq_nd is None: + if self.d_inq_nd is None and self.c_inq_nd is None and parser is None: get_default_plotable(self.in_file, self.logger) # To log the provided concept and concepts founded if self.c_inq_nd is not None: diff --git a/src/pynxtools/testing/nexus_conversion.py b/src/pynxtools/testing/nexus_conversion.py index df47c72fe..ea33ac946 100644 --- a/src/pynxtools/testing/nexus_conversion.py +++ b/src/pynxtools/testing/nexus_conversion.py @@ -20,7 +20,7 @@ import logging import os from glob import glob -from typing import List, Literal, Tuple, Dict +from typing import Dict, List, Literal, Tuple try: from nomad.client import parse diff --git a/tests/data/nexus/Ref_nexus_test.log b/tests/data/nexus/Ref_nexus_test.log index 713b488e3..54541649f 100644 --- a/tests/data/nexus/Ref_nexus_test.log +++ b/tests/data/nexus/Ref_nexus_test.log @@ -1170,7 +1170,7 @@ DEBUG - documentation (NXinstrument.nxdl.xml:/POSITIONER): DEBUG - DEBUG - documentation (NXpositioner.nxdl.xml:): DEBUG - - A generic positioner such as a motor or piezo-electric transducer. + A generic positioner such as a motor or piezo-electric transducer. DEBUG - ===== ATTRS (//entry/instrument/manipulator@NX_class) DEBUG - value: NXpositioner