Camstim ephys

src/aind_metadata_mapper/open_ephys/camstim_ephys_session.py

@@ -17,8 +17,7 @@
 import pandas as pd
 from aind_data_schema.components.coordinates import Coordinates3d
 from aind_data_schema.core.session import (
-    EphysModule,
-    EphysProbeConfig,
+    ManipulatorModule,
     Session,
     Stream,
 )
@@ -68,7 +67,7 @@ def __init__(self, session_id: str, json_settings: dict) -> None:
             self.recording_dir = npc_ephys.get_single_oebin_path(
                 session_inst.lims_path
             ).parent
-        except FileNotFoundError:
+        except:
             self.recording_dir = npc_ephys.get_single_oebin_path(
                 session_inst.npexp_path
             ).parent
@@ -230,13 +229,12 @@ def ephys_modules(self) -> list:
                 probe_name, newscale_coords
             )
 
-            probe_module = EphysModule(
+            probe_module = ManipulatorModule(
                 assembly_name=probe_name.upper(),
                 arc_angle=0.0,
                 module_angle=0.0,
                 rotation_angle=0.0,
                 primary_targeted_structure="none",
-                ephys_probes=[EphysProbeConfig(name=probe_name.upper())],
                 manipulator_coordinates=manipulator_coordinates,
                 notes=notes,
             )

src/aind_metadata_mapper/open_ephys/utils/stim_utils.py

@@ -579,13 +579,13 @@ def read_stimulus_name_from_path(stimulus):
     """
 
     stim_name = stimulus["stim_path"].split("\\")[-1].split(".")[0]
-
-    if len(stim_name) == 0:
-        stim_name = stimulus["stim_path"].split("\\\\")[-2]
-
+
+    if stimulus["stim_path"] == "":
+        stim_name = stimulus["movie_local_path"].split("\\")[-1].split(".")[0]
+    else:
+        stim_name = stimulus["stim_path"].split("\\")[-1].split(".")[0]
     return stim_name
 
-
 def get_stimulus_type(stimulus):
     """
     Obtains the stimulus type from the stimulus dictionary.

tests/test_open_ephys/test_rig.py

@@ -6,9 +6,9 @@
 from unittest.mock import MagicMock, patch
 
 from aind_data_schema.core.rig import Rig  # type: ignore
-
 from aind_metadata_mapper.open_ephys.rig import OpenEphysRigEtl
 
+
 RESOURCES_DIR = (
     Path(os.path.dirname(os.path.realpath(__file__))) / ".." / "resources"
 )