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

Ilyes Choubani
2 parents 607060e5 39afc385
Showing 4 changed files with 21 additions and 11 deletions Show diff stats
src/idl/dustem_fit_sed_readme.pro
src/idl/dustem_initialize_sed.pro
src/idl/dustem_plot_fit_sed.pro
src/idl/dustem_plot_polar.pro
@@ -60,6 +60,9 @@ PRO dustem_fit_sed_readme,postcript=postcript,model=model,help=help,png=png,iter
 ;    Contact J.-Ph. Bernard (Jean-Philippe.Bernard@cesr.fr) in case of problems.
 ;-
  
+
+
+
 IF keyword_set(help) THEN BEGIN
   doc_library,'dustem_fit_sed_readme'
   goto,the_end
@@ -68,8 +68,7 @@ comments=[&#39;Dustem-Wrap SED&#39;]
 comments=[comments,'instru: Instrument name']
 comments=[comments,'filter: Instrument filter']
 comments=[comments,'wave: Filter reference wavelength [mic]']
-comments=[comments,'spec: SED intensity [MJy/sr]']
-comments=[comments,'error: 1-sigma Uncertainty on spec [MJy/sr]']
+comments=[comments,'StokesI: SED intensity [MJy/sr]']
 comments=[comments,'StokesQ: Q Stokes parameter intensity [MJy/sr]']
 comments=[comments,'StokesU: U Stokes parameter intensity [MJy/sr]']
 comments=[comments,'largeP: Polarized intensity P [MJy/sr]']
@@ -266,7 +266,15 @@ IF keyword_set(rchi2) THEN BEGIN
 ENDIF
  
 xtit=textoidl('\lambda (\mum)')
-cgplot,(*!dustem_data.sed).wav,(*!dustem_data.sed).values/sed,/nodata,xtit=xtit,ytit='Normalized',tit='',/xlog,xr=xr,/ys,/xs,yr=[0,2],ylog=0,position=[0.12,0.14,0.96,0.35],/noerase,yticks=2,ymino=2,xticklen=0.1
+;cgplot,(*!dustem_data.sed).wav,(*!dustem_data.sed).values/sed,/nodata,xtit=xtit,ytit='Normalized',tit='',/xlog,xr=xr,/ys,/xs,yr=[0,2],ylog=0,position=[0.12,0.14,0.96,0.35],/noerase,yticks=2,ymino=2,xticklen=0.1
+;stop
+IF keyword_set(_extra) THEN BEGIN
+  extra_kept={XRANGE:[0.,0.]}
+  extra_tags=tag_names(_extra)
+  ind=where(extra_tags EQ 'XRANGE',count)
+  IF count NE 0 THEN extra_kept.XRANGE=_extra.(ind[0]) ;ELSE extra_kept=0
+ENDIF
+cgplot,(*!dustem_data.sed).wav,(*!dustem_data.sed).values/sed,_extra=extra_kept,/nodata,xtit=xtit,ytit='Normalized',tit='',/xlog,/ys,/xs,yr=[0,2],ylog=0,position=[0.12,0.14,0.96,0.35],/noerase,yticks=2,ymino=2,xticklen=0.1
 ;plot the normalized data as well. 
 IF count_spec NE 0 THEN BEGIN
   xx=((*!dustem_data.sed).wav)[ind_spec]
-PRO dustem_plot_polar,st,p_dim,ps=ps,_Extra=extra,help=help,UV=UV,SED=SED,Pfrac=Pfrac,print_ratio=print_ratio,win=win,xr=xr,yr=yr,donotclose=donotclose,aligned=aligned,noerrbars=noerrbars,multi=multi,almabands=almabands,nsmooth=nsmooth
+PRO dustem_plot_polar,st,p_dim,ps=ps,_Extra=_extra,help=help,UV=UV,SED=SED,Pfrac=Pfrac,print_ratio=print_ratio,win=win,xr=xr,yr=yr,donotclose=donotclose,aligned=aligned,noerrbars=noerrbars,multi=multi,almabands=almabands,nsmooth=nsmooth
  
 ;+
 ; NAME:
@@ -209,8 +209,8 @@ IF ptr_valid(!dustem_data.polext) THEN BEGIN
 			endelse
  
 		    if multi eq 0 then cgplot,st.polext.wav,st.polext.ext_tot/normpol,/nodata,xtit=xtit,ytit=ytit,tit=tit,xr=xr,yr=yr,ylog=ylog,xlog=1
-			if multi eq 1 then cgplot,st.polext.wav,st.polext.ext_tot/normpol,/nodata,_Extra=extra,xtit='',ytit=ytit,tit=tit,xr=xr,yr=yr,ylog=ylog,position=[0.17,0.35,0.93,0.93],xtickformat='(A1)' ,xlog=1
-		    if multi eq 2 then cgplot,st.polext.wav,st.polext.ext_tot/normpol,/nodata,_Extra=extra,xtit=xtit,ytit='Normalized',tit='',xr=xr,yr=[0,2],ylog=ylog,position=[0.17,0.14,0.93,0.35],/noerase,yticks=3,ymino=5,xticklen=0.1,xlog=1
+			if multi eq 1 then cgplot,st.polext.wav,st.polext.ext_tot/normpol,/nodata,_Extra=_extra,xtit='',ytit=ytit,tit=tit,xr=xr,yr=yr,ylog=ylog,position=[0.17,0.35,0.93,0.93],xtickformat='(A1)' ,xlog=1
+		    if multi eq 2 then cgplot,st.polext.wav,st.polext.ext_tot/normpol,/nodata,_Extra=_extra,xtit=xtit,ytit='Normalized',tit='',xr=xr,yr=[0,2],ylog=ylog,position=[0.17,0.14,0.93,0.35],/noerase,yticks=3,ymino=5,xticklen=0.1,xlog=1
  
  
 			FOR i=0L,Ngrains-1 DO BEGIN
@@ -233,7 +233,7 @@ IF ptr_valid(!dustem_data.polext) THEN BEGIN
         if multi eq 0 then begin
 		if not keyword_set(ps) then tit='Polarization fraction in extinction'
 		ytit='Polarization fraction'
-		cgplot,st.polext.wav,st.polext.ext_tot/st.ext.ext_tot,/nodata,_Extra=extra,xtit=xtit,ytit=ytit,tit=tit,xr=xr,yr=yr
+		cgplot,st.polext.wav,st.polext.ext_tot/st.ext.ext_tot,/nodata,_Extra=_extra,xtit=xtit,ytit=ytit,tit=tit,xr=xr,yr=yr
 		FOR i=0L,Ngrains-1 DO BEGIN
  	  		cgoplot,st.polext.wav,smooth((st.polext.abs_grain(i)+st.polext.sca_grain(i))/(st.ext.abs_grain(i)+st.ext.sca_grain(i)),nsmooth),color=colors(i+1),psym=psym,line=ls(i+1)
 		ENDFOR
@@ -304,7 +304,7 @@ IF  ptr_valid(!dustem_data.polsed) THEN BEGIN
 				endelse
 	            plotsym,0,/FILL
  
-	            cgoplot,((*!dustem_data.polsed).wav)(ind_filt),((*!dustem_data.polsed).values)(ind_filt)*fact/normpol(ind_filt),psym=8,_extra=extra,color='Orchid',thick=2;use_col_sed_filt
+	            cgoplot,((*!dustem_data.polsed).wav)(ind_filt),((*!dustem_data.polsed).values)(ind_filt)*fact/normpol(ind_filt),psym=8,_extra=_extra,color='Orchid',thick=2;use_col_sed_filt
     	        if multi ne 2 then cgoplot,((*!dustem_data.polsed).wav),dustem_polsed/normpol,psym=6,color='red',symsize=2
  
  
@@ -312,7 +312,7 @@ IF  ptr_valid(!dustem_data.polsed) THEN BEGIN
  
 	        	; PLot color corrected POLSED
 	            if keyword_set(ps) then plotsym,8,thick=8 else plotsym,8
-	        	if multi eq 0 then cgoplot,((*!dustem_data.polsed).wav)(ind_filt),dustem_polsed(ind_filt)/normpol(ind_filt),psym=8,syms=2,_extra=extra,col='red'
+	        	if multi eq 0 then cgoplot,((*!dustem_data.polsed).wav)(ind_filt),dustem_polsed(ind_filt)/normpol(ind_filt),psym=8,syms=2,_extra=_extra,col='red'
 	        ENDIF
  
         IF tag_exist(*!dustem_scope,'SYNCHROTRON') THEN BEGIN ;bad test but let's leave it like this for the moment
@@ -340,7 +340,7 @@ endif ;else BEGIN
         if not keyword_set(ps) then tit='Polarization fraction in emission'
         ytit=textoidl('P/I')
  
-        plot_oi,st.polsed.wav,st.polsed.(Ngrains+1)/st.sed.(Ngrains+1),/nodata,_extra=extra,xtit=xtit,ytit=ytit,tit=tit,/xlog,xr=xr,yr=yr
+        plot_oi,st.polsed.wav,st.polsed.(Ngrains+1)/st.sed.(Ngrains+1),/nodata,_extra=_extra,xtit=xtit,ytit=ytit,tit=tit,/xlog,xr=xr,yr=yr
         if (total(aligned) gt 0) then oplot,st.polsed.wav,st.polsed.(Ngrains+1)/st.sed.(Ngrains+1)
         for i = 0, Ngrains-1 do if aligned(i) then oplot,st.polsed.wav,st.polsed.(i+1)/st.sed.(Ngrains+1),color=colors(i+1),psym=psym,linestyle=ls(i+1)
  
@@ -357,7 +357,7 @@ endif ;else BEGIN
            		ind_filt_polfrac=where((*!dustem_data.polfrac).filt_names NE 'SPECTRUM',count_filt_polfrac)
            		IF count_filt_polfrac NE 0 THEN BEGIN
               		plotsym,0,/FILL
-              		oplot,((*!dustem_data.polfrac).wav)(ind_filt_polfrac),((*!dustem_data.polfrac).values)(ind_filt_polfrac),psym=8,_extra=extra,color=use_col_sed_filt
+              		oplot,((*!dustem_data.polfrac).wav)(ind_filt_polfrac),((*!dustem_data.polfrac).values)(ind_filt_polfrac),psym=8,_extra=_extra,color=use_col_sed_filt
               		if not keyword_set(noerrbars) then err_bar,((*!dustem_data.polfrac).wav)(ind_filt_polfrac),((*!dustem_data.polfrac).values)(ind_filt_polfrac),yrms=2*((*!dustem_data.polfrac).sigma)(ind_filt_polfrac),color=use_col_sed_filt
 					print,((*!dustem_data.polfrac).wav)(ind_filt_polfrac),((*!dustem_data.polfrac).values)(ind_filt_polfrac)
 	   			endif