diff --git a/plots/NGC1068_x14w010/3C405_FOC_center_maxflux.png b/plots/NGC1068_x14w010/3C405_FOC_center_maxflux.png deleted file mode 100644 index 05fbf58..0000000 Binary files a/plots/NGC1068_x14w010/3C405_FOC_center_maxflux.png and /dev/null differ diff --git a/plots/NGC1068_x14w010/NGC1068_FOC_c1f.png b/plots/NGC1068_x14w010/NGC1068_FOC_c1f.png deleted file mode 100644 index 5a936f3..0000000 Binary files a/plots/NGC1068_x14w010/NGC1068_FOC_c1f.png and /dev/null differ diff --git a/plots/NGC1068_x14w010/NGC1068_FOC_c1f_P.png b/plots/NGC1068_x14w010/NGC1068_FOC_c1f_P.png deleted file mode 100644 index 221f70c..0000000 Binary files a/plots/NGC1068_x14w010/NGC1068_FOC_c1f_P.png and /dev/null differ diff --git a/plots/NGC1068_x14w010/NGC1068_FOC_c1f_P_err.png b/plots/NGC1068_x14w010/NGC1068_FOC_c1f_P_err.png deleted file mode 100644 index 4a6c727..0000000 Binary files a/plots/NGC1068_x14w010/NGC1068_FOC_c1f_P_err.png and /dev/null differ diff --git a/plots/NGC1068_x14w010/NGC1068_FOC_center_maxflux.png b/plots/NGC1068_x14w010/NGC1068_FOC_center_maxflux.png index 15325a3..4fdbf4b 100644 Binary files a/plots/NGC1068_x14w010/NGC1068_FOC_center_maxflux.png and b/plots/NGC1068_x14w010/NGC1068_FOC_center_maxflux.png differ diff --git a/plots/NGC1068_x14w010/NGC1068_FOC_combine_FWHM1.png b/plots/NGC1068_x14w010/NGC1068_FOC_combine_FWHM1.png old mode 100755 new mode 100644 diff --git a/plots/NGC1068_x14w010/NGC1068_FOC_combine_FWHM2.png b/plots/NGC1068_x14w010/NGC1068_FOC_combine_FWHM2.png old mode 100755 new mode 100644 diff --git a/plots/NGC1068_x14w010/NGC1068_FOC_deconvolved5_FWHM010.png b/plots/NGC1068_x14w010/NGC1068_FOC_deconvolved5_FWHM010.png index 6177b80..6507777 100644 Binary files a/plots/NGC1068_x14w010/NGC1068_FOC_deconvolved5_FWHM010.png and b/plots/NGC1068_x14w010/NGC1068_FOC_deconvolved5_FWHM010.png differ diff --git a/plots/NGC1068_x14w010/NGC1068_FOC_deconvolved5_FWHM010_P.png b/plots/NGC1068_x14w010/NGC1068_FOC_deconvolved5_FWHM010_P.png index ba93da7..2ff1dbb 100644 Binary files a/plots/NGC1068_x14w010/NGC1068_FOC_deconvolved5_FWHM010_P.png and b/plots/NGC1068_x14w010/NGC1068_FOC_deconvolved5_FWHM010_P.png differ diff --git a/plots/NGC1068_x14w010/NGC1068_FOC_deconvolved5_FWHM010_P_err.png b/plots/NGC1068_x14w010/NGC1068_FOC_deconvolved5_FWHM010_P_err.png index e11f532..8c92861 100644 Binary files a/plots/NGC1068_x14w010/NGC1068_FOC_deconvolved5_FWHM010_P_err.png and b/plots/NGC1068_x14w010/NGC1068_FOC_deconvolved5_FWHM010_P_err.png differ diff --git a/plots/NGC1068_x14w010/NGC1068_FOC_deconvolved5_FWHM010_combine_FWHM2.png b/plots/NGC1068_x14w010/NGC1068_FOC_deconvolved5_FWHM010_combine_FWHM2.png new file mode 100644 index 0000000..988a4c3 Binary files /dev/null and b/plots/NGC1068_x14w010/NGC1068_FOC_deconvolved5_FWHM010_combine_FWHM2.png differ diff --git a/plots/NGC1068_x14w010/NGC1068_FOC_deconvolved5_FWHM010_combine_FWHM2_P.png b/plots/NGC1068_x14w010/NGC1068_FOC_deconvolved5_FWHM010_combine_FWHM2_P.png new file mode 100644 index 0000000..8b6a0b8 Binary files /dev/null and b/plots/NGC1068_x14w010/NGC1068_FOC_deconvolved5_FWHM010_combine_FWHM2_P.png differ diff --git a/plots/NGC1068_x14w010/NGC1068_FOC_deconvolved5_FWHM010_combine_FWHM2_P_err.png b/plots/NGC1068_x14w010/NGC1068_FOC_deconvolved5_FWHM010_combine_FWHM2_P_err.png new file mode 100644 index 0000000..d96ab89 Binary files /dev/null and b/plots/NGC1068_x14w010/NGC1068_FOC_deconvolved5_FWHM010_combine_FWHM2_P_err.png differ diff --git a/plots/NGC1068_x14w010/NGC1068_FOC_errors_background_flux.png b/plots/NGC1068_x14w010/NGC1068_FOC_errors_background_flux.png index dea7cb1..6000353 100644 Binary files a/plots/NGC1068_x14w010/NGC1068_FOC_errors_background_flux.png and b/plots/NGC1068_x14w010/NGC1068_FOC_errors_background_flux.png differ diff --git a/plots/NGC1068_x14w010/NGC1068_FOC_errors_background_location.png b/plots/NGC1068_x14w010/NGC1068_FOC_errors_background_location.png index 95ed8ef..cac8f3a 100644 Binary files a/plots/NGC1068_x14w010/NGC1068_FOC_errors_background_location.png and b/plots/NGC1068_x14w010/NGC1068_FOC_errors_background_location.png differ diff --git a/plots/NGC1068_x14w010/NGC1068_FOC_gaussian_FWHM2.png b/plots/NGC1068_x14w010/NGC1068_FOC_gaussian_FWHM2.png new file mode 100644 index 0000000..c3b7f80 Binary files /dev/null and b/plots/NGC1068_x14w010/NGC1068_FOC_gaussian_FWHM2.png differ diff --git a/plots/NGC1068_x14w010/NGC1068_FOC_gaussian_FWHM2_P.png b/plots/NGC1068_x14w010/NGC1068_FOC_gaussian_FWHM2_P.png new file mode 100644 index 0000000..9be8eee Binary files /dev/null and b/plots/NGC1068_x14w010/NGC1068_FOC_gaussian_FWHM2_P.png differ diff --git a/plots/NGC1068_x14w010/NGC1068_FOC_gaussian_FWHM2_P_err.png b/plots/NGC1068_x14w010/NGC1068_FOC_gaussian_FWHM2_P_err.png new file mode 100644 index 0000000..ac120d3 Binary files /dev/null and b/plots/NGC1068_x14w010/NGC1068_FOC_gaussian_FWHM2_P_err.png differ diff --git a/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM2_rot2.png b/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM2_rot2.png new file mode 100644 index 0000000..c645545 Binary files /dev/null and b/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM2_rot2.png differ diff --git a/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM2_rot2_P.png b/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM2_rot2_P.png new file mode 100644 index 0000000..8d0fdeb Binary files /dev/null and b/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM2_rot2_P.png differ diff --git a/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM2_rot2_P_err.png b/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM2_rot2_P_err.png new file mode 100644 index 0000000..91c41f9 Binary files /dev/null and b/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM2_rot2_P_err.png differ diff --git a/src/FOC_reduction.py b/src/FOC_reduction.py index ad492a3..5efb6da 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', @@ -34,13 +34,13 @@ def main(): # infiles = ['x1360601t_c1f.fits','x1360602t_c1f.fits','x1360603t_c1f.fits'] # globals()['plots_folder'] = "../plots/3C405_x136060/" - globals()['data_folder'] = "../data/CygnusA_x43w0/" - infiles = ['x43w0101r_c0f.fits', 'x43w0104r_c0f.fits', 'x43w0107r_c0f.fits', - 'x43w0201r_c0f.fits', 'x43w0204r_c0f.fits', 'x43w0102r_c0f.fits', - 'x43w0105r_c0f.fits', 'x43w0108r_c0f.fits', 'x43w0202r_c0f.fits', - 'x43w0205r_c0f.fits', 'x43w0103r_c0f.fits', 'x43w0106r_c0f.fits', - 'x43w0109r_c0f.fits', 'x43w0203r_c0f.fits', 'x43w0206r_c0f.fits'] - globals()['plots_folder'] = "../plots/CygnusA_x43w0/" +# globals()['data_folder'] = "../data/CygnusA_x43w0/" +# infiles = ['x43w0101r_c0f.fits', 'x43w0104r_c0f.fits', 'x43w0107r_c0f.fits', +# 'x43w0201r_c0f.fits', 'x43w0204r_c0f.fits', 'x43w0102r_c0f.fits', +# 'x43w0105r_c0f.fits', 'x43w0108r_c0f.fits', 'x43w0202r_c0f.fits', +# 'x43w0205r_c0f.fits', 'x43w0103r_c0f.fits', 'x43w0106r_c0f.fits', +# 'x43w0109r_c0f.fits', 'x43w0203r_c0f.fits', 'x43w0206r_c0f.fits'] +# globals()['plots_folder'] = "../plots/CygnusA_x43w0/" ## Reduction parameters # Deconvolution @@ -50,29 +50,29 @@ def main(): psf_FWHM = 0.10 psf_scale = 'arcsec' psf_shape=(9,9) - iterations = 10 + iterations = 5 # Error estimation - error_sub_shape = (100,100) + error_sub_shape = (50,50) display_error = False # Data binning rebin = True if rebin: - pxsize = 0.30 + pxsize = 0.10 px_scale = 'arcsec' #pixel or arcsec rebin_operation = 'sum' #sum or average # Alignement - align_center = 'image' #If None will align image to image center + align_center = 'maxflux' #If None will align image to image center display_data = False # Smoothing smoothing_function = 'combine' #gaussian or combine 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 = True #rotation to North convention can give erroneous results rotate_library = 'scipy' #scipy or pillow # Polarization map output - figname = 'CygnusA_FOC' #target/intrument name - figtype = '_combine_FWHM2' #additionnal informations + figname = 'NGC1068_FOC' #target/intrument name + figtype = '_combine_FWHM2_rot2' #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