diff --git a/rapidtide/tests/test_fullrunrapidtide_v1.py b/rapidtide/tests/test_fullrunrapidtide_v1.py index d54a9ca9e..ea86f7c98 100755 --- a/rapidtide/tests/test_fullrunrapidtide_v1.py +++ b/rapidtide/tests/test_fullrunrapidtide_v1.py @@ -22,7 +22,6 @@ import rapidtide.workflows.rapidtide as rapidtide_workflow import rapidtide.workflows.rapidtide_parser as rapidtide_parser -from rapidtide.RapidtideDataset import RapidtideDataset from rapidtide.tests.utils import get_examples_path, get_test_temp_path @@ -42,23 +41,6 @@ def test_fullrunrapidtide_v1(debug=False, displayplots=False): ] rapidtide_workflow.rapidtide_main(rapidtide_parser.process_args(inputargs=inputargs)) - datafileroot = os.path.join(get_test_temp_path(), "sub-RAPIDTIDETEST1") - thedataset = RapidtideDataset( - "main", - datafileroot, - usecorrout=True, - verbose=True, - init_LUT=False, - ) - - assert thedataset.focusregressor == "prefilt" - thedataset.setfocusregressor("pass3") - assert thedataset.focusregressor == "pass3" - - if debug: - print(thedataset.regressorfilterlimits) - assert thedataset.regressorfilterlimits == (0.01, 0.15) - if __name__ == "__main__": mpl.use("TkAgg") diff --git a/rapidtide/tests/test_zRapidtideDataset.py b/rapidtide/tests/test_zRapidtideDataset.py index bbb65cb89..1062e8268 100755 --- a/rapidtide/tests/test_zRapidtideDataset.py +++ b/rapidtide/tests/test_zRapidtideDataset.py @@ -32,7 +32,7 @@ def main(runninglocally=False): datafileroot = "../data/examples/dst/sub-RAPIDTIDETEST_" else: print(f"get_test_temp_path={get_test_temp_path()}") - datafileroot = (os.path.join(get_test_temp_path(), "sub-RAPIDTIDETEST2_"),) + datafileroot = (os.path.join(get_test_temp_path(), "sub-RAPIDTIDETEST1_"),) anatname = None geommaskname = None userise = False @@ -62,6 +62,14 @@ def main(runninglocally=False): theoverlays = thesubject.getoverlays() theregressors = thesubject.getregressors() + assert thesubject.focusregressor == "prefilt" + thesubject.setfocusregressor("pass3") + assert thesubject.focusregressor == "pass3" + + if debug: + print(thesubject.regressorfilterlimits) + assert thesubject.regressorfilterlimits == (0.01, 0.15) + if __name__ == "__main__": main(runninglocally=True)