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

rapidtide/workflows/rapidtide.py

@@ -45,8 +45,9 @@ import rapidtide.stats as tide_stats
 import rapidtide.util as tide_util
 import rapidtide.voxelData as tide_voxelData
 import rapidtide.wiener as tide_wiener
+import rapidtide.workflows.calcSimFuncMap as tide_calcSimFuncMap
 import rapidtide.workflows.cleanregressor as tide_cleanregressor
-import rapidtide.workflows.estimateDelayMap as tide_estimateDelayMap
+import rapidtide.workflows.fitSimFuncMap as tide_fitSimFuncMap
 import rapidtide.workflows.refineDelayMap as tide_refineDelayMap
 import rapidtide.workflows.refineRegressor as tide_refineRegressor
 import rapidtide.workflows.regressfrommaps as tide_regressfrommaps
@@ -572,7 +573,7 @@ def rapidtide_main(argparsingfunc):
         savename = f"{outputname}_desc-processed_mask"
         tide_io.savetonifti(corrmask.reshape(xsize, ysize, numslices), theheader, savename)
 
-    LGR.verbose(f"image threshval = {threshval}")
+    LGR.verbose(f"image threshval = {threshval:.2f}")
     validvoxels = np.where(corrmask > 0)[0]
     if optiondict["debug"]:
         print(f"{validvoxels.shape=}")
@@ -967,7 +968,7 @@ def rapidtide_main(argparsingfunc):
     )
     LGR.verbose("Input vector")
     LGR.verbose(f"length: {len(inputvec)}")
-    LGR.verbose(f"input freq: {inputfreq}")
+    LGR.verbose(f"input freq: {inputfreq:.2f}")
     LGR.verbose(f"input start time: {inputstarttime:.3f}")
 
     if not optiondict["useinitregressorref"]:
@@ -1345,6 +1346,29 @@ def rapidtide_main(argparsingfunc):
             append=False,
         )
 
+    # prepare for fast resampling
+    optiondict["fastresamplerpadtime"] = (
+        max((-optiondict["lagmin"], optiondict["lagmax"]))
+        + 30.0
+        + np.abs(optiondict["offsettime"])
+    )
+    numpadtrs = int(optiondict["fastresamplerpadtime"] // fmritr)
+    optiondict["fastresamplerpadtime"] = fmritr * numpadtrs
+    LGR.info(f"setting up fast resampling with padtime = {optiondict['fastresamplerpadtime']}")
+
+    genlagtc = tide_resample.FastResampler(
+        reference_x, reference_y, padtime=optiondict["fastresamplerpadtime"]
+    )
+    genlagtc.save(f"{outputname}_desc-lagtcgenerator_timeseries")
+    if optiondict["debug"]:
+        genlagtc.info()
+    totalpadlen = validtimepoints + 2 * numpadtrs
+    paddedinitial_fmri_x = (
+        np.linspace(0.0, totalpadlen * fmritr, num=totalpadlen, endpoint=False)
+        + skiptime
+        - fmritr * numpadtrs
+    )
+
     # allocate all the data arrays
     tide_util.logmem("before main array allocation")
     internalspaceshape = numspatiallocs
@@ -1359,7 +1383,30 @@ def rapidtide_main(argparsingfunc):
     outmaparray = np.zeros(internalspaceshape, dtype=rt_floattype)
     tide_util.logmem("after main array allocation")
 
-    corroutlen = np.shape(trimmedcorrscale)[0]
+    if optiondict["similaritymetric"] == "riptide":
+        riptideregressorset, riptidedelays = tide_calcSimFuncMap.makeRIPTiDeRegressors(
+            initial_fmri_x,
+            optiondict["lagmin"],
+            optiondict["lagmax"],
+            genlagtc,
+            LGR,
+            targetstep=optiondict["riptidestep"],
+            edgepad=0,
+            showprogressbar=optiondict["showprogressbar"],
+            chunksize=optiondict["mp_chunksize"],
+            nprocs=optiondict["nprocs"],
+            alwaysmultiproc=optiondict["alwaysmultiproc"],
+            rt_floatset=rt_floatset,
+            rt_floattype=rt_floattype,
+            debug=optiondict["debug"],
+        )
+        numriptideregressors = riptideregressorset.shape[0]
+        corroutlen = numriptideregressors
+    else:
+        riptideregressorset = None
+        riptidedelays = None
+        corroutlen = np.shape(trimmedcorrscale)[0]
+
     if theinputdata.filetype == "text":
         nativecorrshape = (xsize, corroutlen)
     else:
@@ -1372,6 +1419,7 @@ def rapidtide_main(argparsingfunc):
     LGR.debug(
         f"allocating memory for correlation arrays {internalcorrshape} {internalvalidcorrshape}"
     )
+
     corrout, corrout_shm = tide_util.allocarray(
         internalvalidcorrshape,
         rt_floatset,
@@ -1427,29 +1475,6 @@ def rapidtide_main(argparsingfunc):
     else:
         theinitialdelay = None
 
-    # prepare for fast resampling
-    optiondict["fastresamplerpadtime"] = (
-        max((-optiondict["lagmin"], optiondict["lagmax"]))
-        + 30.0
-        + np.abs(optiondict["offsettime"])
-    )
-    numpadtrs = int(optiondict["fastresamplerpadtime"] // fmritr)
-    optiondict["fastresamplerpadtime"] = fmritr * numpadtrs
-    LGR.info(f"setting up fast resampling with padtime = {optiondict['fastresamplerpadtime']}")
-
-    genlagtc = tide_resample.FastResampler(
-        reference_x, reference_y, padtime=optiondict["fastresamplerpadtime"]
-    )
-    genlagtc.save(f"{outputname}_desc-lagtcgenerator_timeseries")
-    if optiondict["debug"]:
-        genlagtc.info()
-    totalpadlen = validtimepoints + 2 * numpadtrs
-    paddedinitial_fmri_x = (
-        np.linspace(0.0, totalpadlen * fmritr, num=totalpadlen, endpoint=False)
-        + skiptime
-        - fmritr * numpadtrs
-    )
-
     if theinputdata.filetype == "text":
         nativefmrishape = (xsize, np.shape(initial_fmri_x)[0])
     elif theinputdata.filetype == "cifti":
@@ -1465,7 +1490,7 @@ def rapidtide_main(argparsingfunc):
     )
 
     # now do the arrays for delay refinement
-    if optiondict["dolinfitfilt"] or optiondict["docvrmap"] or optiondict["refinedelay"]:
+    if optiondict["dolinfitfilt"] or optiondict["docvrmap"] or optiondict["refinedelay"] or (optiondict["similaritymetric"] == "riptide"):
         if optiondict["refinedelay"]:
             derivaxissize = np.max([2, optiondict["regressderivs"] + 1])
         else:
@@ -1526,6 +1551,13 @@ def rapidtide_main(argparsingfunc):
         thesize, theunit = tide_util.format_bytes(optiondict["totalRefineDelaybytes"])
         print(f"allocated {thesize:.3f} {theunit} {ramlocation} for delay refinement")
         tide_util.logmem("after derivative delay/sLFO filter array allocation")
+    else:
+        sLFOfitmean = None
+        rvalue = None
+        r2value = None
+        fitNorm = None
+        fitcoeff = None
+        lagtc = None
 
     # prepare for regressor refinement, if we're doing it
     if (
@@ -1903,8 +1935,9 @@ def rapidtide_main(argparsingfunc):
         optiondict["currentstage"] = f"precorrelation_pass{thepass}"
         tide_io.writedicttojson(optiondict, f"{outputname}_desc-runoptions_info.json")
 
-        # step 1 - do the initial delay estimation
-        internaldespeckleincludemask = tide_estimateDelayMap.estimateDelay(
+        # Step 1a - do the initial delay estimation
+        similaritytype = tide_calcSimFuncMap.calcSimFunc(
+            numvalidspatiallocs,
             fmri_data_valid,
             validsimcalcstart,
             validsimcalcend,
@@ -1916,12 +1949,83 @@ def rapidtide_main(argparsingfunc):
             theMutualInformationator,
             cleaned_referencetc,
             corrout,
+            riptideregressorset,
+            riptidedelays,
+            sLFOfitmean,
+            r2value,
+            fitcoeff,
+            fitNorm,
             meanval,
             corrscale,
             outputname,
             outcorrarray,
             validvoxels,
             nativecorrshape,
+            theinputdata,
+            theheader,
+            lagmininpts,
+            lagmaxinpts,
+            thepass,
+            optiondict,
+            LGR,
+            TimingLGR,
+            similaritymetric=optiondict["similaritymetric"],
+            simcalcoffset=optiondict["simcalcoffset"],
+            echocancel=optiondict["echocancel"],
+            checkpoint=optiondict["checkpoint"],
+            mklthreads=optiondict["mklthreads"],
+            nprocs=optiondict["nprocs_calcsimilarity"],
+            alwaysmultiproc=optiondict["alwaysmultiproc"],
+            oversampfactor=optiondict["oversampfactor"],
+            interptype=optiondict["interptype"],
+            showprogressbar=optiondict["showprogressbar"],
+            chunksize=optiondict["mp_chunksize"],
+            rt_floatset=rt_floatset,
+            rt_floattype=rt_floattype,
+            threaddebug=optiondict["threaddebug"],
+            debug=optiondict["focaldebug"],
+        )
+        if optiondict["similaritymetric"] == "riptide":
+            optiondict["despeckle_passes"] = 0
+            fitcorrscale = riptidedelays
+        else:
+            fitcorrscale = trimmedcorrscale
+
+        if optiondict["saveintermediatemaps"]:
+            theheader = theinputdata.copyheader(numtimepoints=1)
+            bidspasssuffix = f"_intermediatedata-pass{thepass}"
+            maplist = [
+                (lagtimes, "maxtimecoarse", "map", "second", "Lag time in seconds"),
+                (lagstrengths, "maxcorrcoarse", "map", None, "Maximum correlation strength"),
+            ]
+            tide_io.savemaplist(
+                f"{outputname}{bidspasssuffix}",
+                maplist,
+                validvoxels,
+                nativespaceshape,
+                theheader,
+                bidsbasedict,
+                filetype=theinputdata.filetype,
+                rt_floattype=rt_floattype,
+                cifti_hdr=theinputdata.cifti_hdr,
+            )
+
+
+
+        # Step 2a - fit the delay function
+        internaldespeckleincludemask = tide_fitSimFuncMap.fitSimFunc(
+            fmri_data_valid,
+            validsimcalcstart,
+            validsimcalcend,
+            osvalidsimcalcstart,
+            osvalidsimcalcend,
+            initial_fmri_x,
+            os_fmri_x,
+            theMutualInformationator,
+            cleaned_referencetc,
+            corrout,
+            outputname,
+            validvoxels,
             nativespaceshape,
             bidsbasedict,
             numspatiallocs,
@@ -1941,17 +2045,18 @@ def rapidtide_main(argparsingfunc):
             lagsigma,
             failreason,
             outmaparray,
-            lagmininpts,
-            lagmaxinpts,
+            fitcorrscale,
+            similaritytype,
             thepass,
             optiondict,
             LGR,
             TimingLGR,
+            simplefit=(optiondict["similaritymetric"] == "riptide"),
             rt_floatset=np.float64,
             rt_floattype="float64",
         )
 
-        # refine delay
+        # Step 2b - refine delay (optional)
         if optiondict["refinedelayeachpass"]:
             if optiondict["delayoffsetgausssigma"] < 0.0 and theinputdata.filetype != "text":
                 # set gausssigma automatically
@@ -2006,7 +2111,26 @@ def rapidtide_main(argparsingfunc):
             )
             lagtimes[:] = lagtimes + delayoffset
 
-        # Step 2d - make a rank order map
+            if optiondict["saveintermediatemaps"]:
+                theheader = theinputdata.copyheader(numtimepoints=1)
+                bidspasssuffix = f"_intermediatedata-pass{thepass}"
+                maplist = [
+                    (lagtimes, "maxtimerefined", "map", "second", "Lag time in seconds"),
+                    (lagstrengths, "maxcorrrefined", "map", None, "Maximum correlation strength"),
+                ]
+                tide_io.savemaplist(
+                    f"{outputname}{bidspasssuffix}",
+                    maplist,
+                    validvoxels,
+                    nativespaceshape,
+                    theheader,
+                    bidsbasedict,
+                    filetype=theinputdata.filetype,
+                    rt_floattype=rt_floattype,
+                    cifti_hdr=theinputdata.cifti_hdr,
+                )
+
+        # Step 2b - make a rank order map
         timepercentile = (
             100.0 * (rankdata(lagtimes, method="dense") - 1) / (numvalidspatiallocs - 1)
         )
@@ -2499,7 +2623,7 @@ def rapidtide_main(argparsingfunc):
                     nprocs_makelaggedtcs=optiondict["nprocs_makelaggedtcs"],
                     nprocs_regressionfilt=optiondict["nprocs_regressionfilt"],
                     regressderivs=optiondict["regressderivs"],
-                    mp_chunksize=optiondict["mp_chunksize"],
+                    chunksize=optiondict["mp_chunksize"],
                     showprogressbar=optiondict["showprogressbar"],
                     alwaysmultiproc=optiondict["alwaysmultiproc"],
                     debug=optiondict["debug"],
@@ -2987,7 +3111,7 @@ def rapidtide_main(argparsingfunc):
                 nprocs_makelaggedtcs=optiondict["nprocs_makelaggedtcs"],
                 nprocs_regressionfilt=optiondict["nprocs_regressionfilt"],
                 regressderivs=optiondict["regressderivs"],
-                mp_chunksize=optiondict["mp_chunksize"],
+                chunksize=optiondict["mp_chunksize"],
                 showprogressbar=optiondict["showprogressbar"],
                 alwaysmultiproc=optiondict["alwaysmultiproc"],
                 debug=optiondict["debug"],
@@ -3147,11 +3271,19 @@ def rapidtide_main(argparsingfunc):
     del fitmask
 
     # now do the 4D maps of the similarity function and friends
-    theheader = theinputdata.copyheader(
-        numtimepoints=np.shape(outcorrarray)[1],
-        tr=corrtr,
-        toffset=(corrscale[corrorigin - lagmininpts]),
-    )
+    if optiondict["similaritymetric"] == "riptide":
+        theheader = theinputdata.copyheader(
+            numtimepoints=np.shape(outcorrarray)[1],
+            tr=riptidedelays[1] - riptidedelays[0],
+            toffset=(riptidedelays[0]),
+        )
+    else:
+        theheader = theinputdata.copyheader(
+            numtimepoints=np.shape(outcorrarray)[1],
+            tr=corrtr,
+            toffset=(corrscale[corrorigin - lagmininpts]),
+        )
+
     if (
         optiondict["savecorrout"]
         or (optiondict["outputlevel"] != "min")

rapidtide/workflows/rapidtide_parser.py

@@ -96,6 +96,9 @@ DEFAULT_OUTPUTLEVEL = "normal"
 
 DEFAULT_SLFONOISEAMP_WINDOWSIZE = 40.0
 
+DEFAULT_COARSEDELAY_TYPE = "simfunc"
+DEFAULT_RIPTIDESTEP = 2.0
+
 DEFAULT_PATCHTHRESH = 3.0
 DEFAULT_REFINEDELAYMINDELAY = -5.0
 DEFAULT_REFINEDELAYMAXDELAY = 5.0
@@ -779,10 +782,10 @@ def _get_parser():
         dest="similaritymetric",
         action="store",
         type=str,
-        choices=["correlation", "mutualinfo", "hybrid"],
+        choices=["correlation", "mutualinfo", "hybrid", "riptide"],
         help=(
             "Similarity metric for finding delay values.  "
-            'Choices are "correlation", "mutualinfo", and "hybrid". '
+            'Choices are "correlation", "mutualinfo", "hybrid", and "riptide". '
             f"Default is {DEFAULT_SIMILARITYMETRIC}."
         ),
         default=DEFAULT_SIMILARITYMETRIC,
@@ -1442,6 +1445,17 @@ def _get_parser():
     experimental = parser.add_argument_group(
         "Experimental options (not fully tested, or not tested at all, may not work).  Beware!"
     )
+    output.add_argument(
+        "--riptidestep",  # was -h
+        dest="riptidestep",
+        action="store",
+        type=lambda x: pf.is_float(parser, x, maxval=5.0),
+        metavar="STEP",
+        help=(
+            f"Timestep between RIPTiDe regressors, in seconds.  Default is {DEFAULT_RIPTIDESTEP}."
+        ),
+        default=DEFAULT_RIPTIDESTEP,
+    )
     experimental.add_argument(
         "--refinedelayeachpass",
         dest="refinedelayeachpass",
@@ -2206,6 +2220,13 @@ def process_args(inputargs=None):
         print(f"illegal output level {args['outputlevel']}")
         sys.exit()
 
+    # make the pass options dictionary
+    args["passoptions"] = [
+        {"similaritymetric": "riptide",},
+        {"similaritymetric": "correlation", },
+        {"similaritymetric": "correlation", },
+    ]
+
     # dispersion calculation
     args["dispersioncalc_lower"] = args["lagmin"]
     args["dispersioncalc_upper"] = args["lagmax"]

rapidtide/workflows/regressfrommaps.py

@@ -49,11 +49,11 @@ def regressfrommaps(
     nprocs_makelaggedtcs=1,
     nprocs_regressionfilt=1,
     regressderivs=0,
-    mp_chunksize=50000,
+    chunksize=50000,
     showprogressbar=True,
     alwaysmultiproc=False,
     saveEVsandquit=False,
-    ratiosonly=False,
+    coefficientsonly=False,
     debug=False,
 ):
     if debug:
@@ -61,7 +61,7 @@ def regressfrommaps(
         print(f"\t{nprocs_makelaggedtcs=}")
         print(f"\t{nprocs_regressionfilt=}")
         print(f"\t{regressderivs=}")
-        print(f"\t{mp_chunksize=}")
+        print(f"\t{chunksize=}")
         print(f"\t{showprogressbar=}")
         print(f"\t{alwaysmultiproc=}")
         print(f"\t{mode=}")
@@ -88,7 +88,7 @@ def regressfrommaps(
         nprocs=nprocs_makelaggedtcs,
         alwaysmultiproc=alwaysmultiproc,
         showprogressbar=showprogressbar,
-        chunksize=mp_chunksize,
+        chunksize=chunksize,
         rt_floatset=rt_floatset,
         rt_floattype=rt_floattype,
         debug=debug,
@@ -146,12 +146,12 @@ def regressfrommaps(
         fitNorm,
         movingsignal,
         filtereddata,
-        ratiosonly=ratiosonly,
+        coefficientsonly=coefficientsonly,
         nprocs=nprocs_regressionfilt,
         alwaysmultiproc=alwaysmultiproc,
         showprogressbar=showprogressbar,
         verbose=(LGR is not None),
-        mp_chunksize=mp_chunksize,
+        chunksize=chunksize,
         rt_floatset=rt_floatset,
         rt_floattype=rt_floattype,
         debug=debug,
@@ -162,7 +162,7 @@ def regressfrommaps(
         fitcoeff *= 100.0
 
     # determine what was removed
-    if not ratiosonly:
+    if not coefficientsonly:
         removeddata = fmri_data_valid - filtereddata
         noiseremoved = np.var(removeddata, axis=0)
         if saveminimumsLFOfiltfiles:

{rapidtide-3.0.8.dist-info → rapidtide-3.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rapidtide
-Version: 3.0.8
+Version: 3.0.9
 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.0.8.dist-info → rapidtide-3.0.9.dist-info}/RECORD

@@ -8,9 +8,9 @@ cloud/rapidtide-cloud-test,sha256=SATOwGo4QYLvt-6hE0e3wyK9JjuDU5XzfLrfMoybvcY,46
 cloud/simple-cp-test,sha256=5ef8wmLfcKdny59BV6_DnAPj7O_mi0rOHdFZVN2iiLA,421
 rapidtide/Colortables.py,sha256=OVtgnQ9xTJPgfdyK1ktESHRjBh09cxLVPZvgUvV5jOo,5814
 rapidtide/OrthoImageItem.py,sha256=w70QNZUelMI7wTWYaqOfkJEb38PdsxgSf0NLdyjlcNs,21669
-rapidtide/RapidtideDataset.py,sha256=mHK6dL1cFSSM5jYw6rkzb57lWVVz-TGX-xMeV8IqF-M,53013
+rapidtide/RapidtideDataset.py,sha256=OEeyDrluWw5ssd0FFXRscox3UotSPcmMVJxBIo0WtMA,53012
 rapidtide/__init__.py,sha256=cECnPfGNIWXETiummGLjKcNXLROSDiFlLp-RpZSavwc,97
-rapidtide/_version.py,sha256=DwRiQfeqcIFk6UI5E8TQ83lfB5cJqui_KryFj1ZUMks,497
+rapidtide/_version.py,sha256=H9j41yg9NrpwHmnes6ZY5RkH2z5gmYe3FGbumsv2BcM,497
 rapidtide/calccoherence.py,sha256=-_vglu0MZB85Aodw6GpYhBApFBt5eslppfxF4rXM6Xg,3409
 rapidtide/calcnullsimfunc.py,sha256=j5mPfaRCpJvu8R-kHFzn6vrIQVhCdPPDTSYXslaZU_c,5030
 rapidtide/calcsimfunc.py,sha256=xCPYns-XOnLWjwujbP7a7EwGEzhEwOHMf04RpFlL3SI,4713
@@ -24,7 +24,7 @@ rapidtide/genericmultiproc.py,sha256=ZQwN84HpC7ZA_w4qekBqA4suU_70ryqGjAsTAIa4oSw
 rapidtide/happy_supportfuncs.py,sha256=GiUwfjf0ZIYEvN2Fvauhtv58hdiAuQytwx11ZPX8Uvo,56261
 rapidtide/helper_classes.py,sha256=14q92myZQPl_AUTjh5l1dm6y5-3JkW0xCAEKpgyiuXY,10534
 rapidtide/io.py,sha256=A3qFJdFFf1XSVlqPvoOF733OoxrRcbRO-gSEoh_95bE,75037
-rapidtide/linfitfiltpass.py,sha256=IijkP7gKqdWRJmE6Tc1hDpHhSIGdGAgGXKf79ur2uJo,18869
+rapidtide/linfitfiltpass.py,sha256=FqqUFE44lSEHdqcMmqiAtgye29AebmJyk7nhVzjPF7Q,19801
 rapidtide/makelaggedtcs.py,sha256=WG-gwYVX-pZPIwVBJR2_YfpSOCsBcLGLXGvDIz5cA68,3066
 rapidtide/maskutil.py,sha256=IBEgxmHvQ2fnBoTeFu7vw_w3uf91NxpW3IgTDirhWH0,10890
 rapidtide/miscmath.py,sha256=bEmqnBl6xL2ZRXbId7onXqiEayZJW-jWVCEIp0bfw3o,13918
@@ -32,9 +32,9 @@ rapidtide/multiproc.py,sha256=K5IO0mr-T4rZbL4j7Zp7vFTv-6icavh-dgITZmzP8Ds,5817
 rapidtide/patchmatch.py,sha256=VxXine2b_fI0oMJWuhXUzfHhZH_-BdqyvW2Ft2n-Vu0,20643
 rapidtide/peakeval.py,sha256=ZDcuAT4Bw9bTU1oJTvOn9t_rWEZOsXHC5PiNnDdFlX0,5198
 rapidtide/qualitycheck.py,sha256=exTRCQDf9OsNbmlemr-5YPjDGDg3uSTyc8amidXUZqU,11917
-rapidtide/refinedelay.py,sha256=uiwYR6ZaAX_P-FeIzD5NfM_wEssDMdF431cEFl6kLMk,16109
-rapidtide/refineregressor.py,sha256=w9RP2SDjC769FmUq_CQ5ZUtr5-7kfzhvlzlBvKs8cXg,21831
-rapidtide/resample.py,sha256=UYK3QCgNltOdgXKMEbqsFVjQEVD-Ar1lodLvdUQH4_o,30751
+rapidtide/refinedelay.py,sha256=FB9eA_ZUowubUKlPIBd3srTqY2bMt5jCfEqQBTjwes0,16112
+rapidtide/refineregressor.py,sha256=q3E1Sfi1Qs6H-zWDcVpDkLUA7xKWX3HhYgZO3_s_RwA,21835
+rapidtide/resample.py,sha256=mu4Hn4c_O4s_-kAXoA-nd77IG5BhOlJmRI8AL2vjLtc,30753
 rapidtide/simFuncClasses.py,sha256=j--6SWOmMdSv0ZqnxBax9ESTWRXGZrVe63q-gNQEkRg,42057
 rapidtide/simfuncfit.py,sha256=5EUytvZymIPTsv_008qkjJcySxy9QfgfP3HT3ozdW_s,11973
 rapidtide/stats.py,sha256=jYne4e-Gj0ktNx2SYoGsq5hXekknLAhXz7Gp8SIMifQ,29335
@@ -65,7 +65,7 @@ rapidtide/data/examples/src/testdecomp,sha256=xxxr510aOBjtpJy4aQNAFTyEFZD6QdHp6-
 rapidtide/data/examples/src/testdelayvar,sha256=tMn1k8IfvBL7MKhgGC6EGcSkChtXWKp1bENOGG4SagI,330
 rapidtide/data/examples/src/testfileorfloat,sha256=9r4mz7pBV_8iFZya9kmtfbnTRS3-94Cx9Q63Ni3mkZs,815
 rapidtide/data/examples/src/testfingerprint,sha256=RlAIC1lMDWMGzZKxY24DJRuaUEL0BenSFBey0gL5dqU,402
-rapidtide/data/examples/src/testfmri,sha256=XaYFKdIfz91T60p4Qd_NdS-VBT2lIEAFfM89swjiFmg,1194
+rapidtide/data/examples/src/testfmri,sha256=2M_hZZDMIazipzS0P42FNmaZHVM-RFgWmIWYWZZ2ras,1298
 rapidtide/data/examples/src/testfmridocker,sha256=jjL7bK29rrcog6uO9BtvcyAU3Sv8_5cbw2nqKoiZ95o,1193
 rapidtide/data/examples/src/testfrozen,sha256=K3qUWDRKPPiCXRgIFuPdwUUjUTzf4QBW8UUhR75NzDM,283
 rapidtide/data/examples/src/testfuncs,sha256=zjq9u7mXMf0UlbUgePyS1mj7QHclicmw6NY0g31SqeY,1551
@@ -223,7 +223,7 @@ rapidtide/tests/test_cleanregressor.py,sha256=XX1DlO5lAXRsnFUkXGCga8Ry9icjPIAfjv
 rapidtide/tests/test_congrid.py,sha256=Ni-PeB-oaBgoqyZ2XLhDB3yvAKWTeY-0kyAb6HjvUQ0,5610
 rapidtide/tests/test_correlate.py,sha256=SKqLbj0MDQ7wZ1N70j6x07_i-Jok9ySPdJMt8lJ7qq0,2547
 rapidtide/tests/test_corrpass.py,sha256=v01jkJ9zCDGQspY4RMiObpQG8k0K84CWvlfFNMnlKiY,7857
-rapidtide/tests/test_delayestimation.py,sha256=aa1VAJ5HTRfGJJEyllmOJX1g9eX4AbZViEtWX8hHbic,13622
+rapidtide/tests/test_delayestimation.py,sha256=ebXKRwo30rtjYLLXNvWBzhZxp_bWMepz2hnI-taAyr4,13619
 rapidtide/tests/test_doresample.py,sha256=9vwiMo8WutmOKW5LfeMRLG3FAzZNa_1sra-k-36Fn-w,2716
 rapidtide/tests/test_externaltools.py,sha256=oaD9KQ1Db9fhev9g9OfUecoZLKeGHnmQV4-OGrk3rko,2121
 rapidtide/tests/test_fastresampler.py,sha256=x9jimD1aGYA48egjAUbjcCcxA7eXsAf2VPP3KbhBkvw,3884
@@ -241,6 +241,7 @@ rapidtide/tests/test_fullrunrapidtide_v4.py,sha256=DTEom1FPHn21WZZveiCCf4L_NabR9
 rapidtide/tests/test_fullrunrapidtide_v5.py,sha256=NzTYGXaWsJzd7uIIgom_NPwl3EmGCRxlylaUEVN3gxU,1779
 rapidtide/tests/test_fullrunrapidtide_v6.py,sha256=qjxniiLjkA8sFK3_spNpF13PsN_6ONTB8VtcSYAZ_a0,4368
 rapidtide/tests/test_fullrunrapidtide_v7.py,sha256=MKZ1Xi2pl04eb-cdxe6BeWkKqFWFTXAPZu3L_s7QNJk,4250
+rapidtide/tests/test_fullrunrapidtide_v8.py,sha256=usfykAA3QuUj8bghF9g2Vq567qCSY3IMStYz3-thwz0,1963
 rapidtide/tests/test_getparsers.py,sha256=o_YvDHjbGQspZycHSM5ZhlXQsjzdsCN6llCBxQ2Exo4,6870
 rapidtide/tests/test_io.py,sha256=E99Bmfo3qbeQZEn4btq2bPisKyvUPx6PMPXTvKOasYA,17065
 rapidtide/tests/test_linfitfiltpass.py,sha256=Q_XbDujj4tGc3X_I37IJJBDsvAs0m-S_oU8WG7DcGKU,5554
@@ -291,19 +292,20 @@ rapidtide/workflows/aligntcs.py,sha256=43hg6F2Qy7ZFv7qIur4fnfcZRsnAAdosw3zYCKgOi
 rapidtide/workflows/applydlfilter.py,sha256=9dkVYitWSupZWWA1xNtLMf4-BgIwOjYLqDpOj9uV8hY,5430
 rapidtide/workflows/atlasaverage.py,sha256=6j5cNWk613R98LFmBAfVDJh6TuTo8Uxa-VW7nn0uNOA,17478
 rapidtide/workflows/atlastool.py,sha256=6aMMtr6knETNTyW-laThMeiO8mcdd71F8MSsdYHMeIM,16076
+rapidtide/workflows/calcSimFuncMap.py,sha256=Tqc0Ac-iQ8dXs3WwRgAs_Aar_54ez9LTZFLp_lz6R0k,8469
 rapidtide/workflows/calctexticc.py,sha256=9nGGAiqiD2MPg7UiIGR2V7rdtx-jcXQ_Q7uTXCziraQ,10486
 rapidtide/workflows/ccorrica.py,sha256=ZGuBoM4u860Q7WxbNp-yxTxBaHLNozL7Kbx3o3rvaFk,10457
 rapidtide/workflows/cleanregressor.py,sha256=vK3Ev5ft_O_zcPzqSSJCBqn9ZOB3xxYp2fYIeRq2EAo,10307
-rapidtide/workflows/delayvar.py,sha256=p2KNC9bnfbtieC4MHBGUZvfGIiWAAJx777CKDNRRAo4,39540
+rapidtide/workflows/delayvar.py,sha256=3HPEz1xd1evvEEVVY1jDAb2xoxAqEOTb-0RyN3krRQ8,39544
 rapidtide/workflows/diffrois.py,sha256=imyKnnO8wnKbVoqsYEpYfJl0oBLllG9_pbV-0D1IdIw,5451
 rapidtide/workflows/endtidalproc.py,sha256=wsuunEjyd4Hy_ExCabCcmsWjJ3jEhaWYdPr_COD4TfU,4923
-rapidtide/workflows/estimateDelayMap.py,sha256=8RMSc70I2PFMGa5e34T9Ougo7V2-fuQXXiLuMo81YIQ,19423
 rapidtide/workflows/fdica.py,sha256=Vqf-Yhdz6_YByN-4CLMuVwi5ts_Nw1ejBs5LAblHUeY,14954
 rapidtide/workflows/filtnifti.py,sha256=LXQw8yY7xbVCYAWNO5wsJOYHkxOH5I4x_oRaaXsPt1E,3242
 rapidtide/workflows/filttc.py,sha256=QHMJ41ZORxB8fG4IcvxKUgSfmOL4X9cFQFpM5px1Uxw,4514
+rapidtide/workflows/fitSimFuncMap.py,sha256=SwyOs8QJHEB8QK6GwKLrGvhg9Cc0wpqYgGt9L1mXB00,16711
 rapidtide/workflows/fixtr.py,sha256=KYr3veeHDUjozH3IO-0iPhLqNDGEc2NcUvzn6tuxeN8,2025
 rapidtide/workflows/gmscalc.py,sha256=Z-3HV2EU-HuIhpr7s5u4EAPAaW0gXtj2aVZt7386Gr8,6258
-rapidtide/workflows/happy.py,sha256=8iDUnN3j2VoRIdA9G51xvfnT41k76HPuisv25QMxHz0,77220
+rapidtide/workflows/happy.py,sha256=yy5WxWOjSzjLFySVsPBUNbec_GpIIsChwg_TwYuZ7O4,77217
 rapidtide/workflows/happy2std.py,sha256=6gya9YjfPzPMu15jsMUbu7pLq430-n3b3meiTWhRkAo,8132
 rapidtide/workflows/happy_parser.py,sha256=OQTcUIvB61p0niNpG__9auUINb962PKmp0wz6qj_uN8,27354
 rapidtide/workflows/histnifti.py,sha256=BeABj0osc0mEnmyKonN0Hgeis8L8soO-w-cVaeMKLUI,11197
@@ -322,12 +324,12 @@ rapidtide/workflows/plethquality.py,sha256=kTO74C5aSBmomzt59zs1VeiO_C5SPTxvyZZ0v
 rapidtide/workflows/polyfitim.py,sha256=bVKBrrFa0WjWZju4Lkrr8_9mFWALqCxkpCX28540GQA,10184
 rapidtide/workflows/proj2flow.py,sha256=SbkYTRZ_SViVfiM0QJjo20RrICtbsQpEd2i9o9XDgPU,7290
 rapidtide/workflows/rankimage.py,sha256=9opJb3OikO69wtN8zgF3XJxgoHy1-erzZiDKs8pDM6U,3482
-rapidtide/workflows/rapidtide.py,sha256=oxm3AV93ZZwEA47s2apY-MxAexfHsmF-3X4y4jnVINc,128189
+rapidtide/workflows/rapidtide.py,sha256=0ES86ZP8iJlq7bhvrJHzg1BqC_9Jhr33oIxDIZ5TLJw,133102
 rapidtide/workflows/rapidtide2std.py,sha256=coxEnRAof6NNpeXjjECPazx5Wotf4l1SJCnaVEvmHQY,10483
-rapidtide/workflows/rapidtide_parser.py,sha256=snfFkNiM1kO76Jnoij1x9ZIbA-09mwrkEum_-kONvno,77281
+rapidtide/workflows/rapidtide_parser.py,sha256=PW6KMi4Qz9dX1KhfAyhJJwRAExQerUBhPDkkHYSZdek,77940
 rapidtide/workflows/refineDelayMap.py,sha256=a7oqD0OXRKA4FnMLe9kzhRva9GlQ_YpVjHissU4FbbM,3556
 rapidtide/workflows/refineRegressor.py,sha256=b3jZAPow7A0liAGycAk_7xEwJo2HEYqYsG2qsMnVHZs,23443
-rapidtide/workflows/regressfrommaps.py,sha256=fSNpWesx14B-bpz1Bbrq5HMoyXSPZtbK4l1lH4RcQM4,5576
+rapidtide/workflows/regressfrommaps.py,sha256=E4X5Y3jURLGgXJptw8ZxfZhs8mnVDohb7rAjd_PepT0,5585
 rapidtide/workflows/resamplenifti.py,sha256=GJE7f8bzMRY3QYiMYZOD8bDnga4ah97sp-ZL3yaaIFA,4717
 rapidtide/workflows/resampletc.py,sha256=B4YIKn3qpDaM9dIhYjGwPl-2LtaEhm9fnMBzfBgAUSs,3959
 rapidtide/workflows/retrolagtcs.py,sha256=_xZpx9UFH6yHYvaP8PC_FdJVxdq1Z7r0ngwQTOm1Xqg,10821
@@ -350,9 +352,9 @@ rapidtide/workflows/tcfrom3col.py,sha256=kV3V-qZ7A7LkD96aHVXabvohA8udsflHXnzsQIw
 rapidtide/workflows/tidepool.py,sha256=zua2N_dfXqBQlGgcsyKZXphv1JvqUMjk-eNtwGG1K6Y,86626
 rapidtide/workflows/utils.py,sha256=urIN-042oUCRDusVUSjBelVN3Te2JP3svY3ckq-yBMU,5379
 rapidtide/workflows/variabilityizer.py,sha256=h7Hhrxn84MclRfbAvKIZJoNzlcKO-8d9lZ6y6YFStk8,3167
-rapidtide-3.0.8.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-rapidtide-3.0.8.dist-info/METADATA,sha256=jFn3PzxvUGDE9MVOW4TelMSep_A4NE5Bpu4E0fiBXKM,15696
-rapidtide-3.0.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rapidtide-3.0.8.dist-info/entry_points.txt,sha256=9NVvZpIx9U6lTWlTFF2ev-wuPAHJxcXI_901_EcGRYA,3323
-rapidtide-3.0.8.dist-info/top_level.txt,sha256=MnNXGfbrIBc9RnAqzBHOWd3GQO-aIUDnRTz4_5VjH5g,16
-rapidtide-3.0.8.dist-info/RECORD,,
+rapidtide-3.0.9.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+rapidtide-3.0.9.dist-info/METADATA,sha256=etKUpRUrmf4IIHCSYKGMzIRdqIuAj68Zh2-DGBKYOzE,15696
+rapidtide-3.0.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rapidtide-3.0.9.dist-info/entry_points.txt,sha256=9NVvZpIx9U6lTWlTFF2ev-wuPAHJxcXI_901_EcGRYA,3323
+rapidtide-3.0.9.dist-info/top_level.txt,sha256=MnNXGfbrIBc9RnAqzBHOWd3GQO-aIUDnRTz4_5VjH5g,16
+rapidtide-3.0.9.dist-info/RECORD,,