Merge branch 'development' of https://github.com/suny-downstate-medic…

…al-center/netpyne into development

.github/workflows/tests.yml

@@ -7,8 +7,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        #python-version: [2.7, 3.7]
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
       fail-fast: false
 
     steps:

netpyne/plotting/plotCSD.py

@@ -148,10 +148,16 @@ def plotCSD(
             getAllData=True,
             **kwargs)
     else:
-        pass # TODO: ensure time slicing works properly in case CSDData is passed as an argument
+        nsamples = CSDData.shape[1]
+        tt = np.arange(nsamples) * dt
+        if timeRange is not None:
+            mask = (tt >= timeRange[0]) & (tt < timeRange[1])
+            LFPData = LFPData[mask, :]
+            CSDData = CSDData[:, mask]
 
     npcsd = CSDData
-    if pad > 0: npcsd = getPaddedCSD(CSDData, pad) # apply padding (replicate first,last rows)
+    if pad > 0:
+        npcsd = getPaddedCSD(CSDData, pad) # apply padding (replicate first,last rows)
 
     if timeRange is None:
         timeRange = [0, sim.cfg.duration]