Removed high-pass filtering options beacuse too computer intensive and easy work around
@@ -267,11 +267,13 @@ def get_values_optimize(cube, angs, ncomp, annulus_width, aperture_radius,
interpolation = algo_options.get('interpolation',interpolation)
collapse = algo_options.get('collapse',collapse)
+
if algo == pca_annulus:
pca_res = pca_annulus(cube, angs, ncomp, annulus_width, r_guess,
cube_ref, svd_mode, scaling, imlib=imlib,
interpolation=interpolation, collapse=collapse,
weights=weights)
+
elif algo == pca_annular:
tol = algo_options.get('tol',1e-1)
@@ -303,24 +305,9 @@ def get_values_optimize(cube, angs, ncomp, annulus_width, aperture_radius,
pca_res = np.pad(pca_res_tmp,pad,mode='constant',constant_values=0)
elif algo == pca:
- hp_filter = algo_options.get('hp_filter',None)
- hp_kernel = algo_options.get('hp_kernel',None)
scale_list = algo_options.get('scale_list',None)
ifs_collapse_range = algo_options.get('ifs_collapse_range','all')
nproc = algo_options.get('nproc','all')
-
- # not recommended, except if large-scale residual sky present (NIRC2-L')
- if hp_filter is not None:
- if 'median' in hp_filter:
- cube = cube_filter_highpass(cube, mode=hp_filter,
- median_size=hp_kernel)
- elif "gauss" in hp_filter:
- cube = cube_filter_highpass(cube, mode=hp_filter,
- fwhm_size=hp_kernel)
- else:
- cube = cube_filter_highpass(cube, mode=hp_filter,
- kernel_size=hp_kernel)
-
pca_res = pca(cube, angs, cube_ref, scale_list, ncomp,
svd_mode=svd_mode, scaling=scaling, imlib=imlib,
interpolation=interpolation, collapse=collapse,
