From 67e5f768ff84bd8fffe9245b17f9dccd899d22d7 Mon Sep 17 00:00:00 2001
From: "!git for-each-ref --format='%(refname:short)' `git symbolic-ref HEAD`"
 <ben.dichter@gmail.com>
Date: Fri, 19 Feb 2021 18:23:11 -0500
Subject: [PATCH] fix some naming errors in the util functions

---
 +util/loadEventAlignedTimeSeriesData.m | 12 ++++++------
 +util/loadTimeSeriesData.m             | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/+util/loadEventAlignedTimeSeriesData.m b/+util/loadEventAlignedTimeSeriesData.m
index 5430244a..cb7899a0 100644
--- a/+util/loadEventAlignedTimeSeriesData.m
+++ b/+util/loadEventAlignedTimeSeriesData.m
@@ -17,8 +17,8 @@
     downsample_factor = 1;
 end
 
-if ~exist('electrode','var')
-    electrode = [];
+if ~exist('electrodes','var')
+    electrodes = [];
 end
 
 fs = timeseries.starting_time_rate;
@@ -26,16 +26,16 @@
 
 dims = timeseries.data.dims;
 
-if isempty(electrode)
+if isempty(electrodes)
     D = NaN(length(times), dims(1), int16(inds_len));
     for i = 1:length(times)
         D(i,:,:) = util.loadTimeSeriesData(timeseries, window + times(i), ...
             downsample_factor, electrodes);
     end
 else
-    D = NaN(length(times), inds_len);
+    D = NaN(length(times), length(electrodes), inds_len);
     for i = 1:length(times)
-        D(i,:) = util.loadTimeSeriesData(timeseries, window + times(i), ...
-            downsample_factor, electrodes);
+        D(i,:,:) = reshape(util.loadTimeSeriesData(timeseries, window + times(i), ...
+            downsample_factor, electrodes)', [1 length(electrodes) inds_len]);
     end
 end
diff --git a/+util/loadTimeSeriesData.m b/+util/loadTimeSeriesData.m
index 4760aa1d..8e1aa22b 100644
--- a/+util/loadTimeSeriesData.m
+++ b/+util/loadTimeSeriesData.m
@@ -21,15 +21,15 @@
     downsample_factor = 1;
 end
 
-if ~exist('electrode', 'var')
-    electrode = [];
+if ~exist('electrodes', 'var')
+    electrodes = [];
 end
 
 if length(electrodes) > 1
-    fs = timesries.starting_time_rate;
+    fs = timeseries.starting_time_rate;
     data = NaN(diff(interval) * fs, length(electrodes));
     for i = 1:length(electrodes)
-        data(:,i) = loadTimeSeriesData(timeseries, interval, ...
+        data(:,i) = util.loadTimeSeriesData(timeseries, interval, ...
             downsample_factor, electrodes(i));
     end
 else
@@ -73,8 +73,8 @@
     count = dims;
     count(end) = round((end_ind - start_ind) / downsample_factor);
     
-    if ~isempty(electrode)
-        start(end-1) = electrode;
+    if ~isempty(electrodes)
+        start(end-1) = electrodes;
         count(end-1) = 1;
     end