bmtool 0.7.1__py3-none-any.whl → 0.7.1.1__py3-none-any.whl

bmtool/analysis/entrainment.py

@@ -180,7 +180,18 @@ def calculate_spike_lfp_plv(
     spike_indices = np.round(spike_times_seconds * lfp_fs).astype(int)
 
     # Filter indices to ensure they're within bounds of the LFP signal
-    valid_indices = align_spike_times_with_lfp(lfp=lfp_data, timestamps=spike_indices)
+    if isinstance(lfp_data, xr.DataArray):
+        if filtered_lfp_phase is not None:
+            valid_indices = align_spike_times_with_lfp(
+                lfp=filtered_lfp_phase, timestamps=spike_indices
+            )
+        else:
+            valid_indices = align_spike_times_with_lfp(lfp=lfp_data, timestamps=spike_indices)
+    elif isinstance(lfp_data, np.ndarray):
+        if filtered_lfp_phase is not None:
+            valid_indices = [idx for idx in spike_indices if 0 <= idx < len(filtered_lfp_phase)]
+        else:
+            valid_indices = [idx for idx in spike_indices if 0 <= idx < len(lfp_data)]
 
     if len(valid_indices) <= 1:
         return 0
@@ -200,7 +211,10 @@ def calculate_spike_lfp_plv(
         instantaneous_phase = filtered_lfp_phase
 
     # Get phases at spike times
-    spike_phases = instantaneous_phase.sel(time=valid_indices).values
+    if isinstance(instantaneous_phase, xr.DataArray):
+        spike_phases = instantaneous_phase.sel(time=valid_indices).values
+    else:
+        spike_phases = instantaneous_phase[valid_indices]
 
     # Number of spikes
     N = len(spike_phases)
@@ -311,10 +325,18 @@ def calculate_ppc(
     spike_indices = np.round(spike_times_seconds * lfp_fs).astype(int)
 
     # Filter indices to ensure they're within bounds of the LFP signal
-    if filtered_lfp_phase is not None:
-        valid_indices = align_spike_times_with_lfp(lfp=filtered_lfp_phase, timestamps=spike_indices)
-    else:
-        valid_indices = align_spike_times_with_lfp(lfp=lfp_data, timestamps=spike_indices)
+    if isinstance(lfp_data, xr.DataArray):
+        if filtered_lfp_phase is not None:
+            valid_indices = align_spike_times_with_lfp(
+                lfp=filtered_lfp_phase, timestamps=spike_indices
+            )
+        else:
+            valid_indices = align_spike_times_with_lfp(lfp=lfp_data, timestamps=spike_indices)
+    elif isinstance(lfp_data, np.ndarray):
+        if filtered_lfp_phase is not None:
+            valid_indices = [idx for idx in spike_indices if 0 <= idx < len(filtered_lfp_phase)]
+        else:
+            valid_indices = [idx for idx in spike_indices if 0 <= idx < len(lfp_data)]
 
     if len(valid_indices) <= 1:
         return 0
@@ -334,7 +356,10 @@ def calculate_ppc(
         instantaneous_phase = filtered_lfp_phase
 
     # Get phases at spike times
-    spike_phases = instantaneous_phase.sel(time=valid_indices).values
+    if isinstance(instantaneous_phase, xr.DataArray):
+        spike_phases = instantaneous_phase.sel(time=valid_indices).values
+    else:
+        spike_phases = instantaneous_phase[valid_indices]
 
     n_spikes = len(spike_phases)
 
@@ -418,10 +443,18 @@ def calculate_ppc2(
     spike_indices = np.round(spike_times_seconds * lfp_fs).astype(int)
 
     # Filter indices to ensure they're within bounds of the LFP signal
-    if filtered_lfp_phase is not None:
-        valid_indices = align_spike_times_with_lfp(lfp=filtered_lfp_phase, timestamps=spike_indices)
-    else:
-        valid_indices = align_spike_times_with_lfp(lfp=lfp_data, timestamps=spike_indices)
+    if isinstance(lfp_data, xr.DataArray):
+        if filtered_lfp_phase is not None:
+            valid_indices = align_spike_times_with_lfp(
+                lfp=filtered_lfp_phase, timestamps=spike_indices
+            )
+        else:
+            valid_indices = align_spike_times_with_lfp(lfp=lfp_data, timestamps=spike_indices)
+    elif isinstance(lfp_data, np.ndarray):
+        if filtered_lfp_phase is not None:
+            valid_indices = [idx for idx in spike_indices if 0 <= idx < len(filtered_lfp_phase)]
+        else:
+            valid_indices = [idx for idx in spike_indices if 0 <= idx < len(lfp_data)]
 
     if len(valid_indices) <= 1:
         return 0
@@ -441,7 +474,10 @@ def calculate_ppc2(
         instantaneous_phase = filtered_lfp_phase
 
     # Get phases at spike times
-    spike_phases = instantaneous_phase.sel(time=valid_indices).values
+    if isinstance(instantaneous_phase, xr.DataArray):
+        spike_phases = instantaneous_phase.sel(time=valid_indices).values
+    else:
+        spike_phases = instantaneous_phase[valid_indices]
     # Calculate PPC2 according to Vinck et al. (2010), Equation 6
     n = len(spike_phases)
 

{bmtool-0.7.1.dist-info → bmtool-0.7.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bmtool
-Version: 0.7.1
+Version: 0.7.1.1
 Summary: BMTool
 Home-page: https://github.com/cyneuro/bmtool
 Download-URL: 

{bmtool-0.7.1.dist-info → bmtool-0.7.1.1.dist-info}/RECORD

@@ -8,7 +8,7 @@ bmtool/plot_commands.py,sha256=Dxm_RaT4CtHnfsltTtUopJ4KVbfhxtktEB_b7bFEXII,12716
 bmtool/singlecell.py,sha256=I2yolbAnNC8qpnRkNdnDCLidNW7CktmBuRrcowMZJ3A,45041
 bmtool/synapses.py,sha256=wlRY7IixefPzafqG6k2sPIK4s6PLG9Kct-oCaVR29wA,64269
 bmtool/analysis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bmtool/analysis/entrainment.py,sha256=UVYhakyFGmH56UZ2jlshOH86rIKc9hSI-U2-kK2yp7o,25190
+bmtool/analysis/entrainment.py,sha256=Nzrt1pKHEDzrx9TYnsE0sbevxl4iht1fymA29khq8Pg,26841
 bmtool/analysis/lfp.py,sha256=S2JvxkjcK3-EH93wCrhqNSFY6cX7fOq74pz64ibHKrc,26556
 bmtool/analysis/netcon_reports.py,sha256=VnPZNKPaQA7oh1q9cIatsqQudm4cOtzNtbGPXoiDCD0,2909
 bmtool/analysis/spikes.py,sha256=ScP4EeX2QuEd_FXyj3W0WWgZKvZwwneuWuKFe3xwaCY,15115
@@ -26,9 +26,9 @@ bmtool/util/commands.py,sha256=Nn-R-4e9g8ZhSPZvTkr38xeKRPfEMANB9Lugppj82UI,68564
 bmtool/util/util.py,sha256=owce5BEusZO_8T5x05N2_B583G26vWAy7QX29V0Pj0Y,62818
 bmtool/util/neuron/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bmtool/util/neuron/celltuner.py,sha256=lokRLUM1rsdSYBYrNbLBBo39j14mm8TBNVNRnSlhHCk,94868
-bmtool-0.7.1.dist-info/licenses/LICENSE,sha256=qrXg2jj6kz5d0EnN11hllcQt2fcWVNumx0xNbV05nyM,1068
-bmtool-0.7.1.dist-info/METADATA,sha256=qVCMtNEx1YXI0KlMV3hLlhTSdEbbv5xrj2V1ZFWY0ho,3621
-bmtool-0.7.1.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-bmtool-0.7.1.dist-info/entry_points.txt,sha256=0-BHZ6nUnh0twWw9SXNTiRmKjDnb1VO2DfG_-oprhAc,45
-bmtool-0.7.1.dist-info/top_level.txt,sha256=gpd2Sj-L9tWbuJEd5E8C8S8XkNm5yUE76klUYcM-eWM,7
-bmtool-0.7.1.dist-info/RECORD,,
+bmtool-0.7.1.1.dist-info/licenses/LICENSE,sha256=qrXg2jj6kz5d0EnN11hllcQt2fcWVNumx0xNbV05nyM,1068
+bmtool-0.7.1.1.dist-info/METADATA,sha256=ONMkDOU2sGv2xzC9jbP5z9HdGFI2HGO_2fwS6cIBj3w,3623
+bmtool-0.7.1.1.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+bmtool-0.7.1.1.dist-info/entry_points.txt,sha256=0-BHZ6nUnh0twWw9SXNTiRmKjDnb1VO2DfG_-oprhAc,45
+bmtool-0.7.1.1.dist-info/top_level.txt,sha256=gpd2Sj-L9tWbuJEd5E8C8S8XkNm5yUE76klUYcM-eWM,7
+bmtool-0.7.1.1.dist-info/RECORD,,