added tintervals

grouper.py

@@ -45,9 +45,9 @@ class Grouper(ABC):
         return max([s.ntimepoints for s in self.signals.values()])
 
     @property
-    def ntimepoints(self) -> int:
-        tintervals = set([s.tinterval for s in self.signals.values()])
-        assert len(tintervals)==1, "Not all signals have the same time interval"
+    def tintervals(self) -> float:
+        tintervals = set([s.tinterval[0]/60 for s in self.signals.values()])
+        assert len(tintervals) == 1, "Not all signals have the same time interval"
 
         return max(tintervals)
 
@@ -133,7 +133,8 @@ class Grouper(ABC):
             for name, signal in sitems.items():
                 print(name)
                 signals.append(
-                    concat_signal_ind(path, group_names, name, signal, **kwargs)
+                    concat_signal_ind(path, group_names,
+                                      name, signal, **kwargs)
                 )
 
         errors = [k for s, k in zip(signals, self.signals.keys()) if s is None]
@@ -186,7 +187,7 @@ class NameGrouper(Grouper):
         if not hasattr(self, "_group_names"):
             self._group_names = {}
             for name in self.signals.keys():
-                self._group_names[name] = name[self.by[0] : self.by[1]]
+                self._group_names[name] = name[self.by[0]: self.by[1]]
 
         return self._group_names
 
@@ -241,7 +242,8 @@ class phGrouper(NameGrouper):
         )
         ph = pd.Series(
             [
-                self.ph_from_group(x[list(aggregated.index.names).index("group")])
+                self.ph_from_group(
+                    x[list(aggregated.index.names).index("group")])
                 for x in aggregated.index
             ],
             index=aggregated.index,
@@ -318,10 +320,12 @@ class MultiGrouper:
             raw_mat = [
                 [s.siglist for s in gpr.signals.values()] for gpr in self.groupers
             ]
-            siglist_grouped = [Counter([x for y in grp for x in y]) for grp in raw_mat]
+            siglist_grouped = [Counter([x for y in grp for x in y])
+                               for grp in raw_mat]
 
             nexps = len(siglist_grouped)
-            sigs_idx = list(set([y for x in siglist_grouped for y in x.keys()]))
+            sigs_idx = list(
+                set([y for x in siglist_grouped for y in x.keys()]))
             sigs_idx = [regex_cleanup(x) for x in sigs_idx]
 
             nsigs = len(sigs_idx)
@@ -334,7 +338,8 @@ class MultiGrouper:
 
             sig_matrix[sig_matrix == 0] = np.nan
             self._sigtable = pd.DataFrame(
-                sig_matrix, index=sigs_idx, columns=[x.name for x in self.exp_dirs]
+                sig_matrix, index=sigs_idx, columns=[
+                    x.name for x in self.exp_dirs]
             )
         return self._sigtable