Skip to content

Commit

Permalink
covgc input conversion
Browse files Browse the repository at this point in the history
  • Loading branch information
EtienneCmb committed Nov 26, 2020
1 parent 3d24c98 commit b72d151
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions frites/conn/conn_covgc.py
Expand Up @@ -7,6 +7,7 @@
from frites.core.gcmi_nd import cmi_nd_ggg
from frites.core.copnorm import copnorm_nd
from frites.utils import parallel_func
from frites.conn.conn_io import conn_io



Expand Down Expand Up @@ -304,12 +305,8 @@ def conn_covgc(data, dt, lag, t0, step=1, roi=None, times=None, method='gc',
dt, lag, step, trials = int(dt), int(lag), int(step), None
# handle dataarray input
if isinstance(data, xr.DataArray):
if isinstance(roi, str):
roi = data[roi].data
if isinstance(times, str):
times = data[times].data
trials = data['trials'].data
data = data.data
data, roi, times = conn_io(data, roi=roi, times=times, verbose=verbose)
# force C contiguous array because operations on row-major
if not data.flags.c_contiguous:
data = np.ascontiguousarray(data)
Expand Down

0 comments on commit b72d151

Please sign in to comment.