diff --git a/plots/3C405_x136060/3C405_FOC.png b/plots/3C405_x136060/3C405_FOC.png index 8b203d6..d1fc2f4 100644 Binary files a/plots/3C405_x136060/3C405_FOC.png and b/plots/3C405_x136060/3C405_FOC.png differ diff --git a/plots/3C405_x136060/3C405_FOC_P.png b/plots/3C405_x136060/3C405_FOC_P.png index 33673b5..238aad5 100644 Binary files a/plots/3C405_x136060/3C405_FOC_P.png and b/plots/3C405_x136060/3C405_FOC_P.png differ diff --git a/plots/3C405_x136060/3C405_FOC_P_err.png b/plots/3C405_x136060/3C405_FOC_P_err.png index abf4dde..5c7812b 100644 Binary files a/plots/3C405_x136060/3C405_FOC_P_err.png and b/plots/3C405_x136060/3C405_FOC_P_err.png differ diff --git a/plots/3C405_x136060/3C405_FOC_c1f.png b/plots/3C405_x136060/3C405_FOC_c1f.png deleted file mode 100644 index 3de4934..0000000 Binary files a/plots/3C405_x136060/3C405_FOC_c1f.png and /dev/null differ diff --git a/plots/3C405_x136060/3C405_FOC_c1f_P.png b/plots/3C405_x136060/3C405_FOC_c1f_P.png deleted file mode 100644 index 4dcd58c..0000000 Binary files a/plots/3C405_x136060/3C405_FOC_c1f_P.png and /dev/null differ diff --git a/plots/3C405_x136060/3C405_FOC_c1f_P_err.png b/plots/3C405_x136060/3C405_FOC_c1f_P_err.png deleted file mode 100644 index 85eb705..0000000 Binary files a/plots/3C405_x136060/3C405_FOC_c1f_P_err.png and /dev/null differ diff --git a/plots/3C405_x136060/3C405_FOC_c1f_center_image.png b/plots/3C405_x136060/3C405_FOC_c1f_center_image.png deleted file mode 100644 index e811dd8..0000000 Binary files a/plots/3C405_x136060/3C405_FOC_c1f_center_image.png and /dev/null differ diff --git a/plots/3C405_x136060/3C405_FOC_c1f_deconvolved05_FWHM010.png b/plots/3C405_x136060/3C405_FOC_c1f_deconvolved05_FWHM010.png deleted file mode 100644 index d6cbaf7..0000000 Binary files a/plots/3C405_x136060/3C405_FOC_c1f_deconvolved05_FWHM010.png and /dev/null differ diff --git a/plots/3C405_x136060/3C405_FOC_c1f_deconvolved05_FWHM010_P.png b/plots/3C405_x136060/3C405_FOC_c1f_deconvolved05_FWHM010_P.png deleted file mode 100644 index 9146f41..0000000 Binary files a/plots/3C405_x136060/3C405_FOC_c1f_deconvolved05_FWHM010_P.png and /dev/null differ diff --git a/plots/3C405_x136060/3C405_FOC_c1f_deconvolved05_FWHM010_P_err.png b/plots/3C405_x136060/3C405_FOC_c1f_deconvolved05_FWHM010_P_err.png deleted file mode 100644 index 3050a00..0000000 Binary files a/plots/3C405_x136060/3C405_FOC_c1f_deconvolved05_FWHM010_P_err.png and /dev/null differ diff --git a/plots/3C405_x136060/3C405_FOC_c1f_errors_background_flux.png b/plots/3C405_x136060/3C405_FOC_c1f_errors_background_flux.png deleted file mode 100644 index b752681..0000000 Binary files a/plots/3C405_x136060/3C405_FOC_c1f_errors_background_flux.png and /dev/null differ diff --git a/plots/3C405_x136060/3C405_FOC_c1f_errors_background_location.png b/plots/3C405_x136060/3C405_FOC_c1f_errors_background_location.png deleted file mode 100644 index 8e73c0d..0000000 Binary files a/plots/3C405_x136060/3C405_FOC_c1f_errors_background_location.png and /dev/null differ diff --git a/plots/3C405_x136060/3C405_FOC_center_image.png b/plots/3C405_x136060/3C405_FOC_center_image.png index 51e5e02..a7e2882 100644 Binary files a/plots/3C405_x136060/3C405_FOC_center_image.png and b/plots/3C405_x136060/3C405_FOC_center_image.png differ diff --git a/plots/3C405_x136060/3C405_FOC_combine_FWHM2.png b/plots/3C405_x136060/3C405_FOC_combine_FWHM2.png new file mode 100644 index 0000000..2983e92 Binary files /dev/null and b/plots/3C405_x136060/3C405_FOC_combine_FWHM2.png differ diff --git a/plots/3C405_x136060/3C405_FOC_combine_FWHM2_P.png b/plots/3C405_x136060/3C405_FOC_combine_FWHM2_P.png new file mode 100644 index 0000000..30da01b Binary files /dev/null and b/plots/3C405_x136060/3C405_FOC_combine_FWHM2_P.png differ diff --git a/plots/3C405_x136060/3C405_FOC_combine_FWHM2_P_err.png b/plots/3C405_x136060/3C405_FOC_combine_FWHM2_P_err.png new file mode 100644 index 0000000..ac7a6ae Binary files /dev/null and b/plots/3C405_x136060/3C405_FOC_combine_FWHM2_P_err.png differ diff --git a/plots/3C405_x136060/3C405_FOC_deconvolved05_FWHM010.png b/plots/3C405_x136060/3C405_FOC_deconvolved05_FWHM010.png deleted file mode 100644 index cd08ee8..0000000 Binary files a/plots/3C405_x136060/3C405_FOC_deconvolved05_FWHM010.png and /dev/null differ diff --git a/plots/3C405_x136060/3C405_FOC_deconvolved05_FWHM010_P.png b/plots/3C405_x136060/3C405_FOC_deconvolved05_FWHM010_P.png deleted file mode 100644 index d90d758..0000000 Binary files a/plots/3C405_x136060/3C405_FOC_deconvolved05_FWHM010_P.png and /dev/null differ diff --git a/plots/3C405_x136060/3C405_FOC_deconvolved05_FWHM010_P_err.png b/plots/3C405_x136060/3C405_FOC_deconvolved05_FWHM010_P_err.png deleted file mode 100644 index b444bbc..0000000 Binary files a/plots/3C405_x136060/3C405_FOC_deconvolved05_FWHM010_P_err.png and /dev/null differ diff --git a/plots/3C405_x136060/3C405_FOC_errors_background_flux.png b/plots/3C405_x136060/3C405_FOC_errors_background_flux.png index 47e4b0f..ac45821 100644 Binary files a/plots/3C405_x136060/3C405_FOC_errors_background_flux.png and b/plots/3C405_x136060/3C405_FOC_errors_background_flux.png differ diff --git a/plots/3C405_x136060/3C405_FOC_errors_background_location.png b/plots/3C405_x136060/3C405_FOC_errors_background_location.png index a47e6ab..e22e8ae 100644 Binary files a/plots/3C405_x136060/3C405_FOC_errors_background_location.png and b/plots/3C405_x136060/3C405_FOC_errors_background_location.png differ diff --git a/plots/NGC1068_x14w010/3C405_FOC_center_maxflux.png b/plots/NGC1068_x14w010/3C405_FOC_center_maxflux.png new file mode 100644 index 0000000..05fbf58 Binary files /dev/null and b/plots/NGC1068_x14w010/3C405_FOC_center_maxflux.png differ diff --git a/src/FOC_reduction.py b/src/FOC_reduction.py index 6d92a60..9ba01df 100755 --- a/src/FOC_reduction.py +++ b/src/FOC_reduction.py @@ -16,11 +16,11 @@ import lib.plots as proj_plots #Functions for plotting data def main(): ##### User inputs ## Input and output locations - globals()['data_folder'] = "../data/NGC1068_x274020/" - infiles = ['x274020at.c0f.fits','x274020bt.c0f.fits','x274020ct.c0f.fits', - 'x274020dt.c0f.fits','x274020et.c0f.fits','x274020ft.c0f.fits', - 'x274020gt.c0f.fits','x274020ht.c0f.fits','x274020it.c0f.fits'] - globals()['plots_folder'] = "../plots/NGC1068_x274020/" +# globals()['data_folder'] = "../data/NGC1068_x274020/" +# infiles = ['x274020at.c0f.fits','x274020bt.c0f.fits','x274020ct.c0f.fits', +# 'x274020dt.c0f.fits','x274020et.c0f.fits','x274020ft.c0f.fits', +# 'x274020gt.c0f.fits','x274020ht.c0f.fits','x274020it.c0f.fits'] +# globals()['plots_folder'] = "../plots/NGC1068_x274020/" # globals()['data_folder'] = "../data/NGC1068_x14w010/" # infiles = ['x14w0101t_c0f.fits','x14w0102t_c0f.fits','x14w0103t_c0f.fits', @@ -29,10 +29,10 @@ def main(): # 'x14w0104t_c1f.fits','x14w0105p_c1f.fits','x14w0106t_c1f.fits'] # globals()['plots_folder'] = "../plots/NGC1068_x14w010/" -# globals()['data_folder'] = "../data/3C405_x136060/" -# infiles = ['x1360601t_c0f.fits','x1360602t_c0f.fits','x1360603t_c0f.fits'] + globals()['data_folder'] = "../data/3C405_x136060/" + infiles = ['x1360601t_c0f.fits','x1360602t_c0f.fits','x1360603t_c0f.fits'] # infiles = ['x1360601t_c1f.fits','x1360602t_c1f.fits','x1360603t_c1f.fits'] -# globals()['plots_folder'] = "../plots/3C405_x136060/" + globals()['plots_folder'] = "../plots/3C405_x136060/" # globals()['data_folder'] = "../data/CygnusA_x43w0/" # infiles = ['x43w0101r_c0f.fits', 'x43w0104r_c0f.fits', 'x43w0107r_c0f.fits', @@ -44,7 +44,7 @@ def main(): ## Reduction parameters # Deconvolution - deconvolve = True + deconvolve = False if deconvolve: psf = 'gaussian' #Can be user-defined as well psf_FWHM = 0.10 @@ -52,27 +52,27 @@ def main(): psf_shape=(9,9) iterations = 10 # Error estimation - error_sub_shape = (50,50) + error_sub_shape = (100,100) display_error = False # Data binning rebin = True if rebin: - pxsize = 0.10 + pxsize = 0.30 px_scale = 'arcsec' #pixel or arcsec rebin_operation = 'sum' #sum or average # Alignement - align_center = 'maxflux' #If None will align image to image center - display_data = True + align_center = 'image' #If None will align image to image center + display_data = False # Smoothing smoothing_function = 'combine' #gaussian or combine - smoothing_FWHM = None #If None, no smoothing is done + smoothing_FWHM = 2 #If None, no smoothing is done smoothing_scale = 'pixel' #pixel or arcsec # Rotation rotate = False #rotation to North convention can give erroneous results rotate_library = 'scipy' #scipy or pillow # Polarization map output - figname = 'NGC1068_FOC' #target/intrument name - figtype = '' #additionnal informations + figname = '3C405_FOC' #target/intrument name + figtype = '_combine_FWHM2' #additionnal informations SNRp_cut = 3 #P measurments with SNR>3 SNRi_cut = 30 #I measurments with SNR>30, which implies an uncertainty in P of 4.7%. step_vec = 1 #plot all vectors in the array. if step_vec = 2, then every other vector will be plotted