rapidtide 2.9.6__py3-none-any.whl → 3.1.3__py3-none-any.whl

rapidtide/data/examples/src/testLD

@@ -0,0 +1,56 @@
+#!/usr/bin/env python
+
+import matplotlib.pyplot as plt
+import numpy as np
+import statsmodels.api as sma
+import statsmodels.tsa.stattools as smts
+from scipy import signal
+from statsmodels.tsa.ar_model import AutoReg
+
+import rapidtide.io as tide_io
+
+debug = True
+insamplerate, instarttime, incolumns, indata, incompressed, incolsource, inextrainfo = tide_io.readbidstsv(
+            "../dst/sub-RAPIDTIDETEST_desc-oversampledmovingregressor_timeseries.json",
+            neednotexist=False,
+            debug=debug,
+        )
+print(f"{indata.shape=}")
+nlags = 15
+
+p = 2
+d = 0
+q = 0
+
+for i in range(indata.shape[0]):
+    sigma_v, arcoefs, pacf, sigma, phi = smts.levinson_durbin(indata[i, :], nlags=nlags, isacov=False)
+
+    print(f"{sigma_v=}")
+    print(f"{arcoefs=}")
+    print(f"{pacf=}")
+    print(f"{sigma=}")
+    print(f"{phi=}")
+
+    plt.plot(arcoefs)
+    plt.show()
+
+    plt.plot(pacf)
+    plt.show()
+
+    plt.plot(sigma)
+    plt.show()
+ 
+    ar_model = AutoReg(indata[i, :], lags=nlags)
+    ar_fit = ar_model.fit()
+    ar_params = ar_fit.params
+
+    # The prewhitening filter coefficients are 1 for the numerator and 
+    # (1, -ar_params[1]) for the denominator
+    b = [1]
+    a = np.insert(-ar_params[1:], 0, 1)
+
+    # 3. Apply the filter to prewhiten the signal
+    prewhitened_signal = signal.lfilter(b, a, indata[i, :])
+    plt.plot(indata[i, :] / np.std(indata[i, :]))
+    plt.plot(prewhitened_signal / np.std(prewhitened_signal))
+    plt.show()

rapidtide/data/examples/src/test_findmaxlag.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-#   Copyright 2016-2024 Blaise Frederick
+#   Copyright 2016-2025 Blaise Frederick
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -24,8 +24,8 @@ import matplotlib.pyplot as plt
 import numpy as np
 
 import rapidtide.fit as tide_fit
-import rapidtide.helper_classes as tide_classes
 import rapidtide.io as tide_io
+import rapidtide.simFuncClasses as tide_classes
 from rapidtide.tests.utils import get_examples_path
 
 

rapidtide/data/examples/src/test_mlregressallt.py

@@ -3,10 +3,10 @@
 import numpy as np
 from sklearn.linear_model import LinearRegression
 
-from rapidtide.fit import mlregress_alt
+from rapidtide.fit import mlregress, olsregress
 
 
-def test_mlregress_alt():
+def test_olsregress():
     # Test with a simple dataset
     X = np.array([[1, 2], [3, 4]])
     y = np.array([5, 6])
@@ -15,13 +15,20 @@ def test_mlregress_alt():
     expected_intercept = 4
     expected_R = 0.707
 
-    coeffs, R = mlregress_alt(X, y, intercept)
+    mlcoeffs, mlR = mlregress(X, y, intercept=intercept)
+    print(f"{mlcoeffs=}, {mlR=}")
 
-    print(coeffs, expected_coeffs)
-    assert np.allclose(coeffs, expected_coeffs)
-    assert np.isclose(R, expected_R)
+    olscoeffs, olsR = olsregress(X, y, intercept=intercept)
+    print(f"{olscoeffs=}, {olsR=}")
 
-def test_mlregress_alt_intercept():
+    print(mlcoeffs, expected_coeffs)
+    print(olscoeffs, expected_coeffs)
+    assert np.allclose(mlcoeffs, expected_coeffs)
+    assert np.isclose(mlR, expected_R)
+    assert np.allclose(olscoeffs, expected_coeffs)
+    assert np.isclose(olsR, expected_R)
+
+def test_olsregress_intercept():
     # Test with a simple dataset and no intercept
     X = np.array([[1, 2], [3, 4]])
     y = np.array([5, 6])
@@ -30,26 +37,34 @@ def test_mlregress_alt_intercept():
     expected_intercept = None
     expected_R = 0.707
 
-    coeffs, R = mlregress_alt(X, y, intercept)
+    coeffs, R = mlregress(X, y, intercept)
 
     assert np.allclose(coeffs, expected_coeffs)
     assert np.isclose(R, expected_R)
 
-def test_mlregress_alt_no_intercept():
+def test_olsregress_nointercept():
     # Test with a simple dataset and no intercept
     X = np.array([[1, 2], [3, 4]])
     y = np.array([5, 6])
-    intercept = None
+    intercept = False
     expected_coeffs = np.array([[1, 2], [3, 4]])
-    expected_intercept = None
+    expected_intercept = False
     expected_R = 0.707
 
-    coeffs, R = mlregress_alt(X, y, intercept)
+    mlcoeffs, mlR = mlregress(X, y, intercept=intercept)
+    print(f"{mlcoeffs=}, {mlR=}")
 
-    assert np.allclose(coeffs, expected_coeffs)
-    assert np.isclose(R, expected_R)
+    olscoeffs, olsR = olsregress(X, y, intercept=intercept)
+    print(f"{olscoeffs=}, {olsR=}")
+
+    print(mlcoeffs, expected_coeffs)
+    print(olscoeffs, expected_coeffs)
+    assert np.allclose(mlcoeffs, expected_coeffs)
+    assert np.isclose(mlR, expected_R)
+    assert np.allclose(olscoeffs, expected_coeffs)
+    assert np.isclose(olsR, expected_R)
 
-test_mlregress_alt()
-test_mlregress_alt_intercept()
-test_mlregress_alt_nointercept()
+test_olsregress_nointercept()
+test_olsregress_intercept()
+test_olsregress()
 

rapidtide/data/examples/src/testalign

@@ -41,7 +41,7 @@ alignedvec, maxdelay, maxval, failreason = tide_corr.aligntcwithref(
 )
 print(f"{maxdelay=}, {maxval=}, {failreason=}")
 
-filteredvec, datatoremove, R, coffs = tide_fit.glmfilt(fixedvec, alignedvec, debug=True)
+filteredvec, datatoremove, R, coffs, dummy = tide_fit.linfitfilt(fixedvec, alignedvec, debug=True)
 
 offset = 0.0
 plt.plot(xaxis, fixedvec + offset)

rapidtide/data/examples/src/testatlasaverage

@@ -1,17 +1,45 @@
 #!/bin/bash
 
 atlasaverage \
-    ../../reference/HCP1200_lag_2mm.nii.gz \
+    ../../reference/HCP1200v2_maxtime_2mm.nii.gz \
     ../../reference/JHU-ArterialTerritoriesNoVent-LVL1_space-MNI152NLin6Asym_2mm.nii.gz \
-    ../dst/atlastest_nomask \
+    ../dst/JHU-ArterialTerritoriesNoVent-LVL1-seg4_space-MNI152NLin6Asym_2mm \
     --ignorezeros \
+    --numpercentiles 3 \
+    --includemask /opt/fsl-latest/data/standard/MNI152_T1_2mm_brain_mask.nii.gz \
+    --extramask /opt/fsl-latest/data/standard/MNI152_T1_2mm_brain_mask.nii.gz \
+    --summarymethod median \
     --headerline
 
 atlasaverage \
-    ../../reference/HCP1200_lag_2mm.nii.gz \
-    ../../reference/JHU-ArterialTerritoriesNoVent-LVL1_space-MNI152NLin6Asym_2mm.nii.gz \
-    ../dst/atlastest_withmask \
+    HCP1200v2_maxtime_1mm.nii.gz \
+    ../../reference/JHU-ArterialTerritoriesNoVent-LVL1_space-MNI152NLin6Asym_1mm.nii.gz \
+    ../dst/JHU-ArterialTerritoriesNoVent-LVL1-seg4_space-MNI152NLin6Asym_1mm \
     --ignorezeros \
-    --includemask /opt/fsl-latest/data/standard/MNI152_T1_2mm_brain_mask.nii.gz \
-    --extramaskname /opt/fsl-latest/data/standard/MNI152_T1_2mm_brain_mask.nii.gz \
+    --numpercentiles 3 \
+    --includemask /opt/fsl-latest/data/standard/MNI152_T1_1mm_brain_mask.nii.gz \
+    --extramask /opt/fsl-latest/data/standard/MNI152_T1_1mm_brain_mask.nii.gz \
+    --summarymethod median \
     --headerline
+
+atlasaverage \
+    sub-RAPIDTIDETEST.nii.gz \
+    sub-RAPIDTIDETEST_dseg.nii.gz \
+    ../dst/synthsegaverages \
+    --ignorezeros \
+    --numpercentiles 3 \
+    --includemask sub-RAPIDTIDETEST_brainmask.nii.gz \
+    --regionlabelfile dseglabels.txt \
+    --summarymethod mean 
+
+atlasaverage \
+    sub-RAPIDTIDETEST.nii.gz \
+    sub-RAPIDTIDETEST_dseg.nii.gz \
+    ../dst/synthsegaverages_pctnorm \
+    --normmethod pct \
+    --ignorezeros \
+    --numpercentiles 3 \
+    --includemask sub-RAPIDTIDETEST_brainmask.nii.gz \
+    --regionlabelfile dseglabels.txt \
+    --summarymethod mean 
+

rapidtide/data/examples/src/testboth

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+rapidtide \
+    --spatialfilt 5 \
+    --nprocs -1 \
+    --searchrange -5 20 \
+    --simcalcrange 50 -1 \
+    --outputlevel max \
+    --refinedelay \
+    sub-RAPIDTIDETEST.nii.gz \
+    ../dst/sub-RAPIDTIDETEST
+
+retroregress \
+    --nprocs -1 \
+    --alternateoutput ../dst/sub-RETROTEST_refined \
+    --makepseudofile \
+    --outputlevel max \
+    --refinedelay \
+    --refinecorr \
+    sub-RAPIDTIDETEST.nii.gz \
+    ../dst/sub-RAPIDTIDETEST

rapidtide/data/examples/src/testcifti

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+rapidtide \
+	sub-RAPIDTIDETEST_cifti.ptseries.nii \
+        ../dst/sub-RAPIDTIDETEST5 \
+        --filterband lfo \
+        --searchrange -15 15 \
+        --passes 3 \
+        --globalmaskmethod variance \
+        --nprocs -1 \
+        --numnull 10000 

rapidtide/data/examples/src/testdelayvar

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+delayvar \
+    sub-RAPIDTIDETEST.nii.gz \
+    ../dst/sub-RAPIDTIDETEST \
+    --alternateoutput ../dst/delayvartest \
+    --nprocs -1 \
+    --windowsize 30 \
+    --systemicfittype pca \
+    --pcacomponents 0.8 \
+    --outputlevel max \
+    --focaldebug \
+    --windelayoffsetspatialfilt 3

rapidtide/data/examples/src/testdlfilt

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+MACHINE=$(uname -a | awk '{print $2}')
+if [ ${MACHINE} == "mickey" ]; then
+    echo "running on mickey"
+    ROOT=/home/frederic/code/rapidtide/rapidtide
+else
+    echo "not running on mickey"
+    ROOT=/Users/frederic/code/rapidtide/rapidtide
+fi
+
+MODELROOT=${ROOT}/experimental
+MODELROOT=${ROOT}/data/models
+
+cd ${MODELROOT}
+for MODEL in model_*_pytorch*
+do
+    echo model: ${MODELROOT}/${MODEL}
+    applydlfilter \
+        ${ROOT}/data/examples/src/happy_desc-stdrescardfromfmri_timeseries.json \
+        ${ROOT}/data/examples/dst/${MODEL}_filtered \
+        --model ${MODELROOT}/${MODEL}
+    echo
+    echo
+done

rapidtide/data/examples/src/testfft

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+rm -f fft_timings
+touch fft_timings
+for RUN in INIT REPEAT
+do
+    for EFFORT in FFTW_ESTIMATE FFTW_MEASURE FFTW_PATIENT FFTW_EXHAUSTIVE
+    do
+        export PYFFTW_PLANNER_EFFORT=${EFFORT}
+        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 \
+            sub-RAPIDTIDETEST.nii.gz \
+            ../dst/sub-RAPIDTIDETEST_${RUN}_${EFFORT}
+        RUNTIME=`grep Done ../dst/sub-RAPIDTIDETEST_${RUN}_${EFFORT}_desc-formattedruntimings_info.tsv | awk '{print $1}'`
+        echo rapidtide ${RUN} ${EFFORT} ${RUNTIME} >> fft_timings
+        happy \
+            sub-HAPPYTEST.nii.gz \
+            sub-HAPPYTEST.json \
+            ../dst/sub-HAPPYTEST_${RUN}_${EFFORT} \
+            --usenewvesselmethod \
+            --nprocs -1
+        RUNTIME=`grep Done ../dst/sub-HAPPYTEST_${RUN}_${EFFORT}_runtimings.txt | awk '{print $2}'`
+        echo happy ${RUN} ${EFFORT} ${RUNTIME} >> fft_timings
+    done
+done

rapidtide/data/examples/src/testfileorfloat

@@ -0,0 +1,37 @@
+#!/usr/bin/env python
+
+import argparse
+
+import rapidtide.workflows.parser_funcs as pf
+
+
+def _get_parser():
+    """
+    Argument parser for testfileorfloat
+    """
+    parser = argparse.ArgumentParser(
+        prog="testfileorfloat",
+        description=("Test file or float parser function."),
+        allow_abbrev=False,
+    )
+
+    # Required arguments
+    parser.add_argument(
+        "fixdelay",
+        type=lambda x: pf.is_valid_file_or_float(parser, x),
+        help="This needs to be an existing file or a valid float.",
+    )
+
+    return parser
+
+
+def main(args):
+    try:
+        fixdelay = float(args.fixdelay)
+        print(f"fixdelay is a float: {fixdelay}")
+    except ValueError:
+        print(f"{args.fixdelay} is a valid filename")
+
+
+if __name__ == "__main__":
+    pf.generic_init(_get_parser, main)

rapidtide/data/examples/src/testfmri

@@ -1,59 +1,109 @@
 #!/bin/bash
 
+#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 correlation \
+#    --nonumba \
+#    sub-RAPIDTIDETEST.nii.gz \
+#    ../dst/sub-RAPIDTIDETEST_nonumba
+
+#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 correlation \
+#    --spcalculation \
+#    sub-RAPIDTIDETEST.nii.gz \
+#    ../dst/sub-RAPIDTIDETEST_single
+
 rapidtide \
-    --spatialfilt 2 \
+    --spatialfilt -1 \
     --nprocs -1 \
-    --passes 3 \
+    --searchrange -7.5 30 \
     --simcalcrange 50 -1 \
+    --outputlevel normal \
+    --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 \
+    --filterfreqs 0.009 0.025 \
     sub-RAPIDTIDETEST.nii.gz \
-    ../dst/sub-RAPIDTIDETEST_default
+    ../dst/sub-RAPIDTIDETEST_band1
 
 rapidtide \
-    --spatialfilt 2 \
+    --spatialfilt -1 \
     --nprocs -1 \
-    --passes 3 \
+    --searchrange -7.5 30 \
     --simcalcrange 50 -1 \
-    --memprofile \
+    --outputlevel normal \
+    --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 \
+    --filterfreqs 0.025 0.075 \
     sub-RAPIDTIDETEST.nii.gz \
-    ../dst/sub-RAPIDTIDETEST_memprofile
+    ../dst/sub-RAPIDTIDETEST_band2
+
+rapidtide \
+    --spatialfilt -1 \
+    --nprocs -1 \
+    --searchrange -7.5 30 \
+    --simcalcrange 50 -1 \
+    --outputlevel normal \
+    --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 \
+    --filterfreqs 0.075 0.15 \
+    sub-RAPIDTIDETEST.nii.gz \
+    ../dst/sub-RAPIDTIDETEST_band3
 
 #rapidtide \
-    #--spatialfilt 2 \
-    #--nprocs -1 \
-    #--passes 3 \
-    #--simcalcrange 50 -1 \
-    #--texcludemask tmask3_exclude.txt \
-    #sub-RAPIDTIDETEST.nii.gz \
-    #../dst/sub-RAPIDTIDETEST_excludemask
-#
-#rapidtide \
-    #--spatialfilt 2 \
+    #--spatialfilt 2.5 \
     #--nprocs -1 \
-    #--passes 3 \
+    #--searchrange -7.5 30 \
     #--simcalcrange 50 -1 \
-    #--tincludemask tmask3.txt \
-    #--texcludemask tmask3_exclude.txt \
+    #--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_bothmasks
-
-#for FILT in 1 2 4 8 16
-#do
-#    rapidtide \
-#        --spatialfilt ${FILT} \
-#        --nprocs -1 \
-#        --passes 3 \
-#        --simcalcrange 50 -1 \
-#        --outputlevel min \
-#        sub-RAPIDTIDETEST.nii.gz \
-#        ../dst/sub-RAPIDTIDETEST_${FILT}
-#done
+    #../dst/sub-RAPIDTIDETEST_riptide
 #
-#for MAP in maxtime maxcorr
-#do
-#    fslmerge -t ../dst/all_${MAP} \
-#        ../dst/sub-RAPIDTIDETEST_1_desc-${MAP}_map.nii.gz \
-#        ../dst/sub-RAPIDTIDETEST_2_desc-${MAP}_map.nii.gz \
-#        ../dst/sub-RAPIDTIDETEST_4_desc-${MAP}_map.nii.gz \
-#        ../dst/sub-RAPIDTIDETEST_8_desc-${MAP}_map.nii.gz \
-#        ../dst/sub-RAPIDTIDETEST_16_desc-${MAP}_map.nii.gz 
-#done
+#tidepool --uistyle big --dataset \
+    #../dst/sub-RAPIDTIDETEST_simfunc_ \
+    #../dst/sub-RAPIDTIDETEST_riptide_ &

rapidtide/data/examples/src/testfuncs

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-#   Copyright 2016-2024 Blaise Frederick
+#   Copyright 2016-2025 Blaise Frederick
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -31,8 +31,8 @@ def test_funcs(displayplots=False, debug=False):
     loc = 5.0
     baseline = 0.0
 
-    gaussvals = xvals * 0.0
-    sincvals = xvals * 0.0
+    gaussvals = np.zeros_like(xvals)
+    sincvals = np.zeros_like(xvals)
 
     for i in range(len(xvals)):
         gaussvals[i] = tide_fit.gaussfunc(xvals[i], height, loc, width)

rapidtide/data/examples/src/testglmfilt

@@ -34,7 +34,9 @@ datavec = amp1 * evs[:, 0] + amp2 * evs[:, 1] + amp3 * evs[:, 2] + intercept
 noisevec = noiseamp * np.random.rand(arrlen)
 invec = datavec + noisevec
 
-filtered, datatoremove, R, outcoffs, outintercept = tide_fit.glmfilt(invec, evs, returnintercept=True, debug=True)
+filtered, datatoremove, R, outcoffs, outintercept = tide_fit.linfitfilt(
+    invec, evs, debug=True
+)
 
 incoffs = [amp1, amp2, amp3]
 coffdiffs = outcoffs - incoffs
@@ -58,7 +60,7 @@ plt.plot(datavec - datatoremove + offset)
 print(R)
 plt.show()
 
-filtered, datatoremove, R, coffs = tide_fit.glmfilt(invec, evs[:, 0], debug=True)
+filtered, datatoremove, R, coffs, dummy = tide_fit.linfitfilt(invec, evs[:, 0], debug=True)
 
 """
 offset = 0.0
@@ -80,7 +82,7 @@ invec2 = (
     + noiseamp * np.random.rand(arrlen)
 )
 
-filtered, datatoremove, R, coffs = tide_fit.glmfilt(invec2, evs, debug=True)
+filtered, datatoremove, R, coffs, dummy = tide_fit.linfitfilt(invec2, evs, debug=True)
 
 """
 offset = 0.0
@@ -95,7 +97,7 @@ print(R)
 plt.show()
 """
 
-filtered, thenewevs, datatoremove, R, coffs = tide_fit.expandedglmfilt(
+filtered, thenewevs, datatoremove, R, coffs = tide_fit.expandedlinfitfilt(
     invec2, evs, ncomps=3, debug=True
 )
 
@@ -116,7 +118,7 @@ print(R)
 plt.show()
 """
 
-filtered, datatoremove, R, coffs = tide_fit.glmfilt(invec2, thenewevs, debug=True)
+filtered, datatoremove, R, coffs, dummy = tide_fit.linfitfilt(invec2, thenewevs, debug=True)
 """
 offset = 0.0
 plt.plot(invec2 + offset)
@@ -138,7 +140,7 @@ alignedev, maxdelay, maxval, failreason = tide_corr.aligntcwithref(
     verbose=True,
 )
 print(f"{maxdelay=}, {maxval=}, {failreason=}")
-filtered, datatoremove, R, coffs = tide_fit.glmfilt(invec3, alignedev, debug=True)
+filtered, datatoremove, R, coffs, dummy = tide_fit.linfitfilt(invec3, alignedev, debug=True)
 offset = 0.0
 plt.plot(evs[:, 0])
 offset += 1.0