code updating...

dagush · May 30, 2023 · 371b44c · 371b44c
1 parent 90eda2e
commit 371b44c
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 19 deletions.
diff --git a/fMRI_Obs/BOLDFilters.py b/fMRI_Obs/BOLDFilters.py
@@ -8,7 +8,7 @@
 import warnings
 import numpy as np
 from scipy.signal import butter, detrend, filtfilt
-from WholeBrain.Utils import demean
+import demean
 from scipy import signal
 # from numba import jit
 

diff --git a/fMRI_Obs/FC.py b/fMRI_Obs/FC.py
@@ -8,7 +8,7 @@
 import warnings
 import numpy as np
 # from numba import jit
-from Observables import BOLDFilters
+import BOLDFilters
 
 print("Going to use Functional Connectivity (FC)...")
 

diff --git a/fMRI_Obs/GBC.py b/fMRI_Obs/GBC.py
@@ -8,8 +8,8 @@
 #--------------------------------------------------------------------------
 import numpy as np
 # from numba import jit
-from Observables import BOLDFilters
-import WholeBrain.Observables.FC as FC
+import BOLDFilters
+import FC
 
 print("Going to use Global Brain Connectivity (GBC)...")
 

diff --git a/fMRI_Obs/Integration.py b/fMRI_Obs/Integration.py
@@ -9,7 +9,7 @@
 # Refactored by Gustavo Patow
 #
 # --------------------------------------------------------------------------------------
-from Observables import BOLDFilters
+import BOLDFilters
 
 print("Going to use Integration (from FC)...")
 

diff --git a/fMRI_Obs/Metastability.py b/fMRI_Obs/Metastability.py
@@ -25,8 +25,8 @@
 import numpy as np
 from scipy import signal, stats
 # from scipy import stats
-from Observables import BOLDFilters
-from WholeBrain.Utils import demean
+import BOLDFilters
+import demean
 
 print("Going to use Metastability (Kuramoto order parm)...")
 

diff --git a/fMRI_Obs/OLD_Integration.py b/fMRI_Obs/OLD_Integration.py
@@ -21,7 +21,7 @@
 import numpy as np
 from scipy import signal, stats
 # from scipy import stats
-from WholeBrain.Utils import demean
+import demean
 
 import WholeBrain.Observables.PhaseInteractionMatrix as PhaseInteractionMatrix
 

diff --git a/fMRI_Obs/PhaseInteractionMatrix.py b/fMRI_Obs/PhaseInteractionMatrix.py
@@ -23,8 +23,8 @@
 import numpy as np
 from scipy import signal, stats
 # from scipy import stats
-from Observables import BOLDFilters
-from WholeBrain.Utils import demean
+import BOLDFilters
+import demean
 
 print("Going to use Phase-Interaction Matrix...")
 

diff --git a/fMRI_Obs/Segregation.py b/fMRI_Obs/Segregation.py
@@ -7,11 +7,11 @@
 import warnings
 import numpy as np
 import copy as cp
-from WholeBrain.Utils.iGraphTools import Array2iGraph
+from iGraphTools import Array2iGraph
 
 import leidenalg as leiden
 
-import WholeBrain.Observables.PhaseInteractionMatrix as PhaseInteractionMatrix
+import PhaseInteractionMatrix
 
 print("Going to use Segregation...")
 

diff --git a/fMRI_Obs/filteredPowerSpectralDensity.py b/fMRI_Obs/filteredPowerSpectralDensity.py
@@ -8,7 +8,7 @@
 import numpy as np
 from scipy.signal import butter, detrend, filtfilt
 from scipy.stats import zscore
-import Observables.BOLDFilters as BOLDFilters
+import BOLDFilters
 
 
 def conv(u,v):  # python equivalent to matlab conv 'same' method

diff --git a/fMRI_Obs/intrinsicIgnition.py b/fMRI_Obs/intrinsicIgnition.py
@@ -37,8 +37,8 @@
 # from scipy.optimize import curve_fit
 from numba import jit
 
-from Observables import BOLDFilters
-from WholeBrain.Utils import demean
+import BOLDFilters
+import demean
 # import WholeBrain.Observables.Integration as Integration
 
 # ==================================

diff --git a/fMRI_Obs/multi_Measurements.py b/fMRI_Obs/multi_Measurements.py
@@ -4,7 +4,7 @@
 # --------------------------------------------------------------------------------------
 import numpy as np
 from scipy import signal, stats
-from WholeBrain.Utils import demean
+import demean
 
 print("Going to use multi-measurement metrics...")
 

diff --git a/fMRI_Obs/stimulatedIgnition.py b/fMRI_Obs/stimulatedIgnition.py
@@ -19,7 +19,6 @@
 import scipy.io as sio
 import matplotlib.pyplot as plt
 from scipy.optimize import curve_fit
-from WholeBrain.Utils.decorators import loadOrCompute
 
 print("Going to use Stimulated Ignition...")
 
@@ -193,7 +192,7 @@ def setupStimulation(seed, perturb):
     stim.amp = perturb
 
 
-@loadOrCompute
+# @loadOrCompute
 def simulateTrials(numTrials, N, PERTURB, seed):
     neuro_act = np.zeros((numTrials, Tmaxneuronal+1, N))
     neuro_actf = np.zeros((int(Tmaxneuronal/20), N))

diff --git a/fMRI_Obs/swFCD.py b/fMRI_Obs/swFCD.py
@@ -9,7 +9,7 @@
 import numpy as np
 # from numba import jit
 from scipy import stats
-from Observables import BOLDFilters
+import BOLDFilters
 
 print("Going to use Sliding Windows Functional Connectivity Dynamics (swFCD)...")