From 48577e1145cc52f1a3d91c1a21691c77c8dbabc5 Mon Sep 17 00:00:00 2001
From: pauladkisson <paul.wesley.adkisson@gmail.com>
Date: Mon, 9 Oct 2023 15:05:02 -0700
Subject: [PATCH] renamed nwbconverters to avoid ambiguity

---
 frozen_dependencies.txt                                       | 3 ++-
 .../markowitz_gillis_nature_2023/convert_session.py           | 4 ++--
 .../markowitz_gillis_nature_2023/nwbconverter.py              | 2 +-
 .../markowitz_gillis_nature_2023_HEK/convert_session.py       | 4 ++--
 .../markowitz_gillis_nature_2023_HEK/nwbconverter.py          | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/frozen_dependencies.txt b/frozen_dependencies.txt
index 657b136..5f9a031 100644
--- a/frozen_dependencies.txt
+++ b/frozen_dependencies.txt
@@ -115,7 +115,8 @@ natsort==8.4.0
 nbclient==0.8.0
 nbconvert==7.7.3
 nbformat==5.9.2
--e git+https://github.com/pauladkisson/ndx-moseq.git@2c25aaa85bb70762111a520918c73abac4ac0801#egg=ndx_depth_moseq
+# Editable install with no version control (ndx-depth-moseq==0.1.0)
+-e /opt/anaconda3/envs/datta_env/lib/python3.10/site-packages
 ndx-events==0.2.0
 ndx-grayscalevolume==0.0.2
 ndx-icephys-meta==0.1.0
diff --git a/src/datta_lab_to_nwb/markowitz_gillis_nature_2023/convert_session.py b/src/datta_lab_to_nwb/markowitz_gillis_nature_2023/convert_session.py
index 0b57fa7..b2710ac 100644
--- a/src/datta_lab_to_nwb/markowitz_gillis_nature_2023/convert_session.py
+++ b/src/datta_lab_to_nwb/markowitz_gillis_nature_2023/convert_session.py
@@ -10,7 +10,7 @@
 
 # Local
 from datta_lab_to_nwb.markowitz_gillis_nature_2023.postconversion import reproduce_fig1d
-from datta_lab_to_nwb import markowitz_gillis_nature_2023
+from datta_lab_to_nwb.markowitz_gillis_nature_2023.nwbconverter import DattaNWBConverter
 
 
 def session_to_nwb(
@@ -114,7 +114,7 @@ def session_to_nwb(
     if experiment_type == "velocity-modulation":
         conversion_options["BehavioralSyllable"] = dict(velocity_modulation=True)
 
-    converter = markowitz_gillis_nature_2023.NWBConverter(source_data=source_data)
+    converter = DattaNWBConverter(source_data=source_data)
     metadata = converter.get_metadata()
 
     # Update metadata
diff --git a/src/datta_lab_to_nwb/markowitz_gillis_nature_2023/nwbconverter.py b/src/datta_lab_to_nwb/markowitz_gillis_nature_2023/nwbconverter.py
index f031512..7760b9a 100644
--- a/src/datta_lab_to_nwb/markowitz_gillis_nature_2023/nwbconverter.py
+++ b/src/datta_lab_to_nwb/markowitz_gillis_nature_2023/nwbconverter.py
@@ -8,7 +8,7 @@
 from .irvideointerface import IRVideoInterface
 
 
-class NWBConverter(NWBConverter):
+class DattaNWBConverter(NWBConverter):
     """Primary conversion class."""
 
     data_interface_classes = dict(
diff --git a/src/datta_lab_to_nwb/markowitz_gillis_nature_2023_HEK/convert_session.py b/src/datta_lab_to_nwb/markowitz_gillis_nature_2023_HEK/convert_session.py
index ea942f7..3757bbf 100644
--- a/src/datta_lab_to_nwb/markowitz_gillis_nature_2023_HEK/convert_session.py
+++ b/src/datta_lab_to_nwb/markowitz_gillis_nature_2023_HEK/convert_session.py
@@ -2,7 +2,7 @@
 from pathlib import Path
 from typing import Union
 from neuroconv.utils import dict_deep_update, load_dict_from_file
-from datta_lab_to_nwb import markowitz_gillis_nature_2023_HEK
+from datta_lab_to_nwb.markowitz_gillis_nature_2023_HEK.nwbconverter import DattaHEKNWBConverter
 import shutil
 from pynwb import NWBHDF5IO
 from datta_lab_to_nwb.markowitz_gillis_nature_2023_HEK.postconversion import reproduce_figS1abcd
@@ -28,7 +28,7 @@ def session_to_nwb(
     conversion_options = {
         "HEK": dict(),
     }
-    converter = markowitz_gillis_nature_2023_HEK.NWBConverter(source_data=source_data)
+    converter = DattaHEKNWBConverter(source_data=source_data)
     metadata = converter.get_metadata()
 
     # Update metadata
diff --git a/src/datta_lab_to_nwb/markowitz_gillis_nature_2023_HEK/nwbconverter.py b/src/datta_lab_to_nwb/markowitz_gillis_nature_2023_HEK/nwbconverter.py
index 7600073..3b7e091 100644
--- a/src/datta_lab_to_nwb/markowitz_gillis_nature_2023_HEK/nwbconverter.py
+++ b/src/datta_lab_to_nwb/markowitz_gillis_nature_2023_HEK/nwbconverter.py
@@ -3,7 +3,7 @@
 from .hekinterface import HEKInterface
 
 
-class NWBConverter(NWBConverter):
+class DattaHEKNWBConverter(NWBConverter):
     """Primary conversion class."""
 
     data_interface_classes = dict(