Skip to content

Commit

Permalink
hook nexus definition to SPM_domain_app_def (#396)
Browse files Browse the repository at this point in the history
* rebase.

* Fix bug in find plotable plot.

* Update nexus definition submodule.

* New Nexus file has been generated because:
space difference in root doc from
'        A generic positioner such as a motor or piezo-electric transducer.  \n'
to
'         A generic positioner such as a motor or piezo-electric transducer.\n

in NXpositioner.

* deactivate spm and raman for the time being.
  • Loading branch information
RubelMozumder authored Dec 8, 2024
1 parent 2ab4674 commit 229ad3e
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 12 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/plugin_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/.
Expand Down
2 changes: 1 addition & 1 deletion src/pynxtools/definitions
Submodule definitions updated 46 files
+82 −57 base_classes/NXpositioner.nxdl.xml
+99 −74 base_classes/nyaml/NXpositioner.yaml
+171 −0 contributed_definitions/NXafm.nxdl.xml
+179 −145 contributed_definitions/NXbias_spectroscopy.nxdl.xml
+93 −0 contributed_definitions/NXbias_sweep.nxdl.xml
+29 −1 contributed_definitions/NXcalibration.nxdl.xml
+168 −0 contributed_definitions/NXcantilever_spm.nxdl.xml
+86 −60 contributed_definitions/NXcircuit.nxdl.xml
+5 −8 contributed_definitions/NXfabrication.nxdl.xml
+74 −55 contributed_definitions/NXlockin.nxdl.xml
+0 −4 contributed_definitions/NXoptical_spectroscopy.nxdl.xml
+123 −0 contributed_definitions/NXpiezo_config_spm.nxdl.xml
+123 −0 contributed_definitions/NXpiezoelectric_material.nxdl.xml
+60 −0 contributed_definitions/NXpositioner_spm.nxdl.xml
+1 −1 contributed_definitions/NXpositioner_sts.nxdl.xml
+67 −0 contributed_definitions/NXrcs.nxdl.xml
+611 −0 contributed_definitions/NXscan_control.nxdl.xml
+38 −6 contributed_definitions/NXsensor_scan.nxdl.xml
+480 −0 contributed_definitions/NXspm.nxdl.xml
+377 −0 contributed_definitions/NXstm.nxdl.xml
+8 −959 contributed_definitions/NXsts.nxdl.xml
+283 −0 contributed_definitions/nyaml/NXafm.yaml
+318 −242 contributed_definitions/nyaml/NXbias_spectroscopy.yaml
+149 −0 contributed_definitions/nyaml/NXbias_sweep.yaml
+54 −7 contributed_definitions/nyaml/NXcalibration.yaml
+281 −0 contributed_definitions/nyaml/NXcantilever_spm.yaml
+166 −123 contributed_definitions/nyaml/NXcircuit.yaml
+11 −15 contributed_definitions/nyaml/NXfabrication.yaml
+157 −120 contributed_definitions/nyaml/NXlockin.yaml
+6 −13 contributed_definitions/nyaml/NXoptical_spectroscopy.yaml
+202 −0 contributed_definitions/nyaml/NXpiezo_config_spm.yaml
+207 −0 contributed_definitions/nyaml/NXpiezoelectric_material.yaml
+94 −0 contributed_definitions/nyaml/NXpositioner_spm.yaml
+0 −552 contributed_definitions/nyaml/NXpositioner_sts.yaml
+101 −0 contributed_definitions/nyaml/NXrcs.yaml
+1,068 −0 contributed_definitions/nyaml/NXscan_control.yaml
+83 −18 contributed_definitions/nyaml/NXsensor_scan.yaml
+841 −0 contributed_definitions/nyaml/NXspm.yaml
+662 −0 contributed_definitions/nyaml/NXstm.yaml
+17 −1,847 contributed_definitions/nyaml/NXsts.yaml
+1 −1 dev_tools/docs/nxdl_index.py
+58 −0 manual/source/classes/contributed_definitions/spm-structure.rst
+0 −47 manual/source/classes/contributed_definitions/sts-structure.rst
+1 −1 manual/source/index.rst
+15 −0 manual/source/spm-structure.rst
+0 −8 manual/source/sts-structure.rst
2 changes: 1 addition & 1 deletion src/pynxtools/nexus-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v2022.07-1518-g4931f392
v2022.07-1520-g6e313456
7 changes: 5 additions & 2 deletions src/pynxtools/nexus/nexus.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/pynxtools/testing/nexus_conversion.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/data/nexus/Ref_nexus_test.log
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 229ad3e

Please sign in to comment.