Skip to content
Snippets Groups Projects
Commit 655a07e5 authored by pswain's avatar pswain
Browse files

made compatible with no chainer in aliby

parent 18837579
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ import pandas as pd ...@@ -7,7 +7,7 @@ import pandas as pd
from wela.correct_buds import correct_buds from wela.correct_buds import correct_buds
try: try:
from postprocessor.grouper import NameGrouper from postprocessor.grouper import Grouper
except ModuleNotFoundError: except ModuleNotFoundError:
print("Can only load tsv files - cannot find postprocessor") print("Can only load tsv files - cannot find postprocessor")
...@@ -137,7 +137,7 @@ class dataloader: ...@@ -137,7 +137,7 @@ class dataloader:
def get_grouper(self, dataname): def get_grouper(self, dataname):
""" """
Return an instance of NameGrouper. Return an instance of Grouper.
Arguments Arguments
--------- ---------
...@@ -146,11 +146,11 @@ class dataloader: ...@@ -146,11 +146,11 @@ class dataloader:
Returns Returns
------- -------
grouper: instance of NameGrouper grouper: instance of Grouper
""" """
if dataname[-4:] == ".tsv": if dataname[-4:] == ".tsv":
dataname = dataname[:-4] dataname = dataname[:-4]
grouper = NameGrouper(self.h5dirpath / dataname) grouper = Grouper(self.h5dirpath / dataname)
return grouper return grouper
def load( def load(
...@@ -230,7 +230,7 @@ class dataloader: ...@@ -230,7 +230,7 @@ class dataloader:
for signal in grouper.available: for signal in grouper.available:
print(" ", signal) print(" ", signal)
# find time interval between images # find time interval between images
self.dt = grouper.tintervals self.dt = grouper.tinterval
# get key index for choosing cells # get key index for choosing cells
key_index_path = self.a2g_dict[key_index] key_index_path = self.a2g_dict[key_index]
key_index = self.get_key_index(grouper, key_index_path, cutoff) key_index = self.get_key_index(grouper, key_index_path, cutoff)
...@@ -426,8 +426,7 @@ class dataloader: ...@@ -426,8 +426,7 @@ class dataloader:
@property @property
def revert_df(self): def revert_df(self):
""" """
Convert the 'id' column into the standard columns used by aliby Convert the 'id' column into aliby's standard columns and vice versa.
and vice versa.
These columns are 'position', 'trap', and 'cell_label', either These columns are 'position', 'trap', and 'cell_label', either
adding three columns to the .df data frame or removing three adding three columns to the .df data frame or removing three
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment