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

Jean-Philippe Bernard
2 parents af3a1896 20e6a28c
Showing 4 changed files with 26 additions and 27 deletions Show diff stats
src/idl/dustem_plugin_mbbdy.pro
src/idl/dustem_write_fits_table.pro
src/idl/dustemwrap_plot.pro
src/idl/dustemwrap_plot_noobj.pro
@@ -42,7 +42,7 @@ ENDIF
  
 ;default values of input parameters
 amp = 0.5 ; Amplitude of the modified black-body emission  
-temp = 19 ; Temperature of the dust species
+temp = 20.0 ; Temperature of the dust
 beta = 1.8 ; Emissivity index
  
 w0=100. ; Theoretical wavelength (3THz) where optical depth equals unity
@@ -53,7 +53,7 @@ smallp=0.
 psi=0.
  
 scope='ADD_SED+ADD_POLSED'
-paramtag=['Amp','T_MBB (K)','beta (Plaw_index)','p','Psi (deg)']
+paramtag=['Amp',textoidl('T_{MBB}')+' [K]',textoidl('\beta'),'p','Psi [deg]']
  
 IF keyword_set(key) THEN BEGIN 
  
@@ -55,19 +55,16 @@ IF keyword_set(help) THEN BEGIN
 ENDIF
  
 ;===== run dustem to get predicted spectrum and sed
-IF ptr_valid((*!dustem_data).sed) THEN BEGIN
-	stop
+IF ptr_valid((*!dustem_data).sed) THEN $
 	dustem_predicted_sed=dustem_compute_sed(*(*!dustem_fit).current_param_values,out_st=dustem_spectra_st)
-ENDIF ELSE BEGIN
-ENDELSE
  
 IF !run_pol THEN BEGIN
 ;This is needed to compute Q,U of both SED and spectra
-   toto=dustem_compute_stokes(*(*!dustem_fit).current_param_values, $
+   dustem_predicted_polsed=dustem_compute_stokes(*(*!dustem_fit).current_param_values,bidon, $
                                                  Q_spec=dustem_predicted_Q_spec,U_spec=dustem_predicted_U_spec,PSI_spec=dustem_predicted_PSI_spec, $
-                                                 dustem_psi_em=dustem_psi_em)
-   	dustem_predicted_Qsed=toto[0]
-    dustem_predicted_Used=toto[1]
+                                                 dustem_psi_em,out_st=out_st)
+   dustem_predicted_Qsed=dustem_predicted_polsed[0]
+   dustem_predicted_Used=dustem_predicted_polsed[1]
 ;Same in extinction, but does not work in polarization extinction was not fitted.
 ;   dustem_predicted_polext=dustem_compute_stokext(*(*!dustem_fit).current_param_values,bidon, $
 ;											  dustem_predicted_Qext,dustem_predicted_Uext, $
@@ -188,7 +188,7 @@ if isa((*!dustem_data).sed) then begin
 ;Leaving as is.
  
 ;JPB: need here to store values of current parameter values (including plugins) into !iteration_mouchard
-    help,(*!dustem_fit).CURRENT_PARAM_VALUES   ;This is not currently filled up ...
+;    help,(*!dustem_fit).CURRENT_PARAM_VALUES   ;This is not currently filled up ...
  
 ;Below will work only for non plugin parameters
     goto,skip1
@@ -92,32 +92,33 @@ END
 ;This is also necessary for the plotting of the results of the fit (Last iteration) 
 IF not keyword_set(st) THEN BEGIN
   ;Activation of the plugins is needed because of the plotting of the total emission model that includes them. 
-  dustem_activate_plugins,p_dim/(*(*!dustem_fit).param_init_values),st  ; 0/0 division case?
+  dustem_activate_plugins,p_dim/(*(*!dustem_fit).param_init_values),st=st  ; 0/0 division case?
  
   ;# Emission
   ;if isa(!dustem_data.sed) then begin ;using !dustem_data instead of !dustem_show because in this release the user is compelled to fit IQU whether in M or X
   if not keyword_set(dustem_sed) and isa((*!dustem_data).sed) then begin ;better test?
  
-      dustem_sed = dustem_compute_sed(p_dim,st,SED_spec)
+      dustem_sed = dustem_compute_sed(p_dim,st=st,SED_spec=SED_spec)
  
       if !run_pol && !run_lin then begin
-          
-          dustem_polsed = dustem_compute_polsed(p_dim,st,P_spec,SP_spec,dustem_polfrac)
-          toto = dustem_compute_stokes(p_dim,st,dustem_qsed,dustem_used,Q_spec,U_spec,PSI_spec,dustem_psi_em) 
+         dustem_polsed = dustem_compute_polsed(p_dim,st=st,P_spec=P_spec,SP_spec=SP_spec,dustem_polfrac=dustem_polfrac)
+; the following call need to change to include out instead of dustem_qsed/dustem_used?
+         toto = dustem_compute_stokes(p_dim,st=st,dustem_qsed,dustem_used,Q_spec=Q_spec,U_spec=U_spec,PSI_spec=PSI_spec,dustem_psi_em=dustem_psi_em) 
  
-          
       endif         
   endif
  
   ;# Extinction
 ;   if isa(!dustem_data.ext) then begin
   if not keyword_set(dustem_ext) and isa((*!dustem_data).ext) then begin
-      dustem_ext = dustem_compute_ext(p_dim,st,EXT_spec)
+      dustem_ext = dustem_compute_ext(p_dim,st=st,EXT_spec=EXT_spec)
  
       if !run_pol && !run_lin then begin
  
-          dustem_polext = dustem_compute_polext(p_dim,st,POLEXT_spec,SPEXT_spec,dustem_fpolext)
-          toto = dustem_compute_stokext(p_dim,st,dustem_qext,dustem_uext,QEXT_spec,UEXT_spec,PSIEXT_spec,dustem_psi_ext) 
+; the following call need to change to include out instead of dustem_fpolext?
+          dustem_polext = dustem_compute_polext(p_dim,st=st,polext_spec=POLEXT_spec,spext_spec=SPEXT_spec,dustem_fpolext)
+; the following call need to change to include out instead of QEXT/UEXT-spec?
+          toto = dustem_compute_stokext(p_dim,st=st,dustem_qext,dustem_uext,QEXT_spec=QEXT_spec,UEXT_spec=UEXT_spec,PSIEXT_spe=PSIEXT_spec,dustem_psi_ext=dustem_psi_ext) 
  
       endif
   endif
@@ -128,12 +129,13 @@ ENDIF ELSE BEGIN ;st is provided
     ;# Emission
     ;if isa(!dustem_data.sed) then begin
     if not keyword_set(dustem_sed) and isa((*!dustem_data).sed) then begin
-        dustem_sed = dustem_compute_sed(p_dim,st,SED_spec)
+        dustem_sed = dustem_compute_sed(p_dim,st=st,SED_spec=SED_spec)
  
         if !run_pol && !run_lin then begin
  
-            dustem_polsed = dustem_compute_polsed(p_dim,st,P_spec,SP_spec,dustem_polfrac)
-            toto = dustem_compute_stokes(p_dim,st,dustem_qsed,dustem_used,Q_spec,U_spec,PSI_spec,dustem_psi_em) 
+            dustem_polsed = dustem_compute_polsed(p_dim,st=st,P_spec=P_spec,SP_spec=SP_spec,dustem_polfrac=dustem_polfrac)
+; the following call need to change to include out instead of dustem_q/used?
+            toto = dustem_compute_stokes(p_dim,st=st,dustem_qsed,dustem_used,Q_spec=Q_spec,U_spec=U_spec,PSI_spec=PSI_spec,dustem_psi_em=dustem_psi_em) 
             ;stop    
         endif
     endif
@@ -143,12 +145,12 @@ ENDIF ELSE BEGIN ;st is provided
  
     if not keyword_set(dustem_ext) and isa((*!dustem_data).ext) then begin
  
-        dustem_ext = dustem_compute_ext(p_dim,st,EXT_spec)
+        dustem_ext = dustem_compute_ext(p_dim,st=st,EXT_spec=EXT_spec)
  
         if !run_pol && !run_lin then begin
  
-            dustem_polext = dustem_compute_polext(p_dim,st,POLEXT_spec,SPEXT_spec,dustem_fpolext)
-            toto = dustem_compute_stokext(p_dim,st,dustem_qext,dustem_uext,QEXT_spec,UEXT_spec,PSIEXT_spec,dustem_psi_ext) 
+            dustem_polext = dustem_compute_polext(p_dim,st=st,POLEXT_spec=POLEXT_spec,SPEXT_spec=SPEXT_spec,dustem_fpolext)
+            toto = dustem_compute_stokext(p_dim,st=st,dustem_qext,dustem_uext,QEXT_spec=QEXT_spec,UEXT_spec=UEXT_spec,PSIEXT_spec=PSIEXT_spec,dustem_psi_ext=dustem_psi_ext) 
  
         endif
     endif
@@ -176,7 +178,7 @@ new_mouchard.rchi2=(*!dustem_fit).rchi2
 ;Leaving as is.
  
 ;JPB: need here to store values of current parameter values (including plugins) into !iteration_mouchard
-help,(*!dustem_fit).CURRENT_PARAM_VALUES   ;This is not currently filled up ...
+;help,(*!dustem_fit).CURRENT_PARAM_VALUES   ;This is not currently filled up ...
  
 ;Below will work only for non plugin parameters
 goto,skip1