Skip to content

Commit

Permalink
Merge pull request #65 from noahbenson/master
Browse files Browse the repository at this point in the history
fixed unexpected float/int issue related to alpha parameters
  • Loading branch information
kdesimone authored Sep 6, 2019
2 parents 44b1e45 + 1e9e903 commit 40d822c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions popeye/utilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -615,10 +615,10 @@ def double_gamma_hrf(delay, tr, fptr=1.0, integrator=trapz):
from scipy.special import gamma

# add delay to the peak and undershoot params (alpha 1 and 2)
alpha_1 = 5 + delay
alpha_1 = float(5 + delay)
beta_1 = 1.0
c = 0.1
alpha_2 = 15 + delay
alpha_2 = float(15 + delay)
beta_2 = 1.0

t = np.arange(0,32,tr)
Expand Down

0 comments on commit 40d822c

Please sign in to comment.