Skip to content

Commit

Permalink
missing file for previous commit
Browse files Browse the repository at this point in the history
  • Loading branch information
teogale committed Sep 5, 2019
1 parent aab62d8 commit 7dfd0ba
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 7 deletions.
20 changes: 14 additions & 6 deletions neo/core/imagesequence.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
from neo.core.regionofinterest import RegionOfInterest
from neo.core.analogsignal import AnalogSignal, _get_sampling_rate
from neo.core.dataobject import DataObject
Expand Down Expand Up @@ -62,16 +63,23 @@ def signal_from_region(self, *region):
raise ValueError('no region of interest have been given')

region_pixel = []
for i in range(len(region)):
region_pixel.append(region[i].return_list_pixel())
for i,b in enumerate(region):
r = region[i].return_list_pixel()
if r == []:
raise ValueError('region '+str(i)+'is empty')
else:
region_pixel.append(r)
analogsignal_list = []
for i in region_pixel:
data = []
for frame in range(len(self)):
picture_data = 0
picture_data = []
for v in i:
picture_data += self.view(pq.Quantity)[frame][v[0]][v[1]]
data.append((picture_data * 1.0) / len(i))
analogsignal_list.append(AnalogSignal(data, self.units, self.sampling_rate))
picture_data.append(self.view(pq.Quantity)[frame][v[0]][v[1]])
average = picture_data[0]
for b in range(1, len(picture_data)):
average += picture_data[b]
data.append((average * 1.0) / len(i))
analogsignal_list.append(AnalogSignal(data, units=self.units, sampling_rate=self.sampling_rate))

return analogsignal_list
2 changes: 1 addition & 1 deletion neo/core/regionofinterest.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
class RegionOfInterest:
pass


class CircularRegionOfInterest(RegionOfInterest):

def __init__(self, x, y, radius):
Expand Down

0 comments on commit 7dfd0ba

Please sign in to comment.