Minor adaptations of NOMAD changes.

aptfimparser/__init__.py

@@ -20,10 +20,11 @@ import numpy as np
 from datetime import datetime
 
 from nomad.parsing.parser import FairdiParser
-from nomad.datamodel.metainfo.general_experimental import section_experiment as SectionExperiment
-from nomad.datamodel.metainfo.general_experimental import section_data as SectionData
-from nomad.datamodel.metainfo.general_experimental_method import section_method as SectionMethod
-from nomad.datamodel.metainfo.general_experimental_sample import section_sample as SectionSample
+from nomad.datamodel.metainfo.general_experimental import (
+    section_experiment as SectionExperiment,
+    section_data as SectionData,
+    section_method as SectionMethod,
+    section_sample as SectionSample)
 
 
 class APTFIMParser(FairdiParser):

aptfimparser/metainfo/__init__.py

@@ -4,14 +4,8 @@ from nomad.metainfo.legacy import LegacyMetainfoEnvironment
 import aptfimparser.metainfo.aptfim
 import nomad.datamodel.metainfo.general
 import nomad.datamodel.metainfo.general_experimental
-import nomad.datamodel.metainfo.general_experimental_method
-import nomad.datamodel.metainfo.general_experimental_sample
-import nomad.datamodel.metainfo.general_experimental_data
 
 m_env = LegacyMetainfoEnvironment()
 m_env.m_add_sub_section(Environment.packages, sys.modules['aptfimparser.metainfo.aptfim'].m_package)  # type: ignore
 m_env.m_add_sub_section(Environment.packages, sys.modules['nomad.datamodel.metainfo.general'].m_package)  # type: ignore
 m_env.m_add_sub_section(Environment.packages, sys.modules['nomad.datamodel.metainfo.general_experimental'].m_package)  # type: ignore
-m_env.m_add_sub_section(Environment.packages, sys.modules['nomad.datamodel.metainfo.general_experimental_method'].m_package)  # type: ignore
-m_env.m_add_sub_section(Environment.packages, sys.modules['nomad.datamodel.metainfo.general_experimental_sample'].m_package)  # type: ignore
-m_env.m_add_sub_section(Environment.packages, sys.modules['nomad.datamodel.metainfo.general_experimental_data'].m_package)  # type: ignore