seperating xrange and yrange for E(M)ission and E(X)tinction. Ask JP what we wan…

…t to exactly call them.

seperating xrange and yrange for E(M)ission and E(X)tinction. Ask JP what we wan…
…t to exactly call them.
Ilyes Choubani
1 parent 0c487640
Showing 4 changed files with 56 additions and 19 deletions Show diff stats
src/idl/dustem_mpfit_data.pro
src/idl/dustem_mpfit_run.pro
src/idl/dustemcgwin_dataset.pro
src/idl/dustemwrap_plot.pro
@@ -62,7 +62,7 @@ if !run_pol then begin
  
     ind_data_tag=dustem_data_tag(count=count_data_tag)
     tagnames=tag_names(!dustem_data)
-    testpol = tagnames EQ 'POLSED' or tagnames EQ 'POLEXT' or tagnames EQ 'POLFRAC' or tagnames EQ 'PSI_EM' or tagnames EQ 'PSI_EXT'
+    testpol = tagnames EQ 'POLSED' or tagnames EQ 'POLEXT' or tagnames EQ 'POLFRAC' or tagnames EQ 'PSI_EM' or tagnames EQ 'PSI_EXT' or tagnames EQ 'FPOLEXT'
     data_ind=where(~testpol,ctestpol)
     if ctestpol ne 0 then begin
         match,ind_data_tag,data_ind,ind1,ind2 ;not using match2 because when matching indices, if the first is 0 it doesn't count which is wrong.
@@ -134,6 +134,7 @@ print, &#39;Final parameters : &#39;, p_dim
 ;The above was removed because it seems it was not used anywhere.
 ;!dustem_fit_sed=ptr_new(dustem_compute_sed(p_dim,st,cont=cont,_extra=extra))
 (*!dustem_fit).current_param_errors=ptr_new(p_er_dim)
+dustemwrap_plot,p_dim,stp,xr=_extra.xr,/xstyle,yr=_extra.yr,/ysty,/ylog,/xlog,title=_extra.title
 RETURN, p_dim
  
 END
@@ -234,6 +234,7 @@ ENDFOR
  
  
 ;Plotting only every successful dustem run 
+
 if !dustem_iter.act NE !dustem_iter.prv or !dustem_iter.prv EQ 1 then begin 
     dustemwrap_plot,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
     if !dustem_iter.act EQ 1 then begin
@@ -23,11 +23,29 @@ clrs_plgns = [&#39;Rosy Brown&#39;,&#39;Gold&#39;,&#39;Light Coral&#39;,&#39;Slate Blue&#39;,&#39;Dark Khaki&#39;,&#39;Salmo
  
 scopes=tag_names((*!dustem_plugin))
 tgnms_extra = tag_names(_extra)
-ind_xr = where(strmid(tgnms_extra,0,2) eq 'XR')
-ind_yr = where(strmid(tgnms_extra,0,2) eq 'YR')
-if ind_xr EQ -1 then xr=[1.00E+00,1.00E+05] else xr=(_extra.(ind_xr))
-if ind_yr EQ -1 then yr=[5.00E-03,1.00E+08] else yr=(_extra.(ind_yr))
  
+ind_xrm = where(strmid(tgnms_extra,0,4) EQ 'XR_M',ct_xrm)
+ind_xrx = where(strmid(tgnms_extra,0,4) EQ 'XR_X',ct_xrx)
+ind_yrm = where(strmid(tgnms_extra,0,4) EQ 'YR_M',ct_yrm)
+ind_yrx = where(strmid(tgnms_extra,0,4) EQ 'YR_X',ct_yrx)
+ct_m = ct_xrm+ct_yrm
+ct_x = ct_xrx+ct_yrx
+
+IF ct_m+ct_x NE 0 THEN BEGIN
+
+    IF ct_xrm NE 0 THEN xr_m = (_extra.(ind_xrm))
+    IF ct_xrx NE 0 THEN xr_x = (_extra.(ind_xrx))
+    IF ct_yrm NE 0 THEN yr_m = (_extra.(ind_yrm))
+    IF ct_yrx NE 0 THEN yr_x = (_extra.(ind_yrx))
+
+ENDIF ELSE BEGIN
+
+    ind_xr = where(strmid(tgnms_extra,0,2) eq 'XR')
+    ind_yr = where(strmid(tgnms_extra,0,2) eq 'YR')
+    if ind_xr EQ -1 then xr=[1.00E+00,1.00E+05] else xr=(_extra.(ind_xr))
+    if ind_yr EQ -1 then yr=[5.00E-03,1.00E+08] else yr=(_extra.(ind_yr))
+    
+ENDELSE 
  
 frmt0='(A46)'
 frmt1='(1E11.4)'
@@ -44,13 +62,13 @@ frmt2=&#39;(10F10.2)&#39;
 ;I DO NOT REMEMBER RUNNING ANY OF THE TESTS HERE. 
  
  
-
 if keyword_set(dataset) then begin
 ;!run_pol is implied for QSED/USED/POLSED etc...
     Case strupcase(dataset) of 
  
         'SED': begin
  
+            IF ct_m NE 0 then xr=xr_m & yr=yr_m 
  
             vectw=DINDGEN(1001)*(alog10(1E7) - alog10(1E5))/(1000 - 1L) + alog10(1E5)
             vectw=10^vectw[1:*]
@@ -199,7 +217,7 @@ if keyword_set(dataset) then begin
  
  
                         ;Plotting of frequency axis
-                        cgaxis, xaxis=1, xlog=1, xs=1, xminor=10, xticklen=0.05, xrange=((!const.c*1E6/(_extra.(ind_xr)))*1E-9),charsize=1.15,title=textoidl('\nu (GHz)')
+                        cgaxis, xaxis=1, xlog=1, xs=1, xminor=10, xticklen=0.05, xrange=((!const.c*1E6/(xr))*1E-9),charsize=1.15,title=textoidl('\nu (GHz)')
  
                         xyouts,pospltxt[0],pospltxt[1],textoidl('I_{\nu} (MJy/sr)'),color=0,/normal,charsize=1.3;,charthick=2.0
  
@@ -253,6 +271,8 @@ if keyword_set(dataset) then begin
 ;             xr=[0.01,30]
 ;             yr=[1.00E-06,10]
  
+            IF ct_x NE 0 then xr=xr_x & yr=yr_x
+            
             vectw=DINDGEN(1001)*(alog10(1E7) - alog10(1E5))/(1000 - 1L) + alog10(1E5)
             vectw=10^vectw[1:*]
             vectw=[wavs,vectw]
@@ -458,6 +478,7 @@ if keyword_set(dataset) then begin
  
         'POLEXT': begin 
  
+            IF ct_x NE 0 then xr=xr_x & yr=yr_x
  
             vectw=DINDGEN(1001)*(alog10(1E7) - alog10(1E5))/(1000 - 1L) + alog10(1E5)
             vectw=10^vectw[1:*]
@@ -654,6 +675,7 @@ if keyword_set(dataset) then begin
  
         'POLSED': begin 
  
+            IF ct_m NE 0 then xr=xr_m & yr=yr_m
  
             vectw=DINDGEN(1001)*(alog10(1E7) - alog10(1E5))/(1000 - 1L) + alog10(1E5)
             vectw=10^vectw[1:*]
@@ -792,7 +814,7 @@ if keyword_set(dataset) then begin
  
  
                         ;Plotting of frequency axis
-                        cgaxis, xaxis=1, xlog=1, xs=1, xminor=10, xticklen=0.05, xrange=((!const.c*1E6/(_extra.(ind_xr)))*1E-9),charsize=1.15,title=textoidl('\nu (GHz)')
+                        cgaxis, xaxis=1, xlog=1, xs=1, xminor=10, xticklen=0.05, xrange=((!const.c*1E6/(xr))*1E-9),charsize=1.15,title=textoidl('\nu (GHz)')
  
                         xyouts,pospltxt[0],pospltxt[1],textoidl('P_{\nu} (MJy/sr)'),color=0,/normal,charsize=1.3;,charthick=2.0
  
@@ -841,6 +863,8 @@ if keyword_set(dataset) then begin
         end
  
         'POLFRAC': begin 
+            
+            IF ct_m NE 0 then xr=xr_m & yr=yr_m
  
             idx_filt=where((*!dustem_data.polfrac).filt_names NE 'SPECTRUM',ct_filt)
             idx_spec=where((*!dustem_data.polfrac).filt_names EQ 'SPECTRUM',ct_spec)
@@ -984,7 +1008,9 @@ if keyword_set(dataset) then begin
         end
  
         'FPOLEXT': BEGIN ; For completeness (not sure of the physical usefulness of this qauntity )
-        
+            
+            IF ct_x NE 0 then xr=xr_x & yr=yr_x
+            
             idx_filt=where((*!dustem_data.fpolext).filt_names NE 'SPECTRUM',ct_filt)
             idx_spec=where((*!dustem_data.fpolext).filt_names EQ 'SPECTRUM',ct_spec)
  
@@ -1133,6 +1159,8 @@ if keyword_set(dataset) then begin
  
         'PSI_EM': begin ;will be copying code from qsed and hopefully it will work. NB: THIS IS FALSE . YOU DO NOT NEED A LOGARITHMIC AXIS
  
+            IF ct_m NE 0 then xr=xr_m & yr=yr_m
+            
             idx_filt=where((*!dustem_data.psi_em).filt_names NE 'SPECTRUM',ct_filt)
             idx_spec=where((*!dustem_data.psi_em).filt_names EQ 'SPECTRUM',ct_spec)
  
@@ -1291,7 +1319,9 @@ if keyword_set(dataset) then begin
         end
  
         'PSI_EXT': begin ;MODIFYING THIS NOW - You should write a plugin for the modification of polarized extinction so that !dustem_psi_ext is different than !dustem_psi. 
-        
+            
+            
+            IF ct_x NE 0 then xr=xr_x & yr=yr_x
  
             idx_filt=where((*!dustem_data.psi_ext).filt_names NE 'SPECTRUM',ct_filt)
             idx_spec=where((*!dustem_data.psi_ext).filt_names EQ 'SPECTRUM',ct_spec)
@@ -1436,7 +1466,8 @@ if keyword_set(dataset) then begin
         end
  
         'QSED': begin ; THE ONE I WILL BE WORKING ON
-        
+            
+            IF ct_m NE 0 then xr=xr_m & yr=yr_m
  
             vectw=DINDGEN(1001)*(alog10(1E7) - alog10(1E5))/(1000 - 1L) + alog10(1E5)
             vectw=10^vectw[1:*]
@@ -1789,7 +1820,9 @@ if keyword_set(dataset) then begin
         END
  
         'USED': begin
-        
+            
+            IF ct_m NE 0 then xr=xr_m & yr=yr_m
+            
             vectw=DINDGEN(1001)*(alog10(1E7) - alog10(1E5))/(1000 - 1L) + alog10(1E5)
             vectw=10^vectw[1:*]
             vectw=[wavs,vectw]
@@ -2143,7 +2176,7 @@ if keyword_set(dataset) then begin
  
         'QEXT': begin   ;Correct this like you corrected extinction...
  
-            
+            IF ct_x NE 0 then xr=xr_x & yr=yr_x
             vectw=DINDGEN(1001)*(alog10(1E7) - alog10(1E5))/(1000 - 1L) + alog10(1E5)
             vectw=10^vectw[1:*]
             vectw=[wavs,vectw]
@@ -2519,7 +2552,7 @@ if keyword_set(dataset) then begin
         end
  
         'UEXT': begin
-        
+            IF ct_x NE 0 then xr=xr_x & yr=yr_x
             vectw=DINDGEN(1001)*(alog10(1E7) - alog10(1E5))/(1000 - 1L) + alog10(1E5)
             vectw=10^vectw[1:*]
             vectw=[wavs,vectw]
@@ -387,16 +387,17 @@ if test_m then begin
  
        if  ~iswinsed then begin
  
-           cmdind_m = !dustemcgwin_ncmds.sed.pl
-           cgwindow,'dustemcgwin_dataset', st, dustem_sed,SED_spec,dataset='SED', /refresh ,position=p_sed, winid=winid_m,cmdindex=cmdind_m,/replacecmd,_extra=_extra     
-           
-           cmdind_m = !dustemcgwin_ncmds.sed.nrm
-           cgwindow,'dustemcgwin_dataset', st, dustem_sed,SED_spec,dataset='SED', /norm, /refresh,position=np_sed, winid=winid_m,cmdindex=cmdind_m,/replacecmd,_extra=_extra
+            cmdind_m = !dustemcgwin_ncmds.sed.pl
+            cgwindow,'dustemcgwin_dataset', st, dustem_sed,SED_spec,dataset='SED', /refresh ,position=p_sed, winid=winid_m,cmdindex=cmdind_m,/replacecmd,_extra=_extra     
+            
+            cmdind_m = !dustemcgwin_ncmds.sed.nrm
+            cgwindow,'dustemcgwin_dataset', st, dustem_sed,SED_spec,dataset='SED', /norm, /refresh,position=np_sed, winid=winid_m,cmdindex=cmdind_m,/replacecmd,_extra=_extra
  
  
        endif else begin
  
            cgwindow,'dustemcgwin_dataset', st, dataset='SED', position=p_sed, /addcmd, winid=winid_m, _extra=_extra & cmdind_m+=1 
+           
            cgwindow,'dustemcgwin_dataset', st, dustem_sed,SED_spec, dataset='SED', /refresh ,position=p_sed, /addcmd, winid=winid_m, _extra=_extra & cmdind_m+=1
            !dustemcgwin_ncmds.sed.pl = cmdind_m
  
@@ -419,6 +420,7 @@ if test_m then begin
         endif else begin ;Qsed data is present
  
             if  ~iswinsed then begin
+            
                 cmdind_m = !dustemcgwin_ncmds.qsed.pl
                 ;refreshing the positive_only and negative_only plots if data is present in them
                 cgwindow,'dustemcgwin_dataset', st, dustem_qsed,Q_spec,dataset='QSED',/positive_only, nodata=0, /refresh ,position=p_qsed, winid=winid_m,/replacecmd,cmdindex=cmdind_m, _extra=_extra