Correcting some plotting typos in plot_dataset and set_plot_rannge + Forgotten m…

…pfit run update + correcting fit_ext_pol_example non-regression test.

Correcting some plotting typos in plot_dataset and set_plot_rannge + Forgotten m…
…pfit run update + correcting fit_ext_pol_example non-regression test.
Ilyes Choubani
1 parent 18e47096
Showing 4 changed files with 68 additions and 17 deletions Show diff stats
src/idl/dustem_fit_ext_pol_example.pro
src/idl/dustem_mpfit_run.pro
src/idl/dustem_plot_dataset.pro
src/idl/dustem_set_plot_range.pro
@@ -141,7 +141,7 @@ pd = [ $
      'dustem_plugin_modify_dust_polx_2' ]
  
 true_vals = [7.1e-4, 1.3e-3,5.6e-3,35.] ; these are the true values that will be used to generate the data if no ext_file is specified
-iv = true_vals+[5.00E-4,-7.00E-4,8.00E-4,10] ; this is the vector of starting guesses for the fit
+iv = true_vals+[5.00E-4,-7.00E-4,8.00E-4,5] ; this is the vector of starting guesses for the fit
  
 Npar=n_elements(pd)
 ulimed=replicate(0,Npar)
@@ -229,13 +229,15 @@ tol=1.e-10
 ;=== INFORMATION TO MAKE THE PLOTS
 ;=== _x/_extinction means extinction plots, _m/_emissions means emission plots
 xr_x=[0.01,30]
-yr_x=[1.00E-10,10]
+yr_fpolext=[1.00E-10,30]
+
+;yr_fpolext=[1e-4,30]
 tit='Dust Optical Depth'
  
 ;===  RUN THE FIT
 t1=systime(0,/sec)
 res=dustem_mpfit_data(tol=tol,Nitermax=use_Nitermax,gtol=gtol $
-                      ,/xlog,/ylog,xr_x=xr_x,yr_x=yr_x,xtit=xtit,ytit=ytit,title=tit $
+                      ,/xlog,/ylog,xr_x=xr_x,yr_fpolext=yr_fpolext,xtit=xtit,ytit=ytit,title=tit $
                       ,legend_xpos=legend_xpos,legend_ypos=legend_ypos $
                       ,errors=errors,chi2=chi2,rchi2=rchi2,show_plot=show_plot)
 t2=systime(0,/sec)
@@ -256,9 +258,9 @@ IF keyword_set(fits_save_and_restore) THEN BEGIN
   ;==== plot result taken from the saved fits table
   res=*(*!dustem_fit).CURRENT_PARAM_VALUES
   IF !dustem_noobj THEN BEGIN
-     dustemwrap_plot_noobj,res,dustem_st,xr=xr,/xstyle,yr=yr,/ysty,/ylog,/xlog,title=tit+' (From Saved FITS file)'
+     dustemwrap_plot_noobj,res,st=dustem_st,xr=xr,/xstyle,yr=yr,/ysty,/ylog,/xlog,title=tit+' (From Saved FITS file)'
   ENDIF ELSE BEGIN
-    dustemwrap_plot,res,dustem_st,xr=xr,/xstyle,yr=yr,/ysty,/ylog,/xlog,title=tit+' (From Saved FITS file)'
+    dustemwrap_plot,res,st=dustem_st,xr=xr,/xstyle,yr=yr,/ysty,/ylog,/xlog,title=tit+' (From Saved FITS file)'
   ENDELSE
   IF keyword_set(wait) THEN BEGIN
      message,'Saved the results as FITS in the file: '+fits_save_and_restore+', and made a plot using the data in this file',/info
@@ -337,12 +337,61 @@ If !dustem_show_plot THEN BEGIN
     ;=== plotting the fit
     if !dustem_iter.act NE !dustem_iter.prv or !dustem_iter.prv EQ 1 then begin
         IF !dustem_noobj EQ 0 THEN BEGIN
-          dustemwrap_plot,p_dim, st=st, dustem_sed=dustem_sed, SED_spec=SED_spec, dustem_qsed=dustem_qsed, Q_spec=Q_spec, dustem_used=dustem_used, U_spec=U_spec, dustem_polsed=dustem_polsed,   $
-                          P_spec=P_spec, dustem_polfrac=dustem_polfrac, SP_spec=SP_spec, dustem_psi_em=dustem_psi_em, PSI_spec=PSI_spec, dustem_ext=dustem_ext, EXT_spec=EXT_spec, dustem_qext=dustem_qext,       $
-                          QEXT_spec=QEXT_spec, dustem_uext=dustem_uext, UEXT_spec=UEXT_spec, dustem_polext=dustem_polext, POLEXT_spec=POLEXT_spec, dustem_fpolext=dustem_fpolext, SPEXT_spec=SPEXT_spec,         $
-                          dustem_psi_ext=dustem_psi_ext, PSIEXT_spec=PSIEXT_spec, _extra=_extra
+          dustemwrap_plot,  p_dim, $
+                            st = st, $
+                            dustem_sed = dustem_sed, $
+                            SED_spec = SED_spec, $
+                            dustem_qsed = dustem_qsed, $
+                            Q_spec = Q_spec, $
+                            dustem_used = dustem_used, $
+                            U_spec = U_spec, $
+                            dustem_polsed = dustem_polsed,   $
+                            P_spec = P_spec, $
+                            dustem_polfrac = dustem_polfrac, $
+                            SP_spec = SP_spec, $
+                            dustem_psi_em = dustem_psi_em, $
+                            PSI_spec = PSI_spec, $
+                            dustem_ext = dustem_ext, $
+                            EXT_spec = EXT_spec, $
+                            dustem_qext = dustem_qext,       $
+                            QEXT_spec = QEXT_spec, $
+                            dustem_uext = dustem_uext, $
+                            UEXT_spec = UEXT_spec, $
+                            dustem_polext = dustem_polext, $
+                            POLEXT_spec = POLEXT_spec, $
+                            dustem_fpolext = dustem_fpolext, $
+                            SPEXT_spec = SPEXT_spec,         $
+                            dustem_psi_ext = dustem_psi_ext, $
+                            PSIEXT_spec = PSIEXT_spec,       $
+                             _extra=_extra
         ENDIF ELSE BEGIN
-          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
+          dustemwrap_plot_noobj, p_dim,$
+                                 st = st,$
+                                 dustem_sed = dustem_sed, $
+                                 SED_spec = SED_spec, $
+                                 dustem_qsed = dustem_qsed, $
+                                 Q_spec = Q_spec, $
+                                 dustem_used = dustem_used, $
+                                 U_spec = U_spec, $
+                                 dustem_polsed = dustem_polsed, $ 
+                                 P_spec = P_spec, $
+                                 dustem_polfrac = dustem_polfrac, $
+                                 SP_spec = SP_spec, $
+                                 dustem_psi_em = dustem_psi_em, $
+                                 PSI_spec = PSI_spec, $
+                                 dustem_ext = dustem_ext, $
+                                 EXT_spec = EXT_spec, $
+                                 dustem_qext = dustem_qext, $
+                                 QEXT_spec = QEXT_spec, $
+                                 dustem_uext = dustem_uext, $
+                                 UEXT_spec = UEXT_spec, $
+                                 dustem_polext = dustem_polext, $
+                                 POLEXT_spec = POLEXT_spec, $
+                                 dustem_fpolext = dustem_fpolext, $
+                                 SPEXT_spec = SPEXT_spec, $
+                                 dustem_psi_ext = dustem_psi_ext, $
+                                 PSIEXT_spec = PSIEXT_spec, $
+                                 _extra = _extra
         ENDELSE
         if !dustem_iter.act EQ 1 then begin
             !dustem_iter.prv=0
@@ -1005,7 +1005,7 @@ if keyword_set(dataset) then begin ;This shouldn&#39;t be a keyword. Should be chang
                 ;SETTING THE PLOT RANGE
                 xr = !dustem_plot_range.fpolext.xr
                 yr = !dustem_plot_range.fpolext.yr
-                
+                stop
  
                 idx_filt=where((*(*!dustem_data).fpolext).filt_names NE 'SPECTRUM',ct_filt)
                 idx_spec=where((*(*!dustem_data).fpolext).filt_names EQ 'SPECTRUM',ct_spec)
@@ -1294,7 +1294,7 @@ if keyword_set(dataset) then begin ;This shouldn&#39;t be a keyword. Should be chang
  
                 if keyword_set(refresh) then begin ;The data points in the plot are being refreshed
  
-                    cgplot,1/vectw,vectx,/nodata,/xlog,/ylog,/ys,xs=1,pos=position[0],noerase=1,charsize=1.15,xtickformat='(A1)',ytickformat='(A1)',color='Powder Blue',xr=xr,xtit='',yr=yr,/ylog,psym=8,syms=0.8
+                    cgplot,1/vectw,vectx,/nodata,/xlog,/ys,xs=1,pos=position[0],noerase=1,charsize=1.15,xtickformat='(A1)',ytickformat='(A1)',color='Powder Blue',xr=xr,xtit='',yr=yr,psym=8,syms=0.8
  
                     ;##################TAKEN FROM SED
  
@@ -2218,7 +2218,7 @@ if keyword_set(dataset) then begin ;This shouldn&#39;t be a keyword. Should be chang
                 if keyword_set(refresh) then begin ;The data points in the plot that are being refreshed 
  
                     ;Making sure we're placed in the right plot to refresh. Here normalized plot for QEXT.
-                    cgplot,1/vectw,vectx,/nodata,/xlog,/ys,xs=1,pos=position[1],noerase=1,charsize=1.15,xtickformat='(A1)',ytickformat='(A1)',color='Powder Blue',xr=xr,xtit='',yr=[0.0,2.0],/ylog,psym=8,syms=0.8
+                    cgplot,1/vectw,vectx,/nodata,/xlog,/ys,xs=1,pos=position[1],noerase=1,charsize=1.15,xtickformat='(A1)',ytickformat='(A1)',color='Powder Blue',xr=xr,xtit='',yr=[0.0,2.0],psym=8,syms=0.8
  
                     IF ct_spec NE 0 THEN BEGIN
  
@@ -2574,7 +2574,7 @@ if keyword_set(dataset) then begin ;This shouldn&#39;t be a keyword. Should be chang
                 if keyword_set(refresh) then begin ;The data points in the plot that are being refreshed 
  
                     ;Making sure we're placed in the right plot to refresh. Here normalized plot for QEXT.
-                    cgplot,1/vectw,vectx,/nodata,/xlog,/ys,xs=1,pos=position[1],noerase=1,charsize=1.15,xtickformat='(A1)',ytickformat='(A1)',color='Powder Blue',xr=xr,xtit='',yr=[0.0,2.0],/ylog,psym=8,syms=0.8
+                    cgplot,1/vectw,vectx,/nodata,/xlog,/ys,xs=1,pos=position[1],noerase=1,charsize=1.15,xtickformat='(A1)',ytickformat='(A1)',color='Powder Blue',xr=xr,xtit='',yr=[0.0,2.0],psym=8,syms=0.8
  
                     IF ct_spec NE 0 THEN BEGIN
  
@@ -224,7 +224,7 @@ IF keyword_set(_extra) THEN BEGIN
  
 	        idyr_polext = where(strmid(strupcase(tgnms_extra),0,1) EQ 'Y' and $
 	        STRUPCASE(strmid(tgnms_extra,6,/reverse_offset)) EQ '_POLEXT',ctyr_polext) 
-	        
+	        stop
 	        idyr_psi_ext = where(strmid(strupcase(tgnms_extra),0,1) EQ 'Y' and $
 	        STRUPCASE(strmid(tgnms_extra,6,/reverse_offset)) EQ 'PSI_EXT',ctyr_psi_ext) 
  
@@ -232,7 +232,7 @@ IF keyword_set(_extra) THEN BEGIN
 	        STRUPCASE(strmid(tgnms_extra,3,/reverse_offset)) EQ 'UEXT',ctyr_uext) 
  
 	        idyr_fpolext = where(strmid(strupcase(tgnms_extra),0,1) EQ 'Y' and $
-	        STRUPCASE(strmid(tgnms_extra,6,/reverse_offset)) EQ 'FPLOEXT',ctyr_fpolext) 
+	        STRUPCASE(strmid(tgnms_extra,6,/reverse_offset)) EQ 'FPOLEXT',ctyr_fpolext) 
  
 	        idyr_qext = where(strmid(strupcase(tgnms_extra),0,1) EQ 'Y' and $
 	        STRUPCASE(strmid(tgnms_extra,3,/reverse_offset)) EQ 'QEXT',ctyr_qext) 
@@ -433,7 +433,7 @@ IF keyword_set(_extra) THEN BEGIN
 	        STRUPCASE(strmid(tgnms_extra,3,/reverse_offset)) EQ 'UEXT',ctyr_uext) 
  
 	        idyr_fpolext = where(strmid(strupcase(tgnms_extra),0,1) EQ 'Y' and $
-	        STRUPCASE(strmid(tgnms_extra,6,/reverse_offset)) EQ 'FPLOEXT',ctyr_fpolext) 
+	        STRUPCASE(strmid(tgnms_extra,6,/reverse_offset)) EQ 'FPOLEXT',ctyr_fpolext) 
  
 	        idyr_qext = where(strmid(strupcase(tgnms_extra),0,1) EQ 'Y' and $
 	        STRUPCASE(strmid(tgnms_extra,3,/reverse_offset)) EQ 'QEXT',ctyr_qext)