Merge branch '613' of https://github.com/cbroz1/spyglass

environment_position.yml

@@ -1,12 +1,14 @@
 # FIRST: INSTALL CORRECT DRIVER for GPU, see https://stackoverflow.com/questions/30820513/what-is-the-correct-version-of-cuda-for-my-nvidia-driver/30820690
 #
+# NOTE: Perform install on a GPU-equipped machine
+#
 # install: mamba env create -f environment_position.yml
 # update:  mamba env update -f environment_position.yml
 # after installing do the following:
-# conda activate spyglass-position
-# mamba env config vars set LD_LIBRARY_PATH=~/path/to/anaconda3/envs/spyglass-position/lib/
-# run mamba install -c conda-forge wxpython
-# cd into spyglass and run pip install -e .[position]
+# run: conda activate spyglass-position
+# run: mamba env config vars set LD_LIBRARY_PATH=~/path/to/<anaconda3 or mambaforge>/envs/spyglass-position/lib/
+# run: mamba install -c conda-forge wxpython
+# cd into spyglass and run: pip install -e .[position]
 
 name: spyglass-position
 channels:
@@ -47,7 +49,7 @@ dependencies:
   - pip:
       - pubnub<6.4.0
       - mountainsort4
-      - spikeinterface>0.94,<0.98
+      - spikeinterface>=0.98.2,<0.99
       - pynwb>=2.2.0,<3
       - hdmf>=3.4.6
       - datajoint>=0.13.6

src/spyglass/common/__init__.py

@@ -17,6 +17,8 @@
     RawPosition,
     StateScriptFile,
     VideoFile,
+    PositionIntervalMap,
+    convert_epoch_interval_name_to_position_interval_name,
 )
 from .common_device import (
     CameraDevice,