Replace DataANDTextParser with DataTextParser

electronicparsers/edmft/parser.py

@@ -35,8 +35,9 @@
     Calculation, ScfIteration, Energy, EnergyEntry, Charges, GreensFunctions, Dos, DosValues
 )
 from nomad.datamodel.metainfo.simulation.workflow import SinglePoint
+from nomad.parsing.file_parser import DataTextParser
 from .metainfo.edmft import x_edmft_method_parameters
-from ..utils import get_files, DataANDTextParser, BeyondDFTWorkflowsParser
+from ..utils import get_files, BeyondDFTWorkflowsParser
 from ..wien2k.parser import StructParser  # Wien2k is imported to parse the system information
 
 
@@ -107,7 +108,7 @@ def init_quantities(self):
                         repeats=True)]))]
 
 
-class ImpurityGfOutParser(DataANDTextParser):
+class ImpurityGfOutParser(DataTextParser):
     def __init__(self):
         super().__init__()
 
@@ -138,7 +139,7 @@ def str_multiply_to_float(val_in):
                 str_operation=str_multiply_to_float)]
 
 
-class MaxEntSigOutParser(DataANDTextParser):
+class MaxEntSigOutParser(DataTextParser):
     def __init__(self):
         super().__init__()
 

electronicparsers/utils/__init__.py

@@ -17,5 +17,5 @@
 # limitations under the License.
 
 from .utils import (
-    get_files, numpy_type_to_json_serializable, BeyondDFTWorkflowsParser, DataANDTextParser
+    get_files, numpy_type_to_json_serializable, BeyondDFTWorkflowsParser
 )

electronicparsers/utils/utils.py

@@ -381,22 +381,3 @@ def parse_dmft_workflow(self, wannier_archive: EntryArchive, dmft_workflow_archi
             workflow.m_add_sub_section(DMFT.tasks, task)
 
         dmft_workflow_archive.workflow2 = workflow
-
-
-class DataANDTextParser(TextParser):  # TODO rename to 'DataTextParser' after changes are done in NOMAD
-    """Parser for structured data text files with a few lines containing unstructured text.
-
-    Args:
-        mainfile: the file to be parsed.
-    """
-    def __init__(self):
-        super().__init__()
-
-    def init_quantities(self):
-        self._data = None
-
-    @property
-    def data(self):
-        if self._data is None:
-            self._data = np.loadtxt(self.mainfile)
-        return self._data