rapidtide 3.0a8__tar.gz → 3.0a9__tar.gz

{rapidtide-3.0a8 → rapidtide-3.0a9}/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release history
 
+## Version 3.0alpha9 (2/26/25)
+* (rapidtide) Fixed the calculation of the regressor autocorrelation width (used in estimating MTT).
+* (tidepool) First working version that allows loading multiple files. Use ``--dataset DATASET1 DATASET2...``.
+* (tidepool) Added new "big" template to let you see more information at once.  Select with ``--uistyle big``.
+* (tidepool) Pretty significant code cleanup under the hood.
+
 ## Version 3.0alpha8 (2/20/25)
 * (rapidtide) Enhanced fit failure reporting.
 * (rapidtide) Fixed map output type for non-float maps.

{rapidtide-3.0a8/rapidtide.egg-info → rapidtide-3.0a9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rapidtide
-Version: 3.0a8
+Version: 3.0a9
 Summary: Tools for performing correlation analysis on fMRI data.
 Author: Taylor Salo, Daniel M. Drucker, Ph.D., Jeffrey N Stout, Yaroslav O. Halchenko, Derek Monroe
 Author-email: "Blaise deB. Frederick" <blaise.frederick@gmail.com>

{rapidtide-3.0a8 → rapidtide-3.0a9}/TODO.md

@@ -2,10 +2,9 @@ To do list
 ----------
 
 1. (package) Expand automated testing
-2. (package) Expand documentation A LOT
-3. (rapidtide) Finish implementing the --tmask option
 4. (tidepool) Implement ASPECTS averaging
 7. (rapidtide) Implement a dispersive delay model
+8. (rapidtide) Add a sinc peak fit
 
 Implement new argument parsing:
 rapidtide/experimental/highresmotion

{rapidtide-3.0a8 → rapidtide-3.0a9}/rapidtide/OrthoImageItem.py

@@ -25,7 +25,6 @@ import os
 
 import numpy as np
 import pyqtgraph as pg
-from more_itertools.more import first
 from pyqtgraph.Qt import QtCore, QtGui, QtWidgets
 
 try:

{rapidtide-3.0a8 → rapidtide-3.0a9}/rapidtide/RapidtideDataset.py

@@ -39,6 +39,34 @@ atlases = {
 }
 
 
+def check_rt_spatialmatch(dataset1, dataset2):
+    if (
+        (dataset1.xdim == dataset2.xdim)
+        and (dataset1.ydim == dataset2.ydim)
+        and (dataset1.zdim == dataset2.zdim)
+    ):
+        dimmatch = True
+    else:
+        dimmatch = False
+    if (
+        (dataset1.xsize == dataset2.xsize)
+        and (dataset1.ysize == dataset2.ysize)
+        and (dataset1.zsize == dataset2.zsize)
+    ):
+        sizematch = True
+    else:
+        sizematch = False
+    if dataset1.space == dataset2.space:
+        spacematch = True
+    else:
+        spacematch = False
+    if dataset1.affine == dataset2.affine:
+        affinematch = True
+    else:
+        affinematch = False
+    return dimmatch, sizematch, spacematch, affinematch
+
+
 class Timecourse:
     "Store a timecourse and some information about it"
 
@@ -159,6 +187,8 @@ class Overlay:
         self.setGeomMask(geommask, maskdata=False)
         self.maskData()
         self.updateStats()
+        self.dispmin = self.robustmin
+        self.dispmax = self.robustmax
         if init_LUT:
             self.gradient = getagradient()
             self.lut_state = lut_state
@@ -242,8 +272,6 @@ class Overlay:
             self.pct75,
             self.robustmax,
         ) = tide_stats.getfracvals(calcmaskeddata, [0.02, 0.25, 0.5, 0.75, 0.98], nozero=False)
-        self.dispmin = self.robustmin
-        self.dispmax = self.robustmax
         self.histy, self.histx = np.histogram(
             calcmaskeddata, bins=np.linspace(self.minval, self.maxval, 200)
         )
@@ -452,6 +480,8 @@ class RapidtideDataset:
     ysize = 0.0
     zsize = 0.0
     tr = 0.0
+    space = None
+    affine = None
 
     def __init__(
         self,
@@ -1058,7 +1088,11 @@ class RapidtideDataset:
         return self.regressors
 
     def setfocusregressor(self, whichregressor):
-        self.focusregressor = whichregressor
+        try:
+            testregressor = self.regressors[whichregressor]
+            self.focusregressor = whichregressor
+        except KeyError:
+            self.focusregressor = "prefilt"
 
     def setupoverlays(self):
         # load the overlays
@@ -1287,4 +1321,8 @@ class RapidtideDataset:
         return self.overlays
 
     def setfocusmap(self, whichmap):
-        self.focusmap = whichmap
+        try:
+            testmap = self.overlays[whichmap]
+            self.focusmap = whichmap
+        except KeyError:
+            self.focusmap = "lagtimes"

{rapidtide-3.0a8 → rapidtide-3.0a9}/rapidtide/data/examples/src/testfmri

@@ -23,7 +23,7 @@ rapidtide \
     --nprocs -1 \
     --searchrange -5 20 \
     --simcalcrange 50 -1 \
-    --norefinedelay \
+    --refinedelay \
     sub-RAPIDTIDETEST.nii.gz \
     ../dst/sub-RAPIDTIDETEST_nofilt