snapshot...

modules/aeolus/aeolus_amv.py

@@ -5,7 +5,7 @@ import numpy as np
 import xarray as xr
 from netCDF4 import Dataset
 from aeolus.geos_nav import GEOSNavigation, get_navigation
-from aeolus.datasource import get_datasource
+from aeolus.datasource import get_datasource, CLAVRx_CALIPSO
 from util.util import haversine_np, LatLonTuple, GenericException
 from amv.intercompare import best_fit, bin_data_by, get_press_bin_ranges, spd_dir_from_uv, uv_from_spd_dir, \
     direction_difference, run_best_fit_gfs
@@ -1732,7 +1732,7 @@ def match_amvs_to_aeolus_fast(aeolus_dict, amv_files_path, amv_source='OPS', ban
     return match_dict
 
 
-def match_calipso_clavrx_to_amvs(calipso_clavrx_file, amv_files_path, amv_source='OPS', band='14', amv_files=None):
+def match_calipso_clavrx_to_amvs(calipso_clavrx_path, calipso_clavrx_file, amv_files_path, amv_source='OPS', band='14', amv_files=None):
     if amv_files is None:
         amv_files = get_datasource(amv_files_path, amv_source, band=band)
     nav = amv_files.get_navigation()
@@ -1742,7 +1742,7 @@ def match_calipso_clavrx_to_amvs(calipso_clavrx_file, amv_files_path, amv_source
     coords = {'num_params': all_params}
     dims = ['num_params', 'num_amvs']
 
-    calipso_clavrx_ds = None
+    calipso_clavrx_ds = CLAVRx_CALIPSO(calipso_clavrx_path)
 
     nom_time = calipso_clavrx_ds.get_datetime(calipso_clavrx_file).timestamp()