diff --git a/modules/amv/caliop_clavrx_amv.py b/modules/amv/caliop_clavrx_amv.py
index feb839d6256c184cb5cb948370118e5092d6cfb2..8e378a4f6597292b746d8490135c50fcd15f1da6 100644
--- a/modules/amv/caliop_clavrx_amv.py
+++ b/modules/amv/caliop_clavrx_amv.py
@@ -40,7 +40,7 @@ def get_search_box(cc, ll):
return c_rng, l_rng
-def match_calipso_clavrx_to_amvs(calipso_clavrx_ds, calipso_clavrx_file, amv_files):
+def match_calipso_clavrx_to_amvs(calipso_clavrx_ds, calipso_clavrx_file, amv_files, calipso_clavrx_params):
nav = amv_files.get_navigation()
amv_params = amv_files.get_parameters()
all_params = [amv_files.lon_name, amv_files.lat_name, amv_files.elem_name, amv_files.line_name] + amv_params
@@ -73,11 +73,11 @@ def match_calipso_clavrx_to_amvs(calipso_clavrx_ds, calipso_clavrx_file, amv_fil
param_s.append(amvs_nd[:, amv_spd_idx])
param_s.append(amvs_nd[:, amv_dir_idx])
- # -----------------------------------------------------------------
- # exmpl_file = '/data/Personal/rink/4TH_AMV_INTERCOMPARISON/clavrx_calipso/g16_s20192930150_06kmCLay.matchup.calipso.h5'
- exmpl_file = '/data/Personal/rink/AMS_2022/caliop_clavrx/g16_s20192931130_06kmCLay.matchup.calipso.h5'
-
- calipso_clavrx_params = get_parameters_caliop_clavrx(filename=exmpl_file)
+ # # -----------------------------------------------------------------
+ # # exmpl_file = '/data/Personal/rink/4TH_AMV_INTERCOMPARISON/clavrx_calipso/g16_s20192930150_06kmCLay.matchup.calipso.h5'
+ # exmpl_file = '/data/Personal/rink/AMS_2022/caliop_clavrx/g16_s20192931130_06kmCLay.matchup.calipso.h5'
+ #
+ # calipso_clavrx_params = get_parameters_caliop_clavrx(filename=exmpl_file)
coords_a = {'num_calipso_clavrx_params': calipso_clavrx_params}
dims_a = ['num_calipso_clavrx_params']
@@ -289,8 +289,8 @@ def create_file(match_dct, output_path, target_filepath, caliop_clavrx_params, a
def run_caliop_clavrx_amv_match(output_path, path_to_caliop_clavrx, path_to_amvs, amv_source='OPS', band='14'):
# exmpl_file = '/data/Personal/rink/4TH_AMV_INTERCOMPARISON/clavrx_calipso/g16_s20192930150_06kmCLay.matchup.calipso.h5'
- exmpl_file = '/data/Personal/rink/AMS_2022/caliop_clavrx/g16_s20192931130_06kmCLay.matchup.calipso.h5'
- caliop_clavrx_params = get_parameters_caliop_clavrx(filename=exmpl_file)
+ # exmpl_file = '/data/Personal/rink/AMS_2022/caliop_clavrx/g16_s20192931130_06kmCLay.matchup.calipso.h5'
+ caliop_clavrx_params = get_parameters_caliop_clavrx(filename=caliop_clvrx_exmpl_file)
caliop_clavrx_ds = CLAVRx_CALIPSO(path_to_caliop_clavrx)
@@ -299,7 +299,7 @@ def run_caliop_clavrx_amv_match(output_path, path_to_caliop_clavrx, path_to_amvs
amv_filenames = amv_ds.flist
for file in caliop_clavrx_ds.flist:
- match_dict = match_calipso_clavrx_to_amvs(caliop_clavrx_ds, file, amv_ds)
+ match_dict = match_calipso_clavrx_to_amvs(caliop_clavrx_ds, file, amv_ds, caliop_clavrx_params)
if match_dict is None:
continue