update movpe 1 machine parser

pyproject.toml

@@ -151,8 +151,10 @@ characterization_transmission_parser = "nomad_ikz_plugin.characterization:transm
 deprecated_characterization_schema = "nomad_ikz_plugin.deprecated.characterization:schema"
 pld_schema = "nomad_ikz_plugin.pld:schema"
 movpe_schema = "nomad_ikz_plugin.movpe:schema"
-movpe2_growth_excel_parser = "nomad_ikz_plugin.movpe.movpe2.growth_excel:parser"
-movpe1_growth_excel_parser = "nomad_ikz_plugin.movpe.movpe1.growth_excel:parser"
+movpe2_growth_excel = "nomad_ikz_plugin.movpe.movpe2.growth_excel:parser"
+movpe1_growth_excel = "nomad_ikz_plugin.movpe.movpe1.growth_excel:parser"
+movpe1_old_growth_excel = "nomad_ikz_plugin.movpe.movpe1.old_growth_excel:parser"
+movpe1_rcp_parser = "nomad_ikz_plugin.movpe.movpe1.rcp:parser"
 substrate_excel_parser = "nomad_ikz_plugin.movpe.substrate:parser"
 mbe_schema = "nomad_ikz_plugin.mbe:schema"
 #dir_sol_schema = "nomad_ikz_plugin.directional_solidification:schema"

src/nomad_ikz_plugin/directional_solidification/parser.py

@@ -173,71 +173,71 @@ def parse(self, mainfile: str, archive: EntryArchive, logger) -> None:
             dig_prot_data.heaters[heater].f2.frequency = HeaterFrequency()
 
             dig_prot_data.heaters[heater].f1.phase.value = ureg.Quantity(
-                xlsx_sheet[f'phi{heater +1}_F1'].to_numpy(),
+                xlsx_sheet[f'phi{heater + 1}_F1'].to_numpy(),
                 ureg('deg'),
             )
             dig_prot_data.heaters[heater].f1.phase.time = ureg.Quantity(
                 elapsed_time,
                 ureg('s'),
             )
             dig_prot_data.heaters[heater].f2.phase.value = ureg.Quantity(
-                xlsx_sheet[f'phi{heater +1}_F2'].to_numpy(),
+                xlsx_sheet[f'phi{heater + 1}_F2'].to_numpy(),
                 ureg('deg'),
             )
             dig_prot_data.heaters[heater].f2.phase.time = ureg.Quantity(
                 elapsed_time,
                 ureg('s'),
             )
             dig_prot_data.heaters[heater].f1.frequency.value = ureg.Quantity(
-                xlsx_sheet[f'f{heater +1}_F1'].to_numpy(),
+                xlsx_sheet[f'f{heater + 1}_F1'].to_numpy(),
                 ureg('Hz'),
             )
             dig_prot_data.heaters[heater].f1.frequency.time = ureg.Quantity(
                 elapsed_time,
                 ureg('s'),
             )
             dig_prot_data.heaters[heater].f2.frequency.value = ureg.Quantity(
-                xlsx_sheet[f'f{heater +1}_F2'].to_numpy(),
+                xlsx_sheet[f'f{heater + 1}_F2'].to_numpy(),
                 ureg('Hz'),
             )
             dig_prot_data.heaters[heater].f2.frequency.time = ureg.Quantity(
                 elapsed_time,
                 ureg('s'),
             )
             dig_prot_data.heaters[heater].f1.ac_current.value = ureg.Quantity(
-                xlsx_sheet[f'Iac{heater +1}_F1'].to_numpy(),
+                xlsx_sheet[f'Iac{heater + 1}_F1'].to_numpy(),
                 ureg('A'),
             )
             dig_prot_data.heaters[heater].f1.ac_current.time = ureg.Quantity(
                 elapsed_time,
                 ureg('s'),
             )
             dig_prot_data.heaters[heater].f2.ac_current.value = ureg.Quantity(
-                xlsx_sheet[f'Iac{heater +1}_F2'].to_numpy(),
+                xlsx_sheet[f'Iac{heater + 1}_F2'].to_numpy(),
                 ureg('A'),
             )
             dig_prot_data.heaters[heater].f2.ac_current.time = ureg.Quantity(
                 elapsed_time,
                 ureg('s'),
             )
             dig_prot_data.heaters[heater].dc_current.value = ureg.Quantity(
-                xlsx_sheet[f'Iges{heater +1}'].to_numpy(),
+                xlsx_sheet[f'Iges{heater + 1}'].to_numpy(),
                 ureg('A'),
             )
             dig_prot_data.heaters[heater].dc_current.time = ureg.Quantity(
                 elapsed_time,
                 ureg('s'),
             )
             dig_prot_data.heaters[heater].temperature.value = ureg.Quantity(
-                xlsx_sheet[f'Iges{heater +1}'].to_numpy(),
+                xlsx_sheet[f'Iges{heater + 1}'].to_numpy(),
                 ureg('K'),
             )
             dig_prot_data.heaters[heater].temperature.time = ureg.Quantity(
                 elapsed_time,
                 ureg('s'),
             )
             dig_prot_data.heaters[heater].power.value = ureg.Quantity(
-                xlsx_sheet[f'P{heater +1}'].to_numpy(),
+                xlsx_sheet[f'P{heater + 1}'].to_numpy(),
                 ureg('W'),
             )
             dig_prot_data.heaters[heater].power.time = ureg.Quantity(

src/nomad_ikz_plugin/mbe/schema.py

@@ -249,7 +249,7 @@ def normalize(self, archive, logger):
                         data[' Nesting Level'][step],
                     )
                     setattr(growth_recipes[step], 'periods', data[' Periods'][step])
-                    thickness = f"{data[' Thickness'][step]}".replace('-', '0').replace(
+                    thickness = f'{data[" Thickness"][step]}'.replace('-', '0').replace(
                         'nm', ''
                     )
                     setattr(growth_recipes[step], 'thickness', float(thickness))
@@ -392,13 +392,13 @@ def normalize(self, archive, logger):
                         switch_monitors = []
                         comms_status = []
                         start_time = dt.strptime(
-                            f"{data['Time'][0].strip()} " f"{data['Date'][0]}".strip(),
+                            f'{data["Time"][0].strip()} {data["Date"][0]}'.strip(),
                             '%H:%M:%S.%f %Y-%m-%d',
                         )
                         setattr(step_obj, 'timestamp', start_time)
                         for index in range(step_lines - 3):
                             current = dt.strptime(
-                                f"{data['Time'][index].strip()} {data['Date'][index]}".strip(),
+                                f'{data["Time"][index].strip()} {data["Date"][index]}'.strip(),
                                 '%H:%M:%S.%f %Y-%m-%d',
                             )
                             timesteps.append(

src/nomad_ikz_plugin/movpe/movpe1/growth_excel/__init__.py

@@ -16,7 +16,6 @@
 #
 
 from nomad.config.models.plugins import ParserEntryPoint
-from pydantic import Field
 
 
 class Movpe1ParserEntryPoint(ParserEntryPoint):
@@ -30,12 +29,10 @@ def load(self):
     name='Movpe1Parser',
     description='Parse excel files containing growth process parameters logged manually.',
     mainfile_name_re=r'.+\.xlsx',
+    level=1,
     mainfile_mime_re=r'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
     mainfile_contents_dict={
-        'Deposition Control': {
-            '__has_all_keys': ['Constant Parameters ID', 'Sample ID', 'Date', 'number']
-        },
-        'Precursors': {'__has_all_keys': ['Sample ID']},
+        'Ti Sr Parameter': {'__has_all_keys': ['Sample ID']},
         '__has_comment': '#',
     },
 )