petpal 0.5.8__tar.gz → 0.5.9__tar.gz

{petpal-0.5.8 → petpal-0.5.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: petpal
-Version: 0.5.8
+Version: 0.5.9
 Summary: PET-PAL (Positron Emission Tomography Processing and Analysis Library)
 Project-URL: Repository, https://github.com/PETPAL-WUSM/PETPAL.git
 Author-email: Noah Goldman <noahg@wustl.edu>, Bradley Judge <bjudge@wustl.edu>, Furqan Dar <dar@wustl.edu>, Kenan Oestreich <kenan.oestreich@wustl.edu>

{petpal-0.5.8 → petpal-0.5.9}/petpal/cli/cli_graphical_analysis.py

@@ -59,7 +59,6 @@ def main():
     parser_multitac = subparsers.add_parser('graphical-analysis-multitac')
     _add_common_args(parser_multitac)
     parser_multitac.add_argument("-r", "--roi-tacs-dir", required=True, help="Path to directory containing ROI TTACs")
-    parser_multitac.add_argument("-x","--excel", action='store_true',help='Set to output an excel-compatible table in a single file.',default=False)
 
     args = parser.parse_args()
     command = str(args.command).replace('-','_')
@@ -90,7 +89,7 @@ def main():
                                                               output_filename_prefix=args.output_filename_prefix,
                                                               method=method,
                                                               fit_thresh_in_mins=args.threshold_in_mins)
-        graphical_analysis(one_file_per_region=not args.excel, **run_kwargs)
+        graphical_analysis(output_as_tsv=True, output_as_json=False, **run_kwargs)
 
     if args.print:
         for key, val in graphical_analysis.analysis_props.items():

{petpal-0.5.8 → petpal-0.5.9}/petpal/preproc/regional_tac_extraction.py

@@ -1,6 +1,7 @@
 """
 Regional TAC extraction
 """
+from warnings import warn
 import os
 from collections.abc import Callable
 import pathlib
@@ -345,6 +346,20 @@ class WriteRegionalTacs:
             region_name = f'UNK{label:>04}'
         return region_name
 
+    def is_empty_region(self,pet_masked_region: np.ndarray) -> bool:
+        """Check if masked PET region has zero matched voxels, or is all NaNs. In either case,
+        return True, otherwise return False.
+        
+        Args:
+            pet_masked_region (np.ndarray): Array of PET voxels masked to a specific region.
+            
+        Returns:
+            pet_masked_region_is_empty (bool): If True, input region is empty."""
+        if pet_masked_region.size==0:
+            return True
+        if np.all(np.isnan(pet_masked_region)):
+            return True
+        return False
 
     def extract_tac(self,region_mapping: int | list[int], **tac_calc_kwargs) -> TimeActivityCurve:
         """
@@ -359,15 +374,46 @@ class WriteRegionalTacs:
         """
         region_mask = combine_regions_as_mask(segmentation_img=self.seg_arr,
                                               label=region_mapping)
+
         pet_masked_region = apply_mask_4d(input_arr=self.pet_arr,
                                           mask_arr=region_mask)
-        extracted_tac, uncertainty = self.tac_extraction_func(pet_voxels=pet_masked_region,
-                                                              **tac_calc_kwargs)
+
+        is_region_empty = self.is_empty_region(pet_masked_region=pet_masked_region)
+        if is_region_empty:
+            extracted_tac = np.empty_like(self.scan_timing.center_in_mins)
+            extracted_tac.fill(np.nan)
+            uncertainty = extracted_tac.copy()
+        else:
+            extracted_tac, uncertainty = self.tac_extraction_func(pet_voxels=pet_masked_region,
+                                                                  **tac_calc_kwargs)
         region_tac = TimeActivityCurve(times=self.scan_timing.center_in_mins,
                                        activity=extracted_tac,
                                        uncertainty=uncertainty)
         return region_tac
 
+    def gen_tacs_data_frame(self) -> pd.DataFrame:
+        """Get empty data frame to store TACs. Sets first two columns to frame start and end
+        times, and remaining columns are named by region activity and uncertainty, based on the
+        regions included in the label map.
+        
+        Returns:
+            tacs_data (pd.DataFrame): Data frame with columns set for frame start and end time,
+            and activity and uncertainty for each included region. Frame start and end time
+            columns filled with scan timing data.
+        """
+        activity_uncertainty_column_names = []
+        for region_name in self.region_names:
+            activity_uncertainty_column_names.append(region_name)
+            activity_uncertainty_column_names.append(f'{region_name}_unc')
+        cols_list = ['frame_start(min)','frame_end(min)'] + activity_uncertainty_column_names
+        tacs_data = pd.DataFrame(columns=cols_list)
+
+        tacs_data['frame_start(min)'] = self.scan_timing.start_in_mins
+        tacs_data['frame_end(min)'] = self.scan_timing.end_in_mins
+
+        return tacs_data
+
+
 
     def write_tacs(self,
                    out_tac_prefix: str,
@@ -378,7 +424,8 @@ class WriteRegionalTacs:
         Function to write Tissue Activity Curves for each region, given a segmentation,
         4D PET image, and label map. Computes the average of the PET image within each
         region. Writes TACs in TSV format with region name, frame start time, frame end time, and
-        activity and uncertainty within each region.
+        activity and uncertainty within each region. Skips writing regions without any matched
+        voxels.
 
         Args:
             out_tac_prefix (str): Prefix for the output files, usually the BIDS subject and
@@ -387,22 +434,34 @@ class WriteRegionalTacs:
             one_tsv_per_region (bool): If True, write one TSV TAC file for each region in the
                 image. If False, write one TSV file with all TACs in the image.
             **tac_calc_kwargs: Additional keywords passed onto tac_extraction_func.
-        """
-        tacs_data = pd.DataFrame()
 
-        tacs_data['frame_start(min)'] = self.scan_timing.start_in_mins
-        tacs_data['frame_end(min)'] = self.scan_timing.end_in_mins
+        Raises:
+            Warning: for each region without any matched voxels, warn user that TAC is skipped.
+        """
+        tacs_data = self.gen_tacs_data_frame()
 
+        empty_regions = []
         for i,region_name in enumerate(self.region_names):
             mappings = self.region_maps[i]
             tac = self.extract_tac(region_mapping=mappings, **tac_calc_kwargs)
+            if tac.contains_any_nan:
+                empty_regions.append(region_name)
+                continue
             if one_tsv_per_region:
+                os.makedirs(out_tac_dir, exist_ok=True)
                 tac.to_tsv(filename=f'{out_tac_dir}/{out_tac_prefix}_seg-{region_name}_tac.tsv')
             else:
                 tacs_data[region_name] = tac.activity
                 tacs_data[f'{region_name}_unc'] = tac.uncertainty
 
+        if len(empty_regions)>0:
+            warn("Empty regions were found during tac extraction. TACs for the following regions "
+                 f"were not saved: {empty_regions}")
+            tacs_data.drop(empty_regions,axis=1,inplace=True)
+            tacs_data.drop([f'{region}_unc' for region in empty_regions],axis=1,inplace=True)
+
         if not one_tsv_per_region:
+            os.makedirs(out_tac_dir, exist_ok=True)
             tacs_data.to_csv(f'{out_tac_dir}/{out_tac_prefix}_multitacs.tsv', sep='\t', index=False)
 
     def __call__(self,

{petpal-0.5.8 → petpal-0.5.9}/petpal/preproc/segmentation_tools.py

@@ -14,7 +14,9 @@ import nibabel
 from nibabel import processing
 import pandas as pd
 
-from ..utils.useful_functions import gen_nd_image_based_on_image_list
+from ..utils.useful_functions import (gen_nd_image_based_on_image_list,
+                                      check_physical_space_for_ants_image_pair,
+                                      get_average_of_timeseries)
 from ..utils import math_lib
 
 
@@ -571,3 +573,28 @@ def unique_segmentation_labels(segmentation_img: ants.core.ANTsImage | np.ndarra
     if not zeroth_roi:
         labels = labels[labels != 0]
     return labels
+
+def seg_crop_to_pet_fov(pet_img: ants.ANTsImage,
+                        segmentation_img: ants.ANTsImage,
+                        pet_thresh_value: float=np.finfo(float).eps) -> ants.ANTsImage:
+    """Zero out segmentation values that lie outside of the PET FOV.
+    
+    Especially applicable to scanners with limited FOV (field of view). PET voxels with values less
+    than 1e-36 are considered outside of the FOV.
+    
+    Args:
+        pet_img (ants.ANTsImage): PET image in anatomical space used to crop segmentation
+        segmentation_img (ants.ANTsImage): Segmentation image in anatomical space such as
+            FreeSurfer to which FOV cropping is applied.
+        pet_thresh_value (float): Lower threshold for the PET image by which the segmentation image
+            is masked. Should be <<1. Default machine epsilon for `float`.
+
+    Returns:
+        segmentation_masked_img (ants.ANTsImage): Segmentation image masked to PET FOV.
+    """
+    if not check_physical_space_for_ants_image_pair(pet_img, segmentation_img):
+        raise ValueError("PET and segmentation image must share physical space.")
+    pet_mean_img = get_average_of_timeseries(input_image=pet_img)
+    pet_mask = ants.threshold_image(pet_mean_img, pet_thresh_value)
+    seg_masked = ants.mask_image(segmentation_img, pet_mask)
+    return seg_masked

{petpal-0.5.8 → petpal-0.5.9}/petpal/utils/time_activity_curve.py

@@ -75,6 +75,7 @@ class TimeActivityCurve:
         return len(self.times)
 
     def __post_init__(self):
+        self.validate_activity()
         if self.uncertainty.size == 0:
             self.uncertainty = np.empty_like(self.times)
             self.uncertainty[:] = np.nan
@@ -82,6 +83,33 @@ class TimeActivityCurve:
             f"TAC fields must have the same shapes.\ntimes:{self.times.shape}"
             "activity:{self.activity.shape} uncertainty:{self.uncertainty.shape}")
 
+    def validate_activity(self):
+        """Validates that the activity attribute is defined correctly.
+        
+        `self.activity` must have the following properties:
+        1) It must exist and not be None
+        2) It must be a numpy array
+        3) It must have dtype float
+        4) It must be 1D
+
+        This function raises a ValueError if self.activity does not meet the first criteria, and
+        attempts to coerce self.activity into a 1D, numeric numpy array with dtype float if
+        criteria 2-4 are not met.
+        """
+        if not hasattr(self, "activity") or self.activity is None:
+            raise ValueError("TimeActivityCurve.activity must be provided and not be None")
+
+        try:
+            arr = np.asarray(self.activity, dtype=float)
+        except (TypeError, ValueError) as exc:
+            error_message = "TimeActivityCurve.activity must be numeric or convertible to numeric"
+            raise TypeError(error_message) from exc
+
+        if arr.ndim != 1:
+            arr = arr.ravel()
+
+        self.activity = arr
+
     @classmethod
     def from_tsv(cls, filename: str):
         """
@@ -509,29 +537,29 @@ class TimeActivityCurve:
                                                           kind='linear',
                                                           fill_value='extrapolate')(tac.times)
             return TimeActivityCurve(tac.times, shifted_vals_on_tac_times)
-        else:
-            return shifted_tac
+        return shifted_tac
 
     @staticmethod
     def tac_dispersion(tac: 'TimeActivityCurve',
-                       disp_func: Callable[[np.ndarray, ...], np.ndarray],
+                       disp_func: Callable[..., np.ndarray],
                        disp_kwargs: dict,
                        num_samples: int = 4096):
         r"""
         Applies a dispersion function to a time-activity curve (TAC) and returns the convolved TAC.
 
-        This method evaluates the specified dispersion function `disp_func` at supersampled time points.
-        It performs convolution (using :func:`scipy.signal.convolve`)of the supersampled TAC with
-        the dispersion function, and the result is sampled back at the original TAC time points
-        to form the new convolved TAC.
+        This method evaluates the specified dispersion function `disp_func` at supersampled time
+        points. It performs convolution (using :func:`scipy.signal.convolve`) of the supersampled
+        TAC with the dispersion function, and the result is sampled back at the original TAC time
+        points to form the new convolved TAC.
 
         .. note::
-            We perform the supersampling to ensure that the TACs are sampled evenly before performing
-            the convolution. Convolving non-evenly sampled arrays produces nonsense values.
+            We perform the supersampling to ensure that the TACs are sampled evenly before
+            performing the convolution. Convolving non-evenly sampled arrays produces nonsense
+            values.
 
         Args:
             tac (TimeActivityCurve): The original time-activity curve to be convolved.
-            disp_func (Callable[[np.ndarray, ...], np.ndarray]):
+            disp_func (Callable[..., np.ndarray]):
                 The dispersion function to be applied. This function must accept an array of
                 times as its first argument, followed by any additional arguments specified
                 in `disp_kwargs`.
@@ -541,8 +569,8 @@ class TimeActivityCurve:
                 Defaults to 4096.
 
         Returns:
-            TimeActivityCurve: A new `TimeActivityCurve` instance with the convolved activity values,
-            resampled at the original TAC time points.
+            TimeActivityCurve: A new `TimeActivityCurve` instance with the convolved activity
+            values, resampled at the original TAC time points.
 
         Example:
             .. code-block:: python
@@ -592,6 +620,12 @@ class TimeActivityCurve:
 
         return disp_tac.set_activity_non_negative()
 
+    @property
+    def contains_any_nan(self):
+        """Return True if TAC has any NaN activity values."""
+        any_nan = np.isnan(self.activity).any()
+        return any_nan
+
 def safe_load_tac(filename: str,
                   with_uncertainty: bool = False,
                   **kwargs) -> np.ndarray:

{petpal-0.5.8 → petpal-0.5.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "petpal"
-version = "0.5.8"
+version = "0.5.9"
 description = "PET-PAL (Positron Emission Tomography Processing and Analysis Library)"
 authors = [
     {name = "Noah Goldman", email = "noahg@wustl.edu"},

petpal-0.5.9/tests/test_graphical_analysis.py

@@ -0,0 +1,90 @@
+import os
+import warnings
+import pytest
+import pandas as pd
+
+from petpal.utils.image_io import flatten_metadata
+import petpal.kinetic_modeling.graphical_analysis as ga
+
+def _make_instance(rsquared):
+    inst = ga.MultiTACGraphicalAnalysis.__new__(ga.MultiTACGraphicalAnalysis)
+    inst.analysis_props = [{'RSquared': rsquared}]
+    inst.output_directory = "/tmp"
+    inst.output_filename_prefix = "prefix"
+    inst.method = "patlak"
+    inst.inferred_seg_labels = ["roi1", "roi2"]
+    return inst
+
+
+def test_save_analysis_raises_if_run_not_called():
+    inst = _make_instance(rsquared=None)
+    with pytest.raises(RuntimeError):
+        inst.save_analysis()
+
+def test_save_analysis_calls_tsv_and_json(monkeypatch):
+    inst = _make_instance(rsquared=0.95)
+    calls = {"tsv": 0, "json": 0}
+
+    def km_multifit_analysis_to_tsv_without_save_file(analysis_props: list[dict],
+                                    output_directory: str,
+                                    output_filename_prefix: str,
+                                    method: str,
+                                    inferred_seg_labels: list[str]):
+        filename = f'{output_filename_prefix}_desc-{method}_fitprops.tsv'
+        filepath = os.path.join(output_directory, filename)
+        fit_table = pd.DataFrame()
+        for seg_name, fit_props in zip(inferred_seg_labels, analysis_props):
+            tmp_table = pd.DataFrame(flatten_metadata(fit_props),index=[seg_name])
+            fit_table = pd.concat([fit_table,tmp_table])
+        calls["tsv"] += 1
+        assert isinstance(analysis_props, list)
+        assert isinstance(output_directory, str)
+        assert isinstance(output_filename_prefix, str)
+        assert isinstance(method, str)
+        assert isinstance(inferred_seg_labels, list)
+
+    def km_multifit_analysis_to_jsons_without_save_file(analysis_props: list[dict],
+                                    output_directory: str,
+                                    output_filename_prefix: str,
+                                    method: str,
+                                    inferred_seg_labels: list[str]):
+        for seg_name, fit_props in zip(inferred_seg_labels, analysis_props):
+            filename = [output_filename_prefix,
+                        f'desc-{method}',
+                        f'seg-{seg_name}',
+                        'fitprops.json']
+            filename = '_'.join(filename)
+            filepath = os.path.join(output_directory, filename)
+        calls["json"] += 1
+        assert isinstance(analysis_props, list)
+        assert isinstance(output_directory, str)
+        assert isinstance(output_filename_prefix, str)
+        assert isinstance(method, str)
+        assert isinstance(inferred_seg_labels, list)
+
+    monkeypatch.setattr(ga, "km_multifit_analysis_to_tsv", km_multifit_analysis_to_tsv_without_save_file)
+    monkeypatch.setattr(ga, "km_multifit_analysis_to_jsons", km_multifit_analysis_to_jsons_without_save_file)
+
+    # Default behavior: TSV only
+    calls["tsv"] = calls["json"] = 0
+    inst.save_analysis(output_as_tsv=True, output_as_json=False)
+    assert calls["tsv"] == 1 and calls["json"] == 0
+
+    # JSON only
+    calls["tsv"] = calls["json"] = 0
+    inst.save_analysis(output_as_tsv=False, output_as_json=True)
+    assert calls["tsv"] == 0 and calls["json"] == 1
+
+    # Both
+    calls["tsv"] = calls["json"] = 0
+    inst.save_analysis(output_as_tsv=True, output_as_json=True)
+    assert calls["tsv"] == 1 and calls["json"] == 1
+
+def test_save_analysis_warns_when_no_output_requested(monkeypatch):
+    inst = _make_instance(rsquared=0.5)
+    # prevent actual functions being called if mistakenly invoked
+    monkeypatch.setattr(ga, "km_multifit_analysis_to_tsv", lambda *a, **k: (_ for _ in ()).throw(AssertionError("should not be called")))
+    monkeypatch.setattr(ga, "km_multifit_analysis_to_jsons", lambda *a, **k: (_ for _ in ()).throw(AssertionError("should not be called")))
+
+    with pytest.warns(UserWarning):
+        inst.save_analysis(output_as_tsv=False, output_as_json=False)

petpal-0.5.9/tests/test_time_activity_curve.py

@@ -0,0 +1,33 @@
+import pytest
+import numpy as np
+from petpal.utils.time_activity_curve import TimeActivityCurve
+
+def test_post_init_sets_uncertainty_when_missing_and_converts_activity_to_float():
+    times = np.array([0.0, 10.0, 20.0])
+    activity = [1, 2, 3]  # list input should be converted to 1D float array
+    tac = TimeActivityCurve(times=times, activity=activity)
+    assert isinstance(tac.uncertainty, np.ndarray)
+    assert tac.uncertainty.shape == times.shape
+    assert np.all(np.isnan(tac.uncertainty))
+    assert tac.activity.dtype == float
+    assert tac.activity.shape == times.shape
+
+def test_post_init_raises_when_activity_is_none():
+    times = np.array([0.0, 5.0])
+    with pytest.raises(ValueError):
+        TimeActivityCurve(times=times, activity=None)
+
+def test_post_init_asserts_on_shape_mismatch_between_fields():
+    times = np.array([0.0, 10.0, 20.0])
+    activity = np.array([1.0, 2.0])  # different shape -> should trigger assertion
+    with pytest.raises(AssertionError):
+        TimeActivityCurve(times=times, activity=activity)
+
+def test_post_init_flattens_multidimensional_activity_to_1d_float():
+    times = np.array([0.0, 10.0, 20.0])
+    activity = np.array([[1, 2, 3]], dtype=int)  # 2D input should be ravelled and cast to float
+    tac = TimeActivityCurve(times=times, activity=activity)
+    assert tac.activity.ndim == 1
+    assert tac.activity.shape == times.shape
+    assert tac.activity.dtype == float
+    assert np.allclose(tac.activity, np.array([1.0, 2.0, 3.0]))

petpal-0.5.9/tests/test_write_tacs.py

@@ -0,0 +1,90 @@
+import os
+import numpy as np
+import builtins
+import types
+import pytest
+import pathlib
+
+import petpal.preproc.regional_tac_extraction as rtx
+
+class FakeLabelMapLoader:
+    def __init__(self, label_map_option):
+        self._label_map = {'R1': 1, 'R2': 2}
+    @property
+    def label_map(self):
+        return self._label_map
+
+class FakeImg:
+    def __init__(self, arr):
+        self._arr = arr
+    def numpy(self):
+        return self._arr
+
+class FakeScanTiming:
+    def __init__(self):
+        self.start_in_mins = [0.0, 1.0, 2.0]
+        self.end_in_mins = [1.0, 2.0, 3.0]
+        self.center_in_mins = [0.5, 1.5, 2.5]
+
+def fake_to_tsv(self, filename):
+    # simple TSV writer for the TimeActivityCurve instances used in tests
+    with open(filename, 'w') as fh:
+        fh.write("time\tactivity\tuncertainty\n")
+        for t, a, u in zip(self.times, self.activity, self.uncertainty):
+            fh.write(f"{t}\t{a}\t{u}\n")
+
+@pytest.fixture(autouse=True)
+def patch_dependencies(monkeypatch):
+    # Patch LabelMapLoader used in module
+    monkeypatch.setattr(rtx, "LabelMapLoader", FakeLabelMapLoader)
+    # Patch ants.image_read to return dummy arrays (not used because apply_mask_4d is patched)
+    monkeypatch.setattr(rtx.ants, "image_read", lambda filename=None: FakeImg(np.zeros((2,2,2,3))))
+    # Patch ScanTimingInfo.from_nifti
+    monkeypatch.setattr(rtx.ScanTimingInfo, "from_nifti", lambda image_path=None: FakeScanTiming())
+    # combine_regions_as_mask returns the label passed through so apply_mask_4d can distinguish
+    monkeypatch.setattr(rtx, "combine_regions_as_mask", lambda segmentation_img, label: label)
+    # Patch TimeActivityCurve.to_tsv to write simple TSV so tests can assert file creation
+    monkeypatch.setattr(rtx.TimeActivityCurve, "to_tsv", fake_to_tsv)
+    yield
+
+def test_write_tacs_one_tsv_per_region_writes_only_non_nan_region(tmp_path, monkeypatch):
+    # apply_mask_4d returns non-NaN voxels for label 1 and all-NaN voxels for label 2
+    def fake_apply_mask_4d(input_arr, mask_arr, verbose=False):
+        if mask_arr == 1:
+            return np.array([[1.0, 2.0, 3.0], [4.0, 5.0, 6.0]])  # mean is finite
+        else:
+            return np.array([[np.nan, np.nan, np.nan], [np.nan, np.nan, np.nan]])  # mean is nan
+    monkeypatch.setattr(rtx, "apply_mask_4d", fake_apply_mask_4d)
+
+    wr = rtx.WriteRegionalTacs(input_image_path="in.nii", segmentation_path="seg.nii", label_map="dummy")
+    out_dir = tmp_path
+    wr.write_tacs(out_tac_prefix="sub-01", out_tac_dir=str(out_dir), one_tsv_per_region=True)
+    # Expect file for R1 only
+    f_r1 = out_dir / "sub-01_seg-R1_tac.tsv"
+    f_r2 = out_dir / "sub-01_seg-R2_tac.tsv"
+    assert f_r1.exists()
+    assert not f_r2.exists()
+    # Basic content check
+    content = f_r1.read_text()
+    assert "time\tactivity\tuncertainty" in content
+    assert "0.5\t" in content  # time present
+
+def test_write_tacs_multitac_writes_combined_file_and_skips_nan_regions(tmp_path, monkeypatch):
+    # same masking behavior as previous test
+    def fake_apply_mask_4d(input_arr, mask_arr, verbose=False):
+        if mask_arr == 1:
+            return np.array([[1.0, 2.0, 3.0], [4.0, 5.0, 6.0]])
+        else:
+            return np.array([[np.nan, np.nan, np.nan], [np.nan, np.nan, np.nan]])
+    monkeypatch.setattr(rtx, "apply_mask_4d", fake_apply_mask_4d)
+
+    wr = rtx.WriteRegionalTacs(input_image_path="in.nii", segmentation_path="seg.nii", label_map="dummy")
+    out_dir = tmp_path
+    wr.write_tacs(out_tac_prefix="sub-01", out_tac_dir=str(out_dir), one_tsv_per_region=False)
+    combined = out_dir / "sub-01_multitacs.tsv"
+    assert combined.exists()
+    txt = combined.read_text()
+    # Should contain frame_start(min) and R1 column but not R2 (R2 was NaN and skipped)
+    assert "frame_start(min)" in txt
+    assert "R1" in txt
+    assert "R2" not in txt

{petpal-0.5.8 → petpal-0.5.9}/petpal/kinetic_modeling/graphical_analysis.py

@@ -1103,13 +1103,13 @@ class MultiTACGraphicalAnalysis(GraphicalAnalysis, MultiTACAnalysisMixin):
         if self.analysis_props[0]['RSquared'] is None:
             raise RuntimeError("'run_analysis' method must be called before 'save_analysis'.")
 
-        if output_as_tsv:
+        if output_as_json:
             km_multifit_analysis_to_jsons(analysis_props=self.analysis_props,
                                           output_directory=self.output_directory,
                                           output_filename_prefix=self.output_filename_prefix,
                                           method=self.method,
                                           inferred_seg_labels=self.inferred_seg_labels)
-        if output_as_json:
+        if output_as_tsv:
             km_multifit_analysis_to_tsv(analysis_props=self.analysis_props,
                                         output_directory=self.output_directory,
                                         output_filename_prefix=self.output_filename_prefix,