Merge branch 'master' of https://gitlab.irap.omp.eu/OV-GSO-DC/dustem-wrapper_idl

Ilyes Choubani
2 parents 3ff9cac3 2c7b0963
Showing 6 changed files with 24 additions and 5 deletions Show diff stats
Docs/DustemWrap_development_issues.txt
instrument_description.xcat
src/idl/dustem_init.pro
src/idl/dustem_initialize_sed.pro
src/idl/dustem_plot_fit_sed.pro
src/idl/dustem_sed_plot.pro
@@ -9,3 +9,6 @@
 - JPB, April 8th 2022:
   Dustemwrap causes the Fortran to crash if the chrg keyword is not specified in the initial GRAIN.DAT file, but is subsequently added by the (*!dustem_params).grains[0].TYPE_KEYWORDS. A similar error is likely to occur for the spin keyword (untested).
   We must force these pointers to not be empty just after writing our own GRAIN.DAT in /tmp, in the same way this is done in dustem_init.pro with the GRAIN.DAT from the fortran directory.
+- *FOLLOW UP*: IC, May 15th 2022: A SOLUTION HAS BEEN IMPLEMENTED BY INTRODUCING the 'kwords' 
+;keyword and specifying the necessary population keywords. IE: kwords=['plaw-ed-chrg-spin'] for the first grain population
+;to enable the use of spinning dust. THIS IS NOT AN ISSUE ANYMORE.
 \ No newline at end of file
@@ -81,8 +81,17 @@ NIKA2      NIKA22     2025.892   MJy/sr      nuInu=cste   0.004722222
 IRS        IRS_spec   -32768.    MJy/sr      NULL                                         
 \========= S-PASS ==========
 \information taken from Carretti et al. 2019
-\flux convention does not really matter (narrow band of 8 MHz for 2.3 GHz)
-SPASS      SPASS1     130435     MJy/sr      NULL         0.14833333          5.0
+\flux convention does not really matter (narrow band of 8 MHz for 2.3 GHz). Resoltion is 8.9' (0.148333 deg)
+\ref frequency is actually 2.303 GHz (130174.74 mic)
+SPASS      SPASS1     130174.74  MJy/sr      NULL         0.14833333          5.0
+\========= ZOA-FF (free free from Alves, M. I. R., et al, 2015, MNRAS, 450, 2025) ==========
+\information taken from Alves, M. I. R., et al, 2015, MNRAS, 450, 2025
+\flux convention does not really matter (narrow band of ? MHz for 1.4 GHz)
+CHIPASS    ZOA_FF1    214286.    MJy/sr      NULL         0.24                5.0
+\========= CHI-PASS ==========
+\information taken from Calabretta, M. et al. 2014, PASA, 31, 7
+\flux convention does not really matter (narrow band of ? MHz for 1.4 GHz)
+CHIPASS    CHIPASS1   214286.     MJy/sr      NULL        0.24                5.0
 \========= IRAC ==========
 \resolution taken to be 1.7, 1.7, 1.9, 2" (eg Meixner et al)
 IRAC       IRAC1      3.55000    MJy/sr      IRAC         0.000472222
@@ -282,6 +282,8 @@ defsysv, &#39;!dustem_model&#39;, model
   ENDCASE
 ENDIF
+;stop
+
 ;Initialize !dustem_params structure
 IF not keyword_set(dir) THEN BEGIN
 ;  CASE getenv('DUSTEM_WHICH') OF
@@ -81,6 +81,7 @@ comments=[comments,&#39;sigmaQU: covariance on Stokes Q and U [(MJy/sr)^2]&#39;]
 comments=[comments,'sigma_largep: variance on Polarized Intensity (P) [(MJy/sr)^2]']
 comments=[comments,'sigma_smallp: variance on polarisation fraction (p) []']
 comments=[comments,'sigma_psi: variance on polarisation fraction (psi) [deg^2]']
+comments=[comments,'CAUTION: p, P and psi values are NOT debiased']
 sed=replicate(one_st,Nsed)
@@ -143,8 +143,8 @@ IF keyword_set(ytit) THEN ytit = ytit ELSE ytit = textoidl(&#39;Brightness/N_H (MJy/
 ;###############################
 if keyword_set(fpol) then begin
     if !run_lin then begin
-    cgDisplay, 600, 500
-    cgplot,(*!dustem_data.sed).wav,(*!dustem_data.sed).values/norm,/nodata,xtit='',ytit=ytit,tit='',/ylog,/xlog,/ys,/xs,position=[0.12,0.25,0.96,0.76],xtickformat='(A1)',_extra=_extra,charsize=1.3,/noerase    
+      IF !d.name NE 'PS' THEN cgDisplay, 600, 500
+      cgplot,(*!dustem_data.sed).wav,(*!dustem_data.sed).values/norm,/nodata,xtit='',ytit=ytit,tit='',/ylog,/xlog,/ys,/xs,position=[0.12,0.25,0.96,0.76],xtickformat='(A1)',_extra=_extra,charsize=1.3,/noerase    
     endif
 endif ELSE cgplot,(*!dustem_data.sed).wav,(*!dustem_data.sed).values/norm,/nodata,xtit='',ytit=ytit,tit=title,/ylog,/xlog,/ys,/xs,position=[0.12,0.35,0.96,0.90],xtickformat='(A1)',_extra=_extra,charsize=1.3
 ;###############################
@@ -16,7 +16,11 @@ IF not keyword_set(function_name) THEN BEGIN
   st=out_st
   ;dustem_plot_fit_sed,st,dustem_sed,cont,freefree,synchrotron,_extra=_extra,legend_xpos=legend_xpos,legend_ypos=legend_ypos
   win=1;win-act_wins+1
-  IF keyword_set(ps) THEN dustem_plot_fit_sed,st,dustem_sed,win=win,_extra=_extra,legend_xpos=legend_xpos,legend_ypos=legend_ypos,ps=ps,png=png,use_model=use_model,fpol=fpol ELSE dustem_plot_fit_sed,st,dustem_sed,_extra=_extra,win=win,legend_xpos=legend_xpos,legend_ypos=legend_ypos,use_model=use_model,fpol=fpol
+  IF keyword_set(ps) THEN BEGIN
+    dustem_plot_fit_sed,st,dustem_sed,win=win,_extra=_extra,legend_xpos=legend_xpos,legend_ypos=legend_ypos,ps=ps,png=png,use_model=use_model,fpol=fpol
+  ENDIF ELSE BEGIN
+    dustem_plot_fit_sed,st,dustem_sed,_extra=_extra,win=win,legend_xpos=legend_xpos,legend_ypos=legend_ypos,use_model=use_model,fpol=fpol
+  ENDELSE
   ;I do not understand the reason begind the stop below - either way polarization is handled by other procedures
   IF keyword_set(pol) THEN BEGIN