Commit cca12c005d834bb1cf7c2cc322178ef8d88b0041

Authored by Jean-Philippe Bernard
1 parent bafa720f
Exists in master

impreoved for extinction + emission fits

src/idl/dustem_fit_sed_readme.pro
... ... @@ -92,6 +92,8 @@ dustem_init,model=use_model
92 92 ;dir=getenv('DUSTEM_SOFT_DIR')+'/src/dustem3.8_web/SEDs/'
93 93 dir=!dustem_wrap_soft_dir+'/Data/SEDs/'
94 94 file=dir+'Gal_composite_spectrum.xcat'
  95 +;file=dir+'Mathis1990_DISM.xcat'
  96 +
95 97 ;file=dir+'Gal_composite_spectrum_wAKARI.xcat'
96 98 ;stop
97 99 spec=read_xcat(file,/silent)
... ...
src/idl/dustem_grains_colors.pro
... ... @@ -12,7 +12,7 @@ ENDIF ELSE BEGIN
12 12 ENDELSE
13 13  
14 14  
15   -ls = [ [ 0,4,3,5,1 ], [ 0,4,3,5,1 ],[ 0,4,3,5,1 ] ] ;JPB: unsure what this is ....
  15 +ls = [ [ 0,4,3,5,1 ], [ 0,4,3,5,1 ],[ 0,4,3,5,1 ] ] ;JPB: This is the line style for curves
16 16  
17 17 IF keyword_set(ps) THEN BEGIN
18 18 ; Postscript
... ...
src/idl/dustem_plot_ext.pro
... ... @@ -98,8 +98,11 @@ endif else if keyword_set(albedo) then begin
98 98 yr=[0,1]
99 99 xtit=textoidl('1/\lambda (\mum^{-1})')
100 100 ytit=textoidl('albedo')
101   - plot,xrange,/nodata,xtit=xtit,ytit=ytit,tit=tit,xlog=xlog,ylog=ylog,yr=yr,ys=ys,xr=xr,xsty=xsty
102   - oplot,xrange,sca_tot/(sca_tot+abs_tot)
  101 + stop
  102 + ;plot,xrange,/nodata,xtit=xtit,ytit=ytit,tit=tit,xlog=xlog,ylog=ylog,yr=yr,ys=ys,xr=xr,xsty=xsty
  103 + ;oplot,xrange,sca_tot/(sca_tot+abs_tot)
  104 + cgplot,xrange,/nodata,xtit=xtit,ytit=ytit,tit=tit,xlog=xlog,ylog=ylog,yr=yr,ys=ys,xr=xr,xsty=xsty
  105 + cgoplot,xrange,sca_tot/(sca_tot+abs_tot)
103 106  
104 107  
105 108 endif else begin
... ... @@ -114,8 +117,12 @@ endif else begin
114 117 endelse
115 118 endif
116 119  
117   - Ngrains=n_tags(st.sed)-2
118   - colors=dustem_grains_colors(Ngrains,ls,ps=ps)
  120 + ;Ngrains=n_tags(st.sed)-2
  121 + ;colors=dustem_grains_colors(Ngrains,ls,ps=ps)
  122 + Ngrains=(*!dustem_params).Ngrains
  123 + colors=['dark',dustem_grains_colors(Ngrains,ls,/cgplot,ps=ps)]
  124 + use_lines=replicate(0,Ngrains)
  125 +
119 126 ; stop
120 127 ytit=textoidl('\sigma_{ext}/N_H (cm^2/H)')
121 128 if not keyword_set(ps) then tit='Dustem extinction'
... ... @@ -147,21 +154,27 @@ endif else begin
147 154 xrange=st.ext.wav
148 155 xlog = 1
149 156 endelse
150   - if multi eq 0 then plot,xrange,/nodata,xtit=xtit,ytit=ytit,tit=tit,xlog=xlog,ylog=ylog,yr=yr,ys=ys,xr=xr,xsty=xsty
151   - if multi eq 1 then plot,xrange,/nodata,xtit='',ytit=ytit,tit=tit,xlog=xlog,ylog=ylog,yr=yr,/ys,xr=xr,xsty=xsty,position=[0.17,0.35,0.95,0.95],xtickformat='(A1)',yticks=3,yminor=10
152   - if multi eq 2 then plot,xrange,/nodata,xtit=xtit,xlog=xlog,ylog=ylog,ys=ys,xsty=xsty,ytit='Normalized',tit='',xr=xr,yr=[0,2],position=[0.17,0.14,0.95,0.35],/noerase,yticks=2,yminor=5,xticklen=0.1
  157 + ;if multi eq 0 then plot,xrange,/nodata,xtit=xtit,ytit=ytit,tit=tit,xlog=xlog,ylog=ylog,yr=yr,ys=ys,xr=xr,xsty=xsty
  158 + ;if multi eq 1 then plot,xrange,/nodata,xtit='',ytit=ytit,tit=tit,xlog=xlog,ylog=ylog,yr=yr,/ys,xr=xr,xsty=xsty,position=[0.17,0.35,0.95,0.95],xtickformat='(A1)',yticks=3,yminor=10
  159 + ;if multi eq 2 then plot,xrange,/nodata,xtit=xtit,xlog=xlog,ylog=ylog,ys=ys,xsty=xsty,ytit='Normalized',tit='',xr=xr,yr=[0,2],position=[0.17,0.14,0.95,0.35],/noerase,yticks=2,yminor=5,xticklen=0.1
  160 + if multi eq 0 then cgplot,xrange,/nodata,xtit=xtit,ytit=ytit,tit=tit,xlog=xlog,ylog=ylog,yr=yr,ys=ys,xr=xr,xsty=xsty
  161 + if multi eq 1 then cgplot,xrange,/nodata,xtit='',ytit=ytit,tit=tit,xlog=xlog,ylog=ylog,yr=yr,/ys,xr=xr,xsty=xsty,position=[0.17,0.35,0.95,0.95],xtickformat='(A1)',yticks=3,yminor=10
  162 + if multi eq 2 then cgplot,xrange,/nodata,xtit=xtit,xlog=xlog,ylog=ylog,ys=ys,xsty=xsty,ytit='Normalized',tit='',xr=xr,yr=[0,2],position=[0.17,0.14,0.95,0.35],/noerase,yticks=2,yminor=5,xticklen=0.1
153 163 ;VG
154 164  
155 165 ;VG
156 166 ; Plot model
157 167 FOR i=0L,Ngrains-1 DO BEGIN
158 168 if i le 1 and keyword_set(mergePAH) then begin
159   - if i eq 0 then oplot,xrange,(st.ext.abs_grain(0)+st.ext.sca_grain(0)+st.ext.abs_grain(1)+st.ext.sca_grain(1))/norm,color=colors(1),psym=psym,line=ls(1)
  169 + ;if i eq 0 then oplot,xrange,(st.ext.abs_grain(0)+st.ext.sca_grain(0)+st.ext.abs_grain(1)+st.ext.sca_grain(1))/norm,color=colors(1),psym=psym,line=ls(1)
  170 + if i eq 0 then cgoplot,xrange,(st.ext.abs_grain(0)+st.ext.sca_grain(0)+st.ext.abs_grain(1)+st.ext.sca_grain(1))/norm,color=colors(1),psym=psym,line=ls(1)
160 171 endif else begin
161   - oplot,xrange,(st.ext.abs_grain(i)+st.ext.sca_grain(i))/norm,color=colors(i+1),psym=psym,line=ls(i+1)
  172 + ;oplot,xrange,(st.ext.abs_grain(i)+st.ext.sca_grain(i))/norm,color=colors(i+1),psym=psym,line=ls(i+1)
  173 + cgoplot,xrange,(st.ext.abs_grain(i)+st.ext.sca_grain(i))/norm,color=colors(i+1),psym=psym,line=ls(i+1)
162 174 endelse
163 175 ENDFOR
164   - oplot,xrange,(abs_tot+sca_tot)/norm,psym=psym
  176 + ;oplot,xrange,(abs_tot+sca_tot)/norm,psym=psym
  177 + cgoplot,xrange,(abs_tot+sca_tot)/norm,psym=psym
165 178  
166 179 if !dustem_show_plot EQ 2 or multi eq 2 then begin
167 180 norm = interpol(st.ext.ext_tot,st.ext.wav,(*!dustem_data.ext).wav)
... ... @@ -173,8 +186,11 @@ endif else begin
173 186 if data_exists then begin
174 187 if ptr_valid(!dustem_data.ext) then begin
175 188 if keyword_set(UV) then xdata = 1./(*!dustem_data.ext).wav else xdata = (*!dustem_data.ext).wav
176   - if keyword_set(noerrbars) then oplot,xdata,(*!dustem_data.ext).values/norm,psym=4 $
  189 + ;if keyword_set(noerrbars) then oplot,xdata,(*!dustem_data.ext).values/norm,psym=4 $
  190 + if keyword_set(noerrbars) then cgoplot,xdata,(*!dustem_data.ext).values/norm,psym=4 $
  191 + ;else oploterror,xdata,(*!dustem_data.ext).values/norm,xdata*0.,(*!dustem_data.ext).sigma/norm,psym=4
177 192 else oploterror,xdata,(*!dustem_data.ext).values/norm,xdata*0.,(*!dustem_data.ext).sigma/norm,psym=4
  193 + ;oploterror,xdata,(*!dustem_data.ext).values/norm,xdata*0.,(*!dustem_data.ext).sigma/norm,psym=4
178 194 endif
179 195 endif
180 196  
... ...