Commit 486c5b04 authored by Jay Laura's avatar Jay Laura
Browse files

Missed Kalisiris imports fixed

parent 160583b7

autocnet/cg/change_detection.py

+8 −3
Original line number Diff line number Diff line
@@ -26,7 +26,12 @@ import richdem as rd 
import pandas as pd

import geopandas as gpd



from kalasiris import specialpixels

try:

    import kalasiris as isis

except Exception as exception:

    from autocnet.utils.utils import FailedImport

    isis = FailedImport(exception)





from autocnet.utils.utils import bytescale

from autocnet.matcher.cpu_extractor import extract_features
@@ -57,7 +62,7 @@ def image_diff(arr1, arr2): 
    arr1[arr1 == 0] = np.nan

    arr2[arr2 == 0] = np.nan



    isis_null = specialpixels.Real.Null

    isis_null = isis.specialpixels.Real.Null

    arr1[arr1 == isis_null] = np.nan

    arr2[arr2 == isis_null] = np.nan
@@ -92,7 +97,7 @@ def image_ratio(arr1, arr2): 
    arr1[arr1 == 0] = np.nan

    arr2[arr2 == 0] = np.nan



    isis_null = specialpixels.Real.Null

    isis_null = isis.specialpixels.Real.Null

    arr1[arr1 == isis_null] = np.nan

    arr2[arr2 == isis_null] = np.nan

autocnet/utils/hirise.py

+6 −1
Original line number Diff line number Diff line
@@ -3,7 +3,12 @@ from glob import glob 
import textwrap

import geopandas as gpd



try:

    import kalasiris as isis

except Exception as exception:

    from autocnet.utils.utils import FailedImport

    isis = FailedImport(exception)

    

from subprocess import CalledProcessError



from plio.io.io_gdal import GeoDataset