diff --git a/plots/IC5063_x3nl030/103GHz_overplot.png b/plots/IC5063_x3nl030/103GHz_overplot.png deleted file mode 100644 index cfbfc8e..0000000 Binary files a/plots/IC5063_x3nl030/103GHz_overplot.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/103GHz_overplot_forced.png b/plots/IC5063_x3nl030/103GHz_overplot_forced.png new file mode 100644 index 0000000..d4a42f5 Binary files /dev/null and b/plots/IC5063_x3nl030/103GHz_overplot_forced.png differ diff --git a/plots/IC5063_x3nl030/103GHz_overplot_old.png b/plots/IC5063_x3nl030/103GHz_overplot_old.png deleted file mode 100644 index a4a136a..0000000 Binary files a/plots/IC5063_x3nl030/103GHz_overplot_old.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/18GHz_overplot.png b/plots/IC5063_x3nl030/18GHz_overplot.png deleted file mode 100644 index c309ccd..0000000 Binary files a/plots/IC5063_x3nl030/18GHz_overplot.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/18GHz_overplot_forced.png b/plots/IC5063_x3nl030/18GHz_overplot_forced.png new file mode 100644 index 0000000..3ec885d Binary files /dev/null and b/plots/IC5063_x3nl030/18GHz_overplot_forced.png differ diff --git a/plots/IC5063_x3nl030/18GHz_overplot_old.png b/plots/IC5063_x3nl030/18GHz_overplot_old.png deleted file mode 100644 index 3db850a..0000000 Binary files a/plots/IC5063_x3nl030/18GHz_overplot_old.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/229GHz_overplot.png b/plots/IC5063_x3nl030/229GHz_overplot.png deleted file mode 100644 index 9b7157a..0000000 Binary files a/plots/IC5063_x3nl030/229GHz_overplot.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/229GHz_overplot_forced.png b/plots/IC5063_x3nl030/229GHz_overplot_forced.png new file mode 100644 index 0000000..7fc081a Binary files /dev/null and b/plots/IC5063_x3nl030/229GHz_overplot_forced.png differ diff --git a/plots/IC5063_x3nl030/229GHz_overplot_old.png b/plots/IC5063_x3nl030/229GHz_overplot_old.png deleted file mode 100644 index d35284c..0000000 Binary files a/plots/IC5063_x3nl030/229GHz_overplot_old.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/24GHz_overplot.png b/plots/IC5063_x3nl030/24GHz_overplot.png deleted file mode 100644 index 77c7183..0000000 Binary files a/plots/IC5063_x3nl030/24GHz_overplot.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/24GHz_overplot_forced.png b/plots/IC5063_x3nl030/24GHz_overplot_forced.png new file mode 100644 index 0000000..be15a8a Binary files /dev/null and b/plots/IC5063_x3nl030/24GHz_overplot_forced.png differ diff --git a/plots/IC5063_x3nl030/24GHz_overplot_old.png b/plots/IC5063_x3nl030/24GHz_overplot_old.png deleted file mode 100644 index f11c11f..0000000 Binary files a/plots/IC5063_x3nl030/24GHz_overplot_old.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/357GHz_overplot.png b/plots/IC5063_x3nl030/357GHz_overplot.png deleted file mode 100644 index a3df94b..0000000 Binary files a/plots/IC5063_x3nl030/357GHz_overplot.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/357GHz_overplot_forced.png b/plots/IC5063_x3nl030/357GHz_overplot_forced.png new file mode 100644 index 0000000..5afbbbd Binary files /dev/null and b/plots/IC5063_x3nl030/357GHz_overplot_forced.png differ diff --git a/plots/IC5063_x3nl030/357GHz_overplot_old.png b/plots/IC5063_x3nl030/357GHz_overplot_old.png deleted file mode 100644 index 1e13344..0000000 Binary files a/plots/IC5063_x3nl030/357GHz_overplot_old.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/IC5063.png b/plots/IC5063_x3nl030/IC5063.png index 6d92f92..2136682 100644 Binary files a/plots/IC5063_x3nl030/IC5063.png and b/plots/IC5063_x3nl030/IC5063.png differ diff --git a/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020.png b/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020.png index 988c06f..2a712b9 100644 Binary files a/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020.png and b/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020.png differ diff --git a/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_I.png b/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_I.png index de5ed00..e0717f8 100644 Binary files a/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_I.png and b/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_I.png differ diff --git a/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_I_err.png b/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_I_err.png index 7265a4d..43425e1 100644 Binary files a/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_I_err.png and b/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_I_err.png differ diff --git a/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_P.png b/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_P.png index 14b1e83..2893115 100644 Binary files a/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_P.png and b/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_P.png differ diff --git a/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_PA.png b/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_PA.png index 876da37..19ba1b4 100644 Binary files a/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_PA.png and b/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_PA.png differ diff --git a/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_P_err.png b/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_P_err.png index 18110ff..5d5c616 100644 Binary files a/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_P_err.png and b/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_P_err.png differ diff --git a/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_P_flux.png b/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_P_flux.png index 5af2ef3..e9024bf 100644 Binary files a/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_P_flux.png and b/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_P_flux.png differ diff --git a/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_SNRi.png b/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_SNRi.png index 6bd9057..e577d0e 100644 Binary files a/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_SNRi.png and b/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_SNRi.png differ diff --git a/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_SNRp.png b/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_SNRp.png index 771f692..c321c2e 100644 Binary files a/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_SNRp.png and b/plots/IC5063_x3nl030/IC5063_FOC_combine_FWHM020_SNRp.png differ diff --git a/plots/IC5063_x3nl030/IC5063_FOC_errors_histograms.png b/plots/IC5063_x3nl030/IC5063_FOC_errors_histograms.png index 5653595..e868239 100644 Binary files a/plots/IC5063_x3nl030/IC5063_FOC_errors_histograms.png and b/plots/IC5063_x3nl030/IC5063_FOC_errors_histograms.png differ diff --git a/plots/IC5063_x3nl030/IC5063_diffusion.png b/plots/IC5063_x3nl030/IC5063_diffusion.png new file mode 100644 index 0000000..80f34b7 Binary files /dev/null and b/plots/IC5063_x3nl030/IC5063_diffusion.png differ diff --git a/plots/IC5063_x3nl030/IC5063_dustlane.png b/plots/IC5063_x3nl030/IC5063_dustlane.png new file mode 100644 index 0000000..51f4219 Binary files /dev/null and b/plots/IC5063_x3nl030/IC5063_dustlane.png differ diff --git a/plots/IC5063_x3nl030/IC5063_jet.png b/plots/IC5063_x3nl030/IC5063_jet.png new file mode 100644 index 0000000..043ab8e Binary files /dev/null and b/plots/IC5063_x3nl030/IC5063_jet.png differ diff --git a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010.png b/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010.png deleted file mode 100644 index ad46f52..0000000 Binary files a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010_I.png b/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010_I.png deleted file mode 100644 index 8f7fa8d..0000000 Binary files a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010_I.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010_IQU.png b/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010_IQU.png deleted file mode 100644 index b48d053..0000000 Binary files a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010_IQU.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010_I_err.png b/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010_I_err.png deleted file mode 100644 index 09cf6a5..0000000 Binary files a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010_I_err.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010_P.png b/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010_P.png deleted file mode 100644 index 911e2a6..0000000 Binary files a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010_P.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010_PA.png b/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010_PA.png deleted file mode 100644 index 7ebf115..0000000 Binary files a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010_PA.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010_P_err.png b/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010_P_err.png deleted file mode 100644 index 60d8fc9..0000000 Binary files a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010_P_err.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010_P_flux.png b/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010_P_flux.png deleted file mode 100644 index 9aa0cba..0000000 Binary files a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010_P_flux.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010_SNRi.png b/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010_SNRi.png deleted file mode 100644 index 8273d22..0000000 Binary files a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010_SNRi.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010_SNRp.png b/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010_SNRp.png deleted file mode 100644 index e45ecc8..0000000 Binary files a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM010_SNRp.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020.png b/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020.png deleted file mode 100644 index 107c79d..0000000 Binary files a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020_I.png b/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020_I.png deleted file mode 100644 index 068ce17..0000000 Binary files a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020_I.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020_IQU.png b/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020_IQU.png deleted file mode 100644 index bafac75..0000000 Binary files a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020_IQU.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020_I_err.png b/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020_I_err.png deleted file mode 100644 index 6d5cb7b..0000000 Binary files a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020_I_err.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020_P.png b/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020_P.png deleted file mode 100644 index db103eb..0000000 Binary files a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020_P.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020_PA.png b/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020_PA.png deleted file mode 100644 index 76798e0..0000000 Binary files a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020_PA.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020_P_err.png b/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020_P_err.png deleted file mode 100644 index 4e3fc81..0000000 Binary files a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020_P_err.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020_P_flux.png b/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020_P_flux.png deleted file mode 100644 index 6efeda3..0000000 Binary files a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020_P_flux.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020_SNRi.png b/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020_SNRi.png deleted file mode 100644 index 3871be8..0000000 Binary files a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020_SNRi.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020_SNRp.png b/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020_SNRp.png deleted file mode 100644 index 0ae17af..0000000 Binary files a/plots/IC5063_x3nl030/IC5063_old_FOC_combine_FWHM020_SNRp.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/IC5063_old_FOC_errors_POL0_background_location.png b/plots/IC5063_x3nl030/IC5063_old_FOC_errors_POL0_background_location.png deleted file mode 100644 index cd23c89..0000000 Binary files a/plots/IC5063_x3nl030/IC5063_old_FOC_errors_POL0_background_location.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/IC5063_old_FOC_errors_background_flux.png b/plots/IC5063_x3nl030/IC5063_old_FOC_errors_background_flux.png deleted file mode 100644 index e7af59a..0000000 Binary files a/plots/IC5063_x3nl030/IC5063_old_FOC_errors_background_flux.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/IC5063_old_FOC_errors_background_location.png b/plots/IC5063_x3nl030/IC5063_old_FOC_errors_background_location.png deleted file mode 100644 index 12bc59d..0000000 Binary files a/plots/IC5063_x3nl030/IC5063_old_FOC_errors_background_location.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/IC5063_polang.png b/plots/IC5063_x3nl030/IC5063_polang.png index f5631d1..3a6aa8e 100644 Binary files a/plots/IC5063_x3nl030/IC5063_polang.png and b/plots/IC5063_x3nl030/IC5063_polang.png differ diff --git a/plots/IC5063_x3nl030/IC5063_poldeg.png b/plots/IC5063_x3nl030/IC5063_poldeg.png index 60c242d..1e5a2c8 100644 Binary files a/plots/IC5063_x3nl030/IC5063_poldeg.png and b/plots/IC5063_x3nl030/IC5063_poldeg.png differ diff --git a/plots/IC5063_x3nl030/IC5063_polflux.png b/plots/IC5063_x3nl030/IC5063_polflux.png index e55664e..8e99c44 100644 Binary files a/plots/IC5063_x3nl030/IC5063_polflux.png and b/plots/IC5063_x3nl030/IC5063_polflux.png differ diff --git a/plots/IC5063_x3nl030/IC5063_regions.png b/plots/IC5063_x3nl030/IC5063_regions.png new file mode 100644 index 0000000..f226298 Binary files /dev/null and b/plots/IC5063_x3nl030/IC5063_regions.png differ diff --git a/plots/IC5063_x3nl030/IC5063_regions.xcf b/plots/IC5063_x3nl030/IC5063_regions.xcf new file mode 100644 index 0000000..cec195f Binary files /dev/null and b/plots/IC5063_x3nl030/IC5063_regions.xcf differ diff --git a/plots/IC5063_x3nl030/IC5063_totalflux.png b/plots/IC5063_x3nl030/IC5063_totalflux.png index 679f6cb..4fd2cd6 100644 Binary files a/plots/IC5063_x3nl030/IC5063_totalflux.png and b/plots/IC5063_x3nl030/IC5063_totalflux.png differ diff --git a/plots/IC5063_x3nl030/IC5063_wind1.png b/plots/IC5063_x3nl030/IC5063_wind1.png new file mode 100644 index 0000000..9b9a4a0 Binary files /dev/null and b/plots/IC5063_x3nl030/IC5063_wind1.png differ diff --git a/plots/IC5063_x3nl030/IC5063_wind2.png b/plots/IC5063_x3nl030/IC5063_wind2.png new file mode 100644 index 0000000..4190436 Binary files /dev/null and b/plots/IC5063_x3nl030/IC5063_wind2.png differ diff --git a/plots/IC5063_x3nl030/IR_overplot.png b/plots/IC5063_x3nl030/IR_overplot.png deleted file mode 100644 index 98c9529..0000000 Binary files a/plots/IC5063_x3nl030/IR_overplot.png and /dev/null differ diff --git a/plots/IC5063_x3nl030/IR_overplot_forced.png b/plots/IC5063_x3nl030/IR_overplot_forced.png new file mode 100644 index 0000000..3466813 Binary files /dev/null and b/plots/IC5063_x3nl030/IR_overplot_forced.png differ diff --git a/plots/IC5063_x3nl030/IR_overplot_old.png b/plots/IC5063_x3nl030/IR_overplot_old.png deleted file mode 100644 index 4019125..0000000 Binary files a/plots/IC5063_x3nl030/IR_overplot_old.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068.png b/plots/NGC1068_x274020/NGC1068.png index 4c5a774..22e1aa1 100644 Binary files a/plots/NGC1068_x274020/NGC1068.png and b/plots/NGC1068_x274020/NGC1068.png differ diff --git a/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_I.png b/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_I.png index 1a4bba4..919da5a 100644 Binary files a/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_I.png and b/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_I.png differ diff --git a/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_I_err.png b/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_I_err.png index 540e1b9..1a08a59 100644 Binary files a/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_I_err.png and b/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_I_err.png differ diff --git a/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_P.png b/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_P.png index 3a2f869..964ade1 100644 Binary files a/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_P.png and b/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_P.png differ diff --git a/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_PA.png b/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_PA.png index 6df1cab..d4ef84e 100644 Binary files a/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_PA.png and b/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_PA.png differ diff --git a/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_P_err.png b/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_P_err.png index d90c713..d4efbcf 100644 Binary files a/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_P_err.png and b/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_P_err.png differ diff --git a/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_P_flux.png b/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_P_flux.png index c7ecbc5..6bb75a4 100644 Binary files a/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_P_flux.png and b/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_P_flux.png differ diff --git a/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_SNRi.png b/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_SNRi.png index fb4de60..c0ae1cd 100644 Binary files a/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_SNRi.png and b/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_SNRi.png differ diff --git a/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_SNRp.png b/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_SNRp.png index 198e964..7005ff0 100644 Binary files a/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_SNRp.png and b/plots/NGC1068_x274020/NGC1068_FOC_combine_FWHM020_SNRp.png differ diff --git a/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px.png b/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px.png deleted file mode 100644 index fb501ab..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px_I.png b/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px_I.png deleted file mode 100644 index a8a79d0..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px_I.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px_IQU.png b/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px_IQU.png deleted file mode 100644 index 4f663a0..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px_IQU.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px_I_err.png b/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px_I_err.png deleted file mode 100644 index 2a925fc..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px_I_err.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px_P.png b/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px_P.png deleted file mode 100644 index 0d834aa..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px_P.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px_PA.png b/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px_PA.png deleted file mode 100644 index 6c002d5..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px_PA.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px_P_err.png b/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px_P_err.png deleted file mode 100644 index b269ba5..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px_P_err.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px_P_flux.png b/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px_P_flux.png deleted file mode 100644 index 4e2ae83..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px_P_flux.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px_SNRi.png b/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px_SNRi.png deleted file mode 100644 index a23816b..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px_SNRi.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px_SNRp.png b/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px_SNRp.png deleted file mode 100644 index 8c6117d..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_K_FOC_bin10px_SNRp.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_K_FOC_errors_POL0_background_location.png b/plots/NGC1068_x274020/NGC1068_K_FOC_errors_POL0_background_location.png deleted file mode 100644 index 6b47622..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_K_FOC_errors_POL0_background_location.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_K_FOC_errors_background_flux.png b/plots/NGC1068_x274020/NGC1068_K_FOC_errors_background_flux.png deleted file mode 100644 index 2002723..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_K_FOC_errors_background_flux.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_K_FOC_errors_background_location.png b/plots/NGC1068_x274020/NGC1068_K_FOC_errors_background_location.png deleted file mode 100644 index e1e7a3f..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_K_FOC_errors_background_location.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_K_FOC_errors_histograms.png b/plots/NGC1068_x274020/NGC1068_K_FOC_errors_histograms.png deleted file mode 100644 index 003b43c..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_K_FOC_errors_histograms.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_K_comparison.png b/plots/NGC1068_x274020/NGC1068_K_comparison.png index c4bea69..c1b57d8 100644 Binary files a/plots/NGC1068_x274020/NGC1068_K_comparison.png and b/plots/NGC1068_x274020/NGC1068_K_comparison.png differ diff --git a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010.png b/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010.png deleted file mode 100644 index e66dbd1..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010_I.png b/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010_I.png deleted file mode 100644 index 05d0f1c..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010_I.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010_IQU.png b/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010_IQU.png deleted file mode 100644 index 11adb9b..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010_IQU.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010_I_err.png b/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010_I_err.png deleted file mode 100644 index ef10d47..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010_I_err.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010_P.png b/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010_P.png deleted file mode 100644 index 1f2c299..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010_P.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010_PA.png b/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010_PA.png deleted file mode 100644 index 8c0657f..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010_PA.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010_P_err.png b/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010_P_err.png deleted file mode 100644 index 2cdb8c7..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010_P_err.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010_P_flux.png b/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010_P_flux.png deleted file mode 100644 index 6d89bc0..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010_P_flux.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010_SNRi.png b/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010_SNRi.png deleted file mode 100644 index 4c1d80a..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010_SNRi.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010_SNRp.png b/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010_SNRp.png deleted file mode 100644 index c76a648..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM010_SNRp.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020.png b/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020.png deleted file mode 100644 index 65a38b3..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020_I.png b/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020_I.png deleted file mode 100644 index 386ba50..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020_I.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020_IQU.png b/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020_IQU.png deleted file mode 100644 index 5b6aa42..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020_IQU.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020_I_err.png b/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020_I_err.png deleted file mode 100644 index 9f8e417..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020_I_err.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020_P.png b/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020_P.png deleted file mode 100644 index 0a53d40..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020_P.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020_PA.png b/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020_PA.png deleted file mode 100644 index 2c8d0f4..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020_PA.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020_P_err.png b/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020_P_err.png deleted file mode 100644 index d4cc521..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020_P_err.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020_P_flux.png b/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020_P_flux.png deleted file mode 100644 index 29bce8f..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020_P_flux.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020_SNRi.png b/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020_SNRi.png deleted file mode 100644 index 8c80ee7..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020_SNRi.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020_SNRp.png b/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020_SNRp.png deleted file mode 100644 index c8aab6f..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_old_FOC_combine_FWHM020_SNRp.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_old_FOC_errors_POL0_background_location.png b/plots/NGC1068_x274020/NGC1068_old_FOC_errors_POL0_background_location.png deleted file mode 100644 index d974e7e..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_old_FOC_errors_POL0_background_location.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_old_FOC_errors_background_flux.png b/plots/NGC1068_x274020/NGC1068_old_FOC_errors_background_flux.png deleted file mode 100644 index 5c6db92..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_old_FOC_errors_background_flux.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_old_FOC_errors_background_location.png b/plots/NGC1068_x274020/NGC1068_old_FOC_errors_background_location.png deleted file mode 100644 index 686fee1..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_old_FOC_errors_background_location.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_old_K_comparison.png b/plots/NGC1068_x274020/NGC1068_old_K_comparison.png deleted file mode 100644 index 0decf46..0000000 Binary files a/plots/NGC1068_x274020/NGC1068_old_K_comparison.png and /dev/null differ diff --git a/plots/NGC1068_x274020/NGC1068_polang.png b/plots/NGC1068_x274020/NGC1068_polang.png index e540509..ca511fa 100644 Binary files a/plots/NGC1068_x274020/NGC1068_polang.png and b/plots/NGC1068_x274020/NGC1068_polang.png differ diff --git a/plots/NGC1068_x274020/NGC1068_poldeg.png b/plots/NGC1068_x274020/NGC1068_poldeg.png index f73b67b..4470699 100644 Binary files a/plots/NGC1068_x274020/NGC1068_poldeg.png and b/plots/NGC1068_x274020/NGC1068_poldeg.png differ diff --git a/plots/NGC1068_x274020/NGC1068_polflux.png b/plots/NGC1068_x274020/NGC1068_polflux.png index 5de6f8b..1057110 100644 Binary files a/plots/NGC1068_x274020/NGC1068_polflux.png and b/plots/NGC1068_x274020/NGC1068_polflux.png differ diff --git a/plots/NGC1068_x274020/NGC1068_totalflux.png b/plots/NGC1068_x274020/NGC1068_totalflux.png index 80272ad..d3f97ba 100644 Binary files a/plots/NGC1068_x274020/NGC1068_totalflux.png and b/plots/NGC1068_x274020/NGC1068_totalflux.png differ diff --git a/src/FOC_reduction.py b/src/FOC_reduction.py index 6b6396d..805828b 100755 --- a/src/FOC_reduction.py +++ b/src/FOC_reduction.py @@ -124,11 +124,11 @@ def main(): display_crop = False # Error estimation error_sub_shape = (15,15) - display_error = True + display_error = False # Data binning rebin = True if rebin: - pxsize = 0.05 + pxsize = 0.10 px_scale = 'arcsec' #pixel, arcsec or full rebin_operation = 'sum' #sum or average # Alignement @@ -136,17 +136,17 @@ def main(): display_data = False # Smoothing smoothing_function = 'combine' #gaussian_after, weighted_gaussian_after, gaussian, weighted_gaussian or combine - smoothing_FWHM = 0.10 #If None, no smoothing is done + smoothing_FWHM = 0.20 #If None, no smoothing is done smoothing_scale = 'arcsec' #pixel or arcsec # Rotation rotate_stokes = True #rotation to North convention can give erroneous results rotate_data = False #rotation to North convention can give erroneous results # Final crop crop = False #Crop to desired ROI - final_display = True + final_display = False # Polarization map output figname = 'NGC1068_FOC' #target/intrument name - figtype = '_combine_FWHM010' #additionnal informations + figtype = '_combine_FWHM020' #additionnal informations SNRp_cut = 5. #P measurments with SNR>3 SNRi_cut = 50. #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 diff --git a/src/comparison_Kishimoto.py b/src/comparison_Kishimoto.py index 6ab6ade..c54ca67 100755 --- a/src/comparison_Kishimoto.py +++ b/src/comparison_Kishimoto.py @@ -20,7 +20,7 @@ data_K = {} data_S = {} for d,i in zip(['I','Q','U','P','PA','sI','sQ','sU','sP','sPA'],[0,1,2,5,8,(3,0,0),(3,1,1),(3,2,2),6,9]): data_K[d] = np.loadtxt(path_join(root_dir_K,d+'.txt')) - with fits.open(path_join(root_dir_data_S,'NGC1068_old_FOC_bin10px.fits')) as f: + with fits.open(path_join(root_dir_data_S,'NGC1068_FOC_bin10px.fits')) as f: if not type(i) is int: data_S[d] = np.sqrt(f[i[0]].data[i[1],i[2]]) else: @@ -110,7 +110,7 @@ print("This pipeline : average sI/I={0:.2f} ; sQ/Q={1:.2f} ; sU/U={2:.2f} ; sP/P print("Kishimoto's pipeline : average sI/I={0:.2f} ; sQ/Q={1:.2f} ; sU/U={2:.2f} ; sP/P={3:.2f}".format(np.mean(data_K['sI'][data_S['mask']]/data_K['I'][data_S['mask']]),np.mean(data_K['sQ'][data_S['mask']]/data_K['Q'][data_S['mask']]),np.mean(data_K['sU'][data_S['mask']]/data_K['U'][data_S['mask']]),np.mean(data_K['sP'][data_S['mask']]/data_K['P'][data_S['mask']]))) for d,i in zip(['I','Q','U','P','PA','sI','sQ','sU','sP','sPA'],[0,1,2,5,8,(3,0,0),(3,1,1),(3,2,2),6,9]): data_K[d] = np.loadtxt(path_join(root_dir_K,d+'.txt')) - with fits.open(path_join(root_dir_data_S,'NGC1068_K_FOC_bin10px.fits')) as f: + with fits.open(path_join(root_dir_data_S,'NGC1068_FOC_bin10px.fits')) as f: if not type(i) is int: data_S[d] = np.sqrt(f[i[0]].data[i[1],i[2]]) else: diff --git a/src/lib/plots.py b/src/lib/plots.py index 1b0e2e8..0109988 100755 --- a/src/lib/plots.py +++ b/src/lib/plots.py @@ -59,8 +59,8 @@ def princ_angle(ang): A = np.array(ang) while np.any(A < 0.): A[A<0.] = A[A<0.]+360. - while np.any(A >= 360.): - A[A>=360.] = A[A>=360.]-360. + while np.any(A >= 180.): + A[A>=180.] = A[A>=180.]-180. if type(ang) == type(A): return A else: @@ -336,7 +336,7 @@ def polarization_map(Stokes, data_mask=None, rectangle=None, SNRp_cut=3., SNRi_c elif display.lower() in ['pa','pang','pol_ang']: # Display polarization degree map display='pa' - vmin, vmax = 0., 360. + vmin, vmax = 0., 180. im = ax.imshow(princ_angle(pang.data), vmin=vmin, vmax=vmax, aspect='equal', cmap='inferno', alpha=1.) cbar = plt.colorbar(im, cax=cbar_ax, label=r"$\theta_P$ [°]") elif display.lower() in ['s_p','pol_err','pol_deg_err']: @@ -674,6 +674,9 @@ class overplot_radio(align_maps): north_dir = AnchoredDirectionArrows(self.ax.transAxes, "E", "N", length=-0.08, fontsize=0.03, loc=1, aspect_ratio=-1, sep_y=0.01, sep_x=0.01, angle=-self.Stokes_UV[0].header['orientat'], color='w', arrow_props={'ec': None, 'fc': 'w', 'alpha': 1,'lw': 2}) self.ax.add_artist(north_dir) + self.cr_map, = self.ax.plot(*self.wcs_map.wcs.crpix, 'r+') + crpix_other = self.wcs_map.world_to_pixel(self.wcs_other.pixel_to_world(*self.wcs_other.wcs.crpix)) + self.cr_other, = self.ax.plot(*crpix_other, 'g+') if not(savename is None): self.fig2.savefig(savename,bbox_inches='tight',dpi=200) @@ -728,7 +731,7 @@ class overplot_pol(align_maps): #Display Stokes I as contours levels_stkI = np.rint(np.linspace(10,99,10))/100.*np.max(stkI.data[stkI.data > 0.]*convert_flux) - cont_stkI = self.ax.contour(stkI.data*convert_flux, transform=self.ax.get_transform(self.wcs_UV), levels=levels_stkI, colors='grey', alpha=0.) + cont_stkI = self.ax.contour(stkI.data*convert_flux, transform=self.ax.get_transform(self.wcs_UV), levels=levels_stkI, colors='grey', alpha=0.5) #self.ax.clabel(cont_stkI, inline=True, fontsize=8) self.ax.autoscale(False) @@ -752,6 +755,8 @@ class overplot_pol(align_maps): cbar_ax = self.fig2.add_axes([0.95, 0.12, 0.01, 0.75]) cbar = plt.colorbar(im, cax=cbar_ax, label=r"$F_{\lambda}$ [$ergs \cdot cm^{-2} \cdot s^{-1} \cdot \AA^{-1}$]") + self.ax.set(xlabel="Right Ascension (J2000)", ylabel="Declination (J2000)", title="{0:s} overplotted with polarization vectors and Stokes I contours from HST/FOC".format(obj)) + #Display pixel scale and North direction fontprops = fm.FontProperties(size=16) px_size = self.wcs_UV.wcs.get_cdelt()[0]*3600. @@ -760,8 +765,9 @@ class overplot_pol(align_maps): north_dir = AnchoredDirectionArrows(self.ax.transAxes, "E", "N", length=-0.08, fontsize=0.03, loc=1, aspect_ratio=-1, sep_y=0.01, sep_x=0.01, angle=-self.Stokes_UV[0].header['orientat'], color='w', arrow_props={'ec': None, 'fc': 'w', 'alpha': 1,'lw': 2}) self.ax.add_artist(north_dir) - - self.ax.set(xlabel="Right Ascension (J2000)", ylabel="Declination (J2000)", title="{0:s} overplotted with polarization vectors and Stokes I contours from HST/FOC".format(obj)) + self.cr_map, = self.ax.plot(*self.wcs_map.wcs.crpix, 'r+') + crpix_other = self.wcs_map.world_to_pixel(self.wcs_other.pixel_to_world(*self.wcs_other.wcs.crpix)) + self.cr_other, = self.ax.plot(*crpix_other, 'g+') if not(savename is None): self.fig2.savefig(savename,bbox_inches='tight',dpi=200) @@ -1744,7 +1750,7 @@ class pol_map(object): label = r"$P$ [%]" elif self.display_selection.lower() in ['pol_ang']: self.data = princ_angle(self.PA) - vmin, vmax = 0, 360. + vmin, vmax = 0, 180. label = r"$\theta_{P}$ [°]" elif self.display_selection.lower() in ['snri']: s_I = np.sqrt(self.IQU_cov[0,0]) @@ -1833,7 +1839,7 @@ class pol_map(object): P_cut = np.sqrt(Q_cut**2+U_cut**2)/I_cut P_cut_err = np.sqrt((Q_cut**2*Q_cut_err**2 + U_cut**2*U_cut_err**2 + 2.*Q_cut*U_cut*QU_cut_err)/(Q_cut**2 + U_cut**2) + ((Q_cut/I_cut)**2 + (U_cut/I_cut)**2)*I_cut_err**2 - 2.*(Q_cut/I_cut)*IQ_cut_err - 2.*(U_cut/I_cut)*IU_cut_err)/I_cut - PA_cut = 360.-princ_angle(np.degrees((1./2.)*np.arctan2(U_cut,Q_cut))) + PA_cut = princ_angle(np.degrees((1./2.)*np.arctan2(U_cut,Q_cut))) PA_cut_err = princ_angle(np.degrees((1./(2.*(Q_cut**2+U_cut**2)))*np.sqrt(U_cut**2*Q_cut_err**2 + Q_cut**2*U_cut_err**2 - 2.*Q_cut*U_cut*QU_cut_err))) else: @@ -1858,7 +1864,7 @@ class pol_map(object): P_reg = np.sqrt(Q_reg**2+U_reg**2)/I_reg P_reg_err = np.sqrt((Q_reg**2*Q_reg_err**2 + U_reg**2*U_reg_err**2 + 2.*Q_reg*U_reg*QU_reg_err)/(Q_reg**2 + U_reg**2) + ((Q_reg/I_reg)**2 + (U_reg/I_reg)**2)*I_reg_err**2 - 2.*(Q_reg/I_reg)*IQ_reg_err - 2.*(U_reg/I_reg)*IU_reg_err)/I_reg - PA_reg = 360.-princ_angle((90./np.pi)*np.arctan2(U_reg,Q_reg)) + PA_reg = princ_angle((90./np.pi)*np.arctan2(U_reg,Q_reg)) PA_reg_err = (90./(np.pi*(Q_reg**2+U_reg**2)))*np.sqrt(U_reg**2*Q_reg_err**2 + Q_reg**2*U_reg_err**2 - 2.*Q_reg*U_reg*QU_reg_err) new_cut = np.logical_and(self.region, self.cut) diff --git a/src/lib/reduction.py b/src/lib/reduction.py index e019fcc..c009911 100755 --- a/src/lib/reduction.py +++ b/src/lib/reduction.py @@ -80,8 +80,8 @@ def princ_angle(ang): A = np.array(ang) while np.any(A < 0.): A[A<0.] = A[A<0.]+360. - while np.any(A >= 360.): - A[A>=360.] = A[A>=360.]-360. + while np.any(A >= 180.): + A[A>=180.] = A[A>=180.]-180. if type(ang) == type(A): return A else: @@ -480,7 +480,6 @@ def get_error_hist(data_array, headers, error_array=None, data_mask=None, date_time = np.array([datetime.strptime(d,'%Y-%m-%d;%H:%M:%S') for d in date_time]) for i, image in enumerate(data): - filt_obs[headers[i]['filtnam1']] += 1 #Compute the Count-rate histogram for the image n_mask = np.logical_and(mask,image>0.) @@ -499,9 +498,10 @@ def get_error_hist(data_array, headers, error_array=None, data_mask=None, #bkg = np.percentile(image[image 0.])) C = overplot_radio(Stokes_UV, Stokes_103GHz) -C.plot(levels=levels103GHz, SNRp_cut=3.0, SNRi_cut=30.0, savename='../plots/IC5063_x3nl030/103GHz_overplot_old.png') +C.plot(levels=levels103GHz, SNRp_cut=2.0, SNRi_cut=15.0, savename='../plots/IC5063_x3nl030/103GHz_overplot_forced.png') levels229GHz = np.linspace(1,99,11)/100.*np.max(deepcopy(Stokes_229GHz[0].data[Stokes_229GHz[0].data > 0.])) D = overplot_radio(Stokes_UV, Stokes_229GHz) -D.plot(levels=levels229GHz, SNRp_cut=3.0, SNRi_cut=30.0, savename='../plots/IC5063_x3nl030/229GHz_overplot_old.png') +D.plot(levels=levels229GHz, SNRp_cut=2.0, SNRi_cut=15.0, savename='../plots/IC5063_x3nl030/229GHz_overplot_forced.png') levels357GHz = np.linspace(1,99,11)/100.*np.max(deepcopy(Stokes_357GHz[0].data[Stokes_357GHz[0].data > 0.])) E = overplot_radio(Stokes_UV, Stokes_357GHz) -E.plot(levels=levels357GHz, SNRp_cut=3.0, SNRi_cut=30.0, savename='../plots/IC5063_x3nl030/357GHz_overplot_old.png') +E.plot(levels=levels357GHz, SNRp_cut=2.0, SNRi_cut=15.0, savename='../plots/IC5063_x3nl030/357GHz_overplot_forced.png') #F = overplot_pol(Stokes_UV, Stokes_S2) -#F.plot(SNRp_cut=3.0, SNRi_cut=80.0, savename='../plots/IC5063_x3nl030/S2_overplot_old.png', norm=LogNorm(vmin=5e-20,vmax=5e-18)) +#F.plot(SNRp_cut=3.0, SNRi_cut=80.0, savename='../plots/IC5063_x3nl030/S2_overplot_forced.png', norm=LogNorm(vmin=5e-20,vmax=5e-18)) G = overplot_pol(Stokes_UV, Stokes_IR, cmap='inferno') -G.plot(SNRp_cut=3.0, SNRi_cut=30.0, savename='../plots/IC5063_x3nl030/IR_overplot_old.png', norm=LogNorm(vmin=1e-17,vmax=5e-15), cmap='inferno_r') +G.plot(SNRp_cut=2.0, SNRi_cut=15.0, savename='../plots/IC5063_x3nl030/IR_overplot_forced.png', norm=LogNorm(vmin=1e-17,vmax=5e-15), cmap='inferno_r') #data_folder1 = "../data/M87/POS1/" #plots_folder1 = "../plots/M87/POS1/"