mise a jour

Jean-Philippe Bernard
1 parent ba6d7415
Showing 12 changed files with 235 additions and 177 deletions Show diff stats
src/idl/dustem_compute_stokext.pro
src/idl/dustem_fit_ext_pol_example.pro
src/idl/dustem_mpfit_run.pro
src/idl/dustem_read_align.pro
src/idl/dustem_read_fits_table.pro
src/idl/dustem_set_plot_range.pro
src/idl/dustem_show_file_dependencies.pro
src/idl/dustem_write_align.pro
src/idl/dustem_write_all_release.pro
src/idl/dustem_write_grain_lv.pro
src/idl/dustemwrap_plot.pro
src/idl/dustemwrap_plot_noobj.pro
@@ -81,6 +81,7 @@ degtorad = !pi/180
  
  
 EXT_spec = st.ext.ext_tot * (*!dustem_HCD)/1.e21     ;This is Total extinction (for a default value of 10^20 NH/cm^2)
+;stop
 POLEXT_spec = st.polext.ext_tot * (*!dustem_HCD)/1.e21   ;This is Polarized extinction
  
 ;Hard-coded test to set to zero potential negative values in the polarized extinction arrays:
@@ -188,7 +188,7 @@ dustem_init_params,use_model,pd,iv,fpd=fpd,fiv=fiv,ulimed=ulimed,llimed=llimed,u
      wait,wait
   ENDIF
  
-  stop
+  ;stop
  
 if not keyword_set(ext_file) then begin
 ;== GENERATE THE DATA USING THE MODEL AND TRUE VALUES
@@ -197,7 +197,7 @@ if not keyword_set(ext_file) then begin
    ext.EXT_Q = toto[0]
    ext.EXT_U = toto[1]
  
-   stop
+   ;stop
  
 ;== RESET THE OBSERVATIONAL STRUCTURE
 ;== note that m_fit and m_show do not exist -- this is deliberate
@@ -211,7 +211,7 @@ if not keyword_set(ext_file) then begin
  
 end
  
-stop
+;stop
  
 ;== INFORMATION TO RUN THE FIT
 tol=1.e-10
@@ -225,7 +225,7 @@ yr_fpolext=[1.00E-10,50]
 tit='Dust Optical Depth'
  
 ;===  RUN THE FIT
-stop
+;stop
 t1=systime(0,/sec)
  
 res=dustem_mpfit_data(tol=tol,Nitermax=use_Nitermax,gtol=gtol $
@@ -212,7 +212,7 @@ FOR i_tag=0,count_data_tag-1 DO BEGIN
  
  
   		'QEXT': BEGIN ;UPDATED  
-                
+                ;stop
                 Stokext = dustem_compute_stokext(p_dim,st=st,QEXT_spec=QEXT_spec,UEXT_spec=UEXT_spec,PSIEXT_spec=PSIEXT_spec,dustem_psi_ext=dustem_psi_ext) 
                 dustem_qext = stokext[0]
                 chi2_qext   =total(((*(*!dustem_data).qext).values-dustem_qext)^2/(*(*!dustem_data).qext).sigma^2) 
-FUNCTION dustem_read_align,dir_in,st_grains,silent=silent
-
-;moved to dustem_init.pro
-;defsysv, '!run_circ', 0.  
-;defsysv, '!run_anis', 0.  
-;defsysv, '!run_rrf', 0.    
-;defsysv, '!run_univ', 0.    
-;defsysv, '!run_lin', 0.    
+FUNCTION dustem_read_align,dir_in,st_grains,help=help,silent=silent
+
+;+
+; NAME:
+;   dustem_read_align
+; PURPOSE:
+;   reads the ALIGN.DAT file
+; CATEGORY:
+;    DustEMWrap, Distributed, HighLevel, Initialization
+; CALLING SEQUENCE:
+;   dustem_read_align,dir_in,st_grains[,/help]
+; INPUTS:
+;    dir_in      : input directory where to read the file from
+;    st_grains   : structure describing grain parameters for various grains (usually !dustem.grains)
+; OPTIONAL INPUT PARAMETERS:
+;    None
+; OUTPUTS:
+;    None
+; OPTIONAL OUTPUT PARAMETERS:
+;    None
+; ACCEPTED KEY-WORDS:
+;    silent       : if set, run silent (not used, actually)
+;    help         : writes this help
+; COMMON BLOCKS:
+;    None
+; SIDE EFFECTS:
+;    a File is written
+; RESTRICTIONS:
+;    The DustEM fortran code must be installed
+;    The DustEMWrap idl code must be installed
+; PROCEDURES AND SUBROUTINES USED  
+; EXAMPLES
+; MODIFICATION HISTORY:
+;    Evolution details on the DustEMWrap gitlab.
+;    See http://dustemwrap.irap.omp.eu/ for FAQ and help.  
+;-
+
+IF keyword_set(help) THEN BEGIN
+  doc_library,'dustem_read_align'
+  full_st=-1
+  goto,the_end
+ENDIF
  
 file=dir_in+(*!dustem_inputs).align
 openr,unit,file,/get_lun
@@ -29,11 +63,7 @@ ENDREP UNTIL first_char NE &#39;#&#39;
 key_str=str
  
 IF stregex(key_str, 'lin', /bool) THEN !run_lin = 1
-IF stregex(key_str, 'univ', /bool) THEN BEGIN
-  !run_univ = 1
-  ;stop
-ENDIF
-
+IF stregex(key_str, 'univ', /bool) THEN !run_univ = 1
 IF stregex(key_str, 'circ', /bool) THEN !run_circ = 1
 IF stregex(key_str, 'anis', /bool) THEN !run_anis = 1
 IF stregex(key_str, 'rrf', /bool) THEN !run_rrf = 1
@@ -46,25 +76,19 @@ nalig=nlines-ncurrent
 ;stop
  
 one_st={aligned:0.,law:'',athresh:0.,plev:0.,pstiff:0.,TdsTg:0.,a0:0.,rvcut:0.}
-;Ngrains=st_grains.Ngrains
 Ngrains=n_elements(st_grains)
 st=replicate(one_st,Ngrains)
-;st.aligned = stregex(st_grains.grains.type_keywords, 'pol', /bool) 
-;count=0
  
 is_aligned=stregex(st_grains.type_keywords, 'pol', /bool)
+
 FOR i=0L,Ngrains-1 DO BEGIN
-  ;stop 
-  ;stop
-  ;IF st(i).aligned then begin
   IF is_aligned[i] THEN BEGIN
-    ;stop
     readf,unit,str,format='(A100)'
     strv=str_sep(strcompress(strtrim(str,2)),' ')
     Nstrv=n_elements(strv)
  
     ii=0L
-    st(i).law=strv(ii) & ii=ii+1
+    st(i).law=strv[ii] & ii=ii+1
  
     ; IDG
     IF stregex(st(i).law, 'idg', /bool) THEN BEGIN
@@ -74,83 +98,37 @@ FOR i=0L,Ngrains-1 DO BEGIN
     ENDIF
  
     ; RAT
-    IF stregex(st(i).law, 'rat', /bool) THEN BEGIN
+    IF stregex(st[i].law, 'rat', /bool) THEN BEGIN
     ENDIF
  
     ; PARAMETRIC
-    IF stregex(st(i).law, 'par', /bool) THEN BEGIN
+    IF stregex(st[i].law, 'par', /bool) THEN BEGIN
       ; Grain radius Threshold for alignment, given in microns and converted in cm
-      st[i].athresh = strv(ii) & ii=ii+1
-      st[i].pstiff  = strv(ii) & ii=ii+1
-      st[i].plev    = strv(ii) & ii=ii+1
+      st[i].athresh = strv[ii] & ii=ii+1
+      st[i].pstiff  = strv[ii] & ii=ii+1
+      st[i].plev    = strv[ii] & ii=ii+1
     ENDIF
  
-    st[i].aligned = stregex(st_grains(i).type_keywords, 'pol', /bool)
+    st[i].aligned = stregex(st_grains[i].type_keywords, 'pol', /bool)
     IF !run_univ eq 1 THEN BEGIN
       st = replicate(st(i),Ngrains)
-      ;st.aligned = stregex(st_grains.grains.type_keywords, 'pol', /bool) 
-      st(i).aligned = stregex(st_grains(i).type_keywords, 'pol', /bool)
+      st[i].aligned = stregex(st_grains[i].type_keywords, 'pol', /bool)
       ind=where(is_aligned eq 0)
       st(ind)=one_st
-      ;stop
       break  
     ENDIF
  
   ENDIF
 ENDFOR
  
-; FOR i=0L,st_grains.Ngrains-1 DO BEGIN
-;    IF st(i).aligned then begin
-;         ; if count EQ 0. then begin   
-;          readf,unit,str,format='(A100)'   
-;       ;endif 
-     
-;       	strv=str_sep(strcompress(strtrim(str,2)),' ')
-;       	Nstrv=n_elements(strv)
-
-; 	ii=0L
-;       	st(i).law=strv(ii) & ii=ii+1 
-
-; 	; IDG
-;         IF stregex(st(i).law, 'idg', /bool) THEN begin
-;            ii=ii+1 
-;       		st(i).TdsTg = strv(ii) & ii=ii+1
-;       		st(i).a0    = strv(ii) & ii=ii+1
-;       		st(i).rvcut = strv(ii) & ii=ii+1
-; 	endif
-
-; 	; RAT
-;       	IF stregex(st(i).law, 'rat', /bool) THEN begin
-; 	endif
-
-; 	; PARAMETRIC
-;         IF stregex(st(i).law, 'par', /bool) THEN begin
-;                                 ; Grain radius Threshold for
-;                                 ; alignment, given in microns and
-;                                 ; converted in cm
-;       		st(i).athresh = strv(ii) & ii=ii+1
-;       		st(i).pstiff  = strv(ii) & ii=ii+1
-;                 st(i).plev    = strv(ii) & ii=ii+1
-;                 ; count=1
-; 	endif
-
-;         IF !run_univ eq 1 then begin
-; 		st = replicate(st(i),st_grains.Ngrains)
-;                 st.aligned = stregex(st_grains.grains.type_keywords, 'pol', /bool)
-;                 ;stop
-; 		break
-; 	endif
-       
-    
-       
-;       ENDIF
-
-; ENDFOR
-
 close,unit
 free_lun,unit
  
 full_st={keywords:key_str,anisG0:anisG0,gamma:0,grains:st}
+
+
+the_end:
+
 RETURN,full_st
  
  
-PRO dustem_read_fits_table,filename=filename,dustem_st=dustem_st,help=help
+PRO dustem_read_fits_table,filename=filename,dustem_st=dustem_st,help=help,Q_spec=Q_spec,U_spec=U_spec
  
 ;+
 ; NAME:
@@ -354,9 +354,18 @@ ENDIF
 ;Note: If the same model is used, the outputs should be the same as what is in the fits file ....
 IF unit_input_emission_sed NE -1 THEN BEGIN
 	recomputed_dustem_predicted_emission_sed=dustem_compute_sed(*(*!dustem_fit).current_param_values,st=dustem_st)
+	;This is to compute the spectrum of Q,U which is not stored in dustem_st (only polsed is)
+;stop
+	toto = dustem_compute_stokes(*(*!dustem_fit).current_param_values,st=dustem_st,Q_spec=Q_spec,U_spec=U_spec,PSI_spec=PSI_spec,dustem_psi_em=dustem_psi_em)
 ENDIF ELSE BEGIN
 	recomputed_dustem_predicted_ext_sed=dustem_compute_ext(*(*!dustem_fit).current_param_values,st=dustem_st)
 ENDELSE
+;IF !run_pol AND !run_lin AND tag_exist(*!dustem_show,'qsed') THEN BEGIN
+;     dustem_polsed = dustem_compute_polsed(p_dim,st=st,P_spec=P_spec,SP_spec=SP_spec,dustem_polfrac=dustem_polfrac)
+;     toto = dustem_compute_stokes(p_dim,st=st,Q_spec=Q_spec,U_spec=U_spec,PSI_spec=PSI_spec,dustem_psi_em=dustem_psi_em) 
+;     dustem_qsed = toto[0]
+;     dustem_used = toto[1]   
+;ENDIF         
  
 dustem_predicted_em=mrdfits(file,unit_dustem_predicted_emission_spectra,header_predicted_emission)
 dustem_predicted_ext= mrdfits(file,unit_dustem_predicted_extinction_spectra,header_predicted_extinction)
-PRO dustem_set_plot_range ,test_m,test_x, _extra=_extra ,help=help
+PRO dustem_set_plot_range,test_m,test_x,_extra=_extra,help=help
  
 ;+
 ; NAME:
@@ -67,10 +67,11 @@ dustem_fit_intensity_example,Nitermax=5,fits_save_and_restore=&#39;/tmp/mysavefile1.
 dustem_fit_spectro_example,Nitermax=1
 dustem_fit_intensity_example,Nitermax=1,/noobj
 dustem_fit_intensity_mbb_example,Nitermax=1,postscript='/tmp/dustemwrap_postcript_example.ps'
+dustem_fit_intensity_mbb_example,Nitermax=1,fits_save_and_restore='/tmp/mysavefile5.fits'
 dustem_fit_polarization_example,Nitermax=1,fits_save_and_restore='/tmp/mysavefile2.fits'
 dustem_make_polarization_ext_example,model='G17_MODELD',outfile='./pol_ext_G17D.xcat'
 dustem_make_polarization_ext_example,model='G17_MODELA',outfile='./pol_ext_G17A.xcat'
-dustem_fit_ext_example,Nitermax=1,fits_save_and_restore='/tmp/mysavefile3.fits'
+dustem_fit_ext_example,Nitermax=1,fits_save_and_restore='./mysavefile3.fits'
 dustem_fit_ext_pol_example,Nitermax=3,fits_save_and_restore='/tmp/mysavefile4.fits'
 ;following fails in the write_fits_table
 dustem_fit_ext_pol_example,Nitermax=3,ext_file='./pol_ext_G17D.xcat';,fits_save_and_restore='/tmp/mysavefile5.fits'
-PRO dustem_write_align,file,st_align
+PRO dustem_write_align,file,st_align,help=help
  
-Ncomments=12
+;+
+; NAME:
+;   dustem_write_align
+; PURPOSE:
+;   writes the ALIGN.DAT file
+; CATEGORY:
+;    DustEMWrap, Distributed, HighLevel, Initialization
+; CALLING SEQUENCE:
+;   dustem_write_align,file,st_align
+; INPUTS:
+;    file     : name of the file to be written
+;    st_align : structure describing alignment parameters for various grains (usually !dustem.grains.align)
+; OPTIONAL INPUT PARAMETERS:
+;    None
+; OUTPUTS:
+;    None
+; OPTIONAL OUTPUT PARAMETERS:
+;    None
+; ACCEPTED KEY-WORDS:
+;    help     : whrites this help
+; COMMON BLOCKS:
+;    None
+; SIDE EFFECTS:
+;    a File is written
+; RESTRICTIONS:
+;    The DustEM fortran code must be installed
+;    The DustEMWrap idl code must be installed
+; PROCEDURES AND SUBROUTINES USED  
+; EXAMPLES
+; MODIFICATION HISTORY:
+;    Evolution details on the DustEMWrap gitlab.
+;    See http://dustemwrap.irap.omp.eu/ for FAQ and help.  
+;-
+
+IF keyword_set(help) THEN BEGIN
+  doc_library,'dustem_write_align'
+  goto,the_end
+ENDIF
+
+Ncomments=13
 c=strarr(Ncomments)
  
-c(0)='# DUSTEM: definition of grain alignment'
-c(1)='# for each grain TYPE make sure you have the following files'
-c(2)='# Q1_TYPE.DAT and Q2_TYPE in /oprop'
-c(3)='# Qc_TYPE.DAT for circular polarization'
-c(4)='# QH1_TYPE.DAT QH2_TYPE.DAT for an anistropic radiation field'
-c(5)='# Q1_TYPE_RRFxxx.DAT and Q2_TYPE_RRFxxx.DAT when running with RRF option'
-c(6)='#'
-c(7)='# run keywords'
-c(8)='# lin for linear, circ for circular, anis for anistropic extinction and emission, univ for universal alignment law, RRF'
-c(9)='# degree of anisotropy of the radiation : if > 0, read QH1 and QH2 files'
-c(10)='# alignmentlaw (idg, rat, par), parameters (par1 par2 par3)'
-c(11)='#'
+;NOTE: In vincent Guillet's model, the alignment parameters of all grains have to be the same.
+;As a consquence, there is only one ligne in the ALIGN.DAT file.
+;Here we use the first polarized grain value
+
+;stop
+
+ii=0
+c[ii]='# DUSTEM: definition of grain alignment' & ii=ii+1
+c[ii]='# for each grain TYPE make sure you have the following files' & ii=ii+1
+c[ii]='# Q1_TYPE.DAT and Q2_TYPE in /oprop' & ii=ii+1
+c[ii]='# Qc_TYPE.DAT for circular polarization' & ii=ii+1
+c[ii]='# QH1_TYPE.DAT QH2_TYPE.DAT for an anistropic radiation field' & ii=ii+1
+c[ii]='# Q1_TYPE_RRFxxx.DAT and Q2_TYPE_RRFxxx.DAT when running with RRF option' & ii=ii+1
+c[ii]='#' & ii=ii+1
+c[ii]='# run keywords' & ii=ii+1
+c[ii]='# lin for linear, circ for circular, anis for anistropic extinction and emission, univ for universal alignment law, RRF' & ii=ii+1
+c[ii]='# degree of anisotropy of the radiation : if > 0, read QH1 and QH2 files' & ii=ii+1
+c[ii]='# alignmentlaw (idg, rat, par), parameters (par1 par2 par3)' & ii=ii+1
+c[ii]='# for alignmentlaw = par: parameters are aalign, pstiff, fmax (see Equ. 1 In Guillet et al. 2017' & ii=ii+1
+c[ii]='#'
+
+;WHAY IS FMAX in Guillet2017 here called plev ??
  
 openw,unit,file,/get_lun
-FOR ii=0,Ncomments-1 DO printf,unit,c(ii)
+FOR ii=0,Ncomments-1 DO printf,unit,c[ii]
 printf,unit,st_align.keywords,format='(A-40)'
 printf,unit,st_align.anisG0,format='(E10.2)'
  
-if !run_univ eq 1 then begin
-    iii=where(st_align.grains.aligned eq 1)
-    iii=iii(0)
-	printf,unit,st_align.grains(iii).law,st_align.grains(iii).athresh,st_align.grains(iii).pstiff,st_align.grains(iii).plev,format='(A-10,2X,10(E18.10,2X))'
+format='(A-10,2X,10(E18.10,2X))'
+IF !run_univ EQ 1 THEN BEGIN
+    ind=where(st_align.grains.aligned eq 1,count)
+    ii=ind[0]    ;here we use alignment parameters of the first polarized grains and for them to be the same
+	printf,unit,st_align.grains[ii].law,st_align.grains[ii].athresh,st_align.grains[ii].pstiff,st_align.grains[ii].plev,format=format
 	;stop 
-endif else begin
-	for i=0,n_elements(st_align.grains)-1 do begin
-        if st_align.grains(i).aligned then if st_align.grains(i).law ne '' then printf,unit,st_align.grains(i).law,st_align.grains(i).athresh,st_align.grains(i).pstiff,st_align.grains(i).plev,format='(A-10,2X,10(E18.10,2X))'
-	endfor
-endelse
+ENDIF ELSE BEGIN
+	FOR i=0,n_elements(st_align.grains)-1 DO BEGIN
+        IF st_align.grains[i].aligned THEN BEGIN
+        	IF st_align.grains[i].law NE '' THEN BEGIN
+          		printf,unit,st_align.grains[i].law,st_align.grains[i].athresh,st_align.grains[i].pstiff,st_align.grains[i].plev,format=format
+        	ENDIF
+        ENDIF
+	ENDFOR
+ENDELSE
  
 close,unit
 free_lun,unit
  
+the_end:
+
 END
  
-PRO dustem_write_all_release,st,dir_out
+PRO dustem_write_all_release,st,dir_out,help=help
+
+;+
+; NAME:
+;   dustem_write_all_release
+; PURPOSE:
+;   writes .DAT fiules necessary to run dustem within dustemwrap
+; CATEGORY:
+;    DustEMWrap, Distributed, HighLevel, Initialization
+; CALLING SEQUENCE:
+;   dustem_write_all_release,st,dir_out
+; INPUTS:
+;    st       : dustem structure
+;    dir_out  : output directory where files will be written
+; OPTIONAL INPUT PARAMETERS:
+;    None
+; OUTPUTS:
+;    None
+; OPTIONAL OUTPUT PARAMETERS:
+;    None
+; ACCEPTED KEY-WORDS:
+;    help     : whrites this help
+; COMMON BLOCKS:
+;    None
+; SIDE EFFECTS:
+;    Files are written
+; RESTRICTIONS:
+;    The DustEM fortran code must be installed
+;    The DustEMWrap idl code must be installed
+; PROCEDURES AND SUBROUTINES USED  
+; EXAMPLES
+; MODIFICATION HISTORY:
+;    Evolution details on the DustEMWrap gitlab.
+;    See http://dustemwrap.irap.omp.eu/ for FAQ and help.  
+;-
+
+IF keyword_set(help) THEN BEGIN
+  doc_library,'dustem_write_all_release'
+  goto,the_end
+ENDIF
  
 if strmid(!dustem_dat,0,/reverse) ne '/' then !dustem_dat=!dustem_dat+'/' 
  
@@ -52,11 +91,11 @@ dustem_write_calor_lv,dir_out_capa,st.calor
 ;FOR i_axis = 1, 3 DO dustem_write_qabspol,dir_out_qabs,st,i_axis
  
 ;== POL
-if !run_pol then begin
+IF !run_pol THEN BEGIN
     ;stop
 	file_out=dir_out_dat+'ALIGN.DAT'
     ;stop
-	; Pol file
+	;Write the grain alignment file
 	dustem_write_align,file_out,st.align
  
 	; Linear polarization
@@ -72,12 +111,12 @@ if !run_pol then begin
 	; RRF Files
 	IF stregex(st.align.keywords, 'rrf', /bool) THEN for i_axis = 1, 2 do dustem_write_qpol_rrf,file_out,st,i_axis
  
-endif
+ENDIF
  
 ;== TLS
 file_out=dir_out_dat
 dustem_write_tls,dir_out_dat,st.tls
  
-sortie:
+the_end:
  
 END
 PRO dustem_write_grain_lv,file,st
  
+message,'This is not used by dustemwrap'
+
 Ncomments=13
 c=strarr(Ncomments)
  
@@ -20,9 +22,11 @@ c(12)=&#39;#&#39;
 OPENW,unit,file,/get_lun
  
 FOR i=0,Ncomments-1 DO BEGIN
-  printf,unit,c(i)
+  printf,unit,c[i]
 ENDFOR
  
+stop
+
 printf,unit,st.keywords
 printf,unit,st.G0
 printf,unit,st.ngrains
@@ -261,11 +261,12 @@ endelse
  
 ;changing tag_exist() by isa() because the user can mistakenly activate the !run_pol keyword
  
-If !run_pol THEN BEGIN
-    If tag_exist(*!dustem_show,'QSED') THEN BEGIN
-        IF ~isa((*!dustem_data).qsed) THEN !run_pol=0 
-    ENDIF ELSE !run_pol = 0
-ENDIF
+;===== commented out by Annie and JP on 17 march 2023
+;If !run_pol THEN BEGIN
+;    If tag_exist(*!dustem_show,'QSED') THEN BEGIN
+;        IF ~isa((*!dustem_data).qsed) THEN !run_pol=0 
+;    ENDIF ELSE !run_pol = 0
+;ENDIF
  
 ;===========Window positionning parameters
 if !run_pol and tag_exist(*!dustem_show,'qsed') then BEGIN ;qsed tag is sufficient for the test
@@ -541,7 +542,7 @@ if test_x then begin
  
     ;===========If window not set, create it and plot data anew
     if iswinext then begin 
-        
+        ;stop
         cgwindow,wxsize=main_wxsize,wysize=main_wysize,wtitle='DUSTEMWRAP '+!dustem_version.version+' (EXTINCTION)';, wback='grey';,wobject=winobj_m
         winid_x = cgquery(dimensions=dim_x,/current) ;dimension is not used...
         !dustemcgwin_id.ext = winid_x
@@ -828,5 +829,6 @@ if !dustem_end then !dustem_end = -1 ;so that the last iteration is only plotted
  
  
 the_end:
+;stop
  
 END
@@ -37,9 +37,9 @@ PRO dustemwrap_plot_noobj, p_dim,                            $
 ; CALLING SEQUENCE:
 ;    dustemwrap_plot_noobj,p_dim,st,dustem_sed,SED_spec,dustem_qsed,Q_spec,dustem_used,U_spec,dustem_polsed,P_spec,dustem_polfrac,SP_spec,dustem_psi_em,PSI_spec,dustem_ext,EXT_spec,dustem_qext,QEXT_spec,dustem_uext,UEXT_spec,dustem_polext,POLEXT_spec,dustem_fpolext,SPEXT_spec,dustem_psi_ext,PSIEXT_spec,_extra=_extra 
 ; INPUTS:
-;    p_dim
+;    p_dim         = dustemwrap free parameter values
 ; OPTIONAL INPUT PARAMETERS:
-;    st
+;    st            = dustemwrap structure.
 ;    dustem_sed
 ;    dustem_qsed
 ;    dustem_used
@@ -53,7 +53,9 @@ PRO dustemwrap_plot_noobj, p_dim,                            $
 ;    dustem_fpolext
 ;    dustem_psi_ext
 ; OUTPUTS:
-;    dustem_sed
+; OPTIONAL OUTPUT PARAMETERS:
+;    st              = currently returns dustemwrap structure if not provided as an entry.
+;    dustem_sed      = 
 ;    dustem_qsed
 ;    dustem_used
 ;    dustem_polsed
@@ -77,9 +79,6 @@ PRO dustemwrap_plot_noobj, p_dim,                            $
 ;    POLEXT_spec
 ;    SPEXT_spec
 ;    PSIEXT_spec
-; OPTIONAL OUTPUT PARAMETERS:
-;    
-
 ; ACCEPTED KEY-WORDS:
 ;    help
 ; COMMON BLOCKS:
@@ -106,65 +105,37 @@ 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=st  ; 0/0 division case?
-
+  dustem_activate_plugins,p_dim/(*(*!dustem_fit).param_init_values),st=st
 ENDIF 
  
-;# Emission
-
-if not keyword_set(dustem_sed) and isa((*!dustem_data).sed) then begin ;better test?
-  
+;==== compute emission and emission polarization SED if not provided
+IF NOT keyword_set(dustem_sed) AND isa((*!dustem_data).sed) THEN BEGIN
   dustem_sed = dustem_compute_sed(p_dim,st=st,SED_spec=SED_spec)
-  
-  if !run_pol && !run_lin and tag_exist(*!dustem_show,'qsed') then begin
+  IF !run_pol AND !run_lin AND tag_exist(*!dustem_show,'qsed') THEN BEGIN
      dustem_polsed = dustem_compute_polsed(p_dim,st=st,P_spec=P_spec,SP_spec=SP_spec,dustem_polfrac=dustem_polfrac)
      toto = dustem_compute_stokes(p_dim,st=st,Q_spec=Q_spec,U_spec=U_spec,PSI_spec=PSI_spec,dustem_psi_em=dustem_psi_em) 
      dustem_qsed = toto[0]
      dustem_used = toto[1]   
-  endif         
-endif
-
-;# Extinction
+  ENDIF         
+ENDIF
  
-if not keyword_set(dustem_ext) and isa((*!dustem_data).ext) then begin
+;==== compute extinction and extinction polarization SED if not provided
+IF NOT keyword_set(dustem_ext) AND isa((*!dustem_data).ext) THEN BEGIN
     dustem_ext = dustem_compute_ext(p_dim,st=st,EXT_spec=EXT_spec)
-  
-    if !run_pol && !run_lin and tag_exist(*!dustem_show,'qext') then begin
-  
+    IF !run_pol AND !run_lin AND tag_exist(*!dustem_show,'qext') THEN BEGIN
       dustem_polext = dustem_compute_polext(p_dim,st=st,polext_spec=POLEXT_spec,spext_spec=SPEXT_spec,dustem_fpolext=dustem_fpolext)
-
       toto = dustem_compute_stokext(p_dim,st=st,QEXT_spec=QEXT_spec,UEXT_spec=UEXT_spec,PSIEXT_spe=PSIEXT_spec,dustem_psi_ext=dustem_psi_ext) 
       dustem_qext = toto[0]
       dustem_uext = toto[1]   
-    endif
-endif
+    ENDIF
+ENDIF
  
-
+;==== This section is to keep track of chi2 evolution during fit iterations.
 mouchard=*!iteration_mouchard
 new_mouchard=mouchard[0]
 new_mouchard.iteration=!dustem_iter.act
 new_mouchard.chi2=(*!dustem_fit).chi2
 new_mouchard.rchi2=(*!dustem_fit).rchi2
-
-
-;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 ...
-
-;Below will work only for non plugin parameters
-;goto,skip1
-;param_descs=*(*!dustem_fit).param_descs
-;params_current=[0.D0]
-;FOR i=0L,n_elements(param_descs)-1 DO BEGIN
-;    str='params_current=[params_current,'+param_descs[i]+']'
-;    print,str
-;    toto=execute(str)
-;ENDFOR
-;params_current=params_current[1:*]
-;print,params_current
-;
-;stop
-;skip1:
- 
 mouchard=[mouchard,new_mouchard]
 !iteration_mouchard=ptr_new(mouchard)
  
@@ -282,11 +253,9 @@ TVLCT, 255, 255, 255, 254 ; White color
  
 if test_m then begin
     ;Generating emission window and saving window ID
-        
     IF !d.name NE 'PS' THEN BEGIN  ;What if we're trying to create a ps file with the exact display of the dashboard?  
         window,0, xsize=main_wxsize,ysize=main_wysize,title='DUSTEMWRAP '+!dustem_version.version+' (EMISSION)',xpos=0,ypos=0 
     ENDIF
-
     ;Plotting model string (legend)
     xxpos = 0.015 
     yypos = 0.97
@@ -459,15 +428,14 @@ if test_m then begin
         positiveonly=[0] ;kept it for completeness. Also this loop reminds me that JP also wants the user to be able to display one dataset. 
         negativeonly=[0]
     ENDELSE
-        
     ; PLOTTING OF DATA THAT IS UNCHAED  
-    dustem_plot_dataset, st, dataset=datasets, position=position,positive_only=positiveonly,negative_only=negativeonly, _extra=_extra
+    dustem_plot_dataset,st,dataset=datasets,position=position $
+                       ,positive_only=positiveonly,negative_only=negativeonly, _extra=_extra
     ; REFRESHING DATA - to plot the refreshed data for the first time.
-    dustem_plot_dataset, st, dustem_interp,dustem_spec,extra_spec=extra_spec,dataset=datasets,positive_only=positiveonly,negative_only=negativeonly, /refresh ,position=position, _extra=_extra
-         
-ENDIF 
-
-
+    dustem_plot_dataset,st,dustem_interp,dustem_spec,extra_spec=extra_spec $
+                       ,dataset=datasets,positive_only=positiveonly,negative_only=negativeonly $
+                       ,/refresh,position=position,_extra=_extra
+ENDIF
  
 ;stop
 if test_x then begin