rapidtide 3.0.8__py3-none-any.whl → 3.0.10__py3-none-any.whl

rapidtide/OrthoImageItem.py

@@ -33,12 +33,17 @@ except ImportError:
     PILexists = False
 
 try:
-    from PyQt6.QtCore import QT_VERSION_STR
+    from PySide6.QtCore import __version__
 except ImportError:
-    pyqtversion = 5
+    try:
+        from PyQt6.QtCore import QT_VERSION_STR
+    except ImportError:
+        pyqtbinding = "pyqt5"
+    else:
+        pyqtbinding = "pyqt6"
 else:
-    pyqtversion = 6
-print(f"using {pyqtversion=}")
+    pyqtbinding = "pyside6"
+print(f"using {pyqtbinding=}")
 
 
 def newColorbar(left, top, impixpervoxx, impixpervoxy, imgsize):
@@ -520,10 +525,14 @@ class OrthoImageItem(QtWidgets.QWidget):
         if self.verbose > 1:
             print("saving main window")
         mydialog = QtWidgets.QFileDialog()
-        if pyqtversion == 5:
+        if pyqtbinding == "pyqt5":
             options = mydialog.Options()
-        else:
+        elif pyqtbinding == "pyqt6":
+            options = mydialog.options()
+        elif pyqtbinding == "pyside6":
             options = mydialog.options()
+        else:
+            print("unsupported qt binding")
         thedir = str(
             mydialog.getExistingDirectory(options=options, caption="Image output directory")
         )

rapidtide/RapidtideDataset.py

@@ -408,7 +408,7 @@ class Overlay:
 
     def maskData(self):
         self.mask = self.geommask * self.funcmask
-        maskhash = hash(self.mask.tostring())
+        maskhash = hash(self.mask.tobytes())
         # these operations are expensive, so only do them if the mask is changed
         if (maskhash == self.maskhash) and (self.verbose > 1):
             print("mask has not changed")
@@ -600,12 +600,15 @@ class RapidtideDataset:
                 if self.focusregressor is None:
                     self.focusregressor = thisregressor[0]
             else:
-                if self.verbose > 1:
-                    print(
-                        "file: ",
-                        self.fileroot + thisregressor[2],
-                        " does not exist - skipping...",
-                    )
+                if thisregressor[6]:
+                    raise FileNotFoundError(f"regressor file {self.fileroot + thisregressor[2]} does not exist")
+                else:
+                    if self.verbose > 1:
+                        print(
+                            "file: ",
+                            self.fileroot + thisregressor[2],
+                            " does not exist - skipping...",
+                        )
 
     def _loadfuncmaps(self):
         mapstoinvert = ["varChange"]
@@ -1047,6 +1050,7 @@ class RapidtideDataset:
                     self.inputfreq,
                     self.inputfreq,
                     self.inputstarttime,
+                    True,
                 ],
                 [
                     "postfilt",
@@ -1055,6 +1059,7 @@ class RapidtideDataset:
                     self.inputfreq,
                     self.inputfreq,
                     self.inputstarttime,
+                    True,
                 ],
                 [
                     "pass1",
@@ -1063,6 +1068,7 @@ class RapidtideDataset:
                     self.fmrifreq * self.oversampfactor,
                     self.fmrifreq,
                     0.0,
+                    True,
                 ],
                 [
                     "pass2",
@@ -1071,6 +1077,7 @@ class RapidtideDataset:
                     self.fmrifreq * self.oversampfactor,
                     self.fmrifreq,
                     0.0,
+                    False,
                 ],
                 [
                     "pass3",
@@ -1079,6 +1086,7 @@ class RapidtideDataset:
                     self.fmrifreq * self.oversampfactor,
                     self.fmrifreq,
                     0.0,
+                    False,
                 ],
                 [
                     "pass4",
@@ -1087,6 +1095,7 @@ class RapidtideDataset:
                     self.fmrifreq * self.oversampfactor,
                     self.fmrifreq,
                     0.0,
+                    False,
                 ],
             ]
         else:
@@ -1098,6 +1107,7 @@ class RapidtideDataset:
                     self.inputfreq,
                     self.inputfreq,
                     self.inputstarttime,
+                    True,
                 ],
                 [
                     "postfilt",
@@ -1106,6 +1116,7 @@ class RapidtideDataset:
                     self.inputfreq,
                     self.inputfreq,
                     self.inputstarttime,
+                    True,
                 ],
                 [
                     "pass1",
@@ -1114,6 +1125,7 @@ class RapidtideDataset:
                     self.fmrifreq * self.oversampfactor,
                     self.fmrifreq,
                     0.0,
+                    True,
                 ],
                 [
                     "pass2",
@@ -1122,6 +1134,7 @@ class RapidtideDataset:
                     self.fmrifreq * self.oversampfactor,
                     self.fmrifreq,
                     0.0,
+                    False,
                 ],
                 [
                     "pass3",
@@ -1130,6 +1143,7 @@ class RapidtideDataset:
                     self.fmrifreq * self.oversampfactor,
                     self.fmrifreq,
                     0.0,
+                    False,
                 ],
                 [
                     "pass4",
@@ -1138,6 +1152,7 @@ class RapidtideDataset:
                     self.fmrifreq * self.oversampfactor,
                     self.fmrifreq,
                     0.0,
+                    False,
                 ],
             ]
         self._loadregressors()

rapidtide/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-06-26T14:50:59-0400",
+ "date": "2025-08-18T17:30:20-0400",
  "dirty": false,
  "error": null,
- "full-revisionid": "d9a8fd9ab24057e4a74e43dccdc1117e3c6875a2",
- "version": "3.0.8"
+ "full-revisionid": "939d31d88a5839ee746b0f84f4d370248fe5b312",
+ "version": "3.0.10"
 }
 '''  # END VERSION_JSON
 

rapidtide/data/examples/src/testfmri

@@ -1,25 +1,9 @@
 #!/bin/bash
 
-#rapidtide \
-#    --spatialfilt -1 \
-#    --nprocs -1 \
-#    --searchrange -5 20 \
-#    --simcalcrange 50 -1 \
-#    --outputlevel more \
-#    --graymattermask sub-RAPIDTIDETEST_synthseg.nii.gz:SSEG_GRAY \
-#    --brainmask sub-RAPIDTIDETEST_brainmask.nii.gz \
-#    --whitemattermask sub-RAPIDTIDETEST_synthseg.nii.gz:SSEG_WHITE \
-#    --csfmask sub-RAPIDTIDETEST_synthseg.nii.gz:SSEG_CSF \
-#    --cleanrefined \
-#    --nofitfilt \
-#    --similaritymetric correlation \
-#    sub-RAPIDTIDETEST.nii.gz \
-#    ../dst/sub-RAPIDTIDETEST
-
 rapidtide \
-    --spatialfilt 3 \
+    --spatialfilt 2.5 \
     --nprocs -1 \
-    --searchrange -5 20 \
+    --searchrange -7.5 30 \
     --simcalcrange 50 -1 \
     --outputlevel more \
     --graymattermask sub-RAPIDTIDETEST_synthseg.nii.gz:SSEG_GRAY \
@@ -31,6 +15,28 @@ rapidtide \
     --refinedelayeachpass \
     --similaritymetric correlation \
     sub-RAPIDTIDETEST.nii.gz \
-    ../dst/sub-RAPIDTIDETEST_passrefine
+    ../dst/sub-RAPIDTIDETEST_flexipass
 
-tidepool --uistyle big --dataset ../dst/sub-RAPIDTIDETEST_ ../dst/sub-RAPIDTIDETEST_passrefine_
+#rapidtide \
+    #--spatialfilt 2.5 \
+    #--nprocs -1 \
+    #--searchrange -7.5 30 \
+    #--simcalcrange 50 -1 \
+    #--outputlevel more \
+    #--graymattermask sub-RAPIDTIDETEST_synthseg.nii.gz:SSEG_GRAY \
+    #--brainmask sub-RAPIDTIDETEST_brainmask.nii.gz \
+    #--whitemattermask sub-RAPIDTIDETEST_synthseg.nii.gz:SSEG_WHITE \
+    #--csfmask sub-RAPIDTIDETEST_synthseg.nii.gz:SSEG_CSF \
+    #--cleanrefined \
+    #--nofitfilt \
+    #--refinedelayeachpass \
+    #--similaritymetric riptide \
+    #--riptidestep 1.5 \
+    #--ampthresh 0.0 \
+    #--numnull 0 \
+    #sub-RAPIDTIDETEST.nii.gz \
+    #../dst/sub-RAPIDTIDETEST_riptide
+#
+#tidepool --uistyle big --dataset \
+    #../dst/sub-RAPIDTIDETEST_simfunc_ \
+    #../dst/sub-RAPIDTIDETEST_riptide_ &

rapidtide/data/examples/src/testhappy

@@ -73,5 +73,4 @@ happy \
     sub-HAPPYTEST.nii.gz \
     sub-HAPPYTEST.json \
     ../dst/happy_newdefaults \
-    --aliasedcorrelation \
     --nprocs -1