unfortunate merge because I want to keep these files

Ilyes Choubani
1 parent 2926480f
Showing 2 changed files with 19 additions and 52 deletions Show diff stats
src/idl/dustem_init.pro
src/idl/dustemwrap_plot.pro
@@ -211,7 +211,10 @@ defsysv, &#39;!dustemcgwin_id&#39;, {    $ ;IDs of windows to plot
                             ext:    la_undef(),      $
                             prms:   la_undef(),      $
                             plgns:  la_undef()       $
-                     }                                                      
+                     }  
+                     
+                     
+defsysv, '!dustem_dim', 0                                                                        
  
 defsysv, '!dustemcgwin_ncmds', {    $ ;Data to fit
                             sed:     {pl:0, nrm:0},      $ ; 
@@ -91,10 +91,11 @@ END
 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?
+ENDIF
  
-  ;# Emission
-  ;if isa(!dustem_data.sed) then begin ;using !dustem_data instead of !dustem_show because in this release the user is compelled to fit IQU whether in M or X
-  if not keyword_set(dustem_sed) and isa((*!dustem_data).sed) then begin ;better test?
+;# Emission
+
+if not keyword_set(dustem_sed) and isa((*!dustem_data).sed) then begin ;better test?
  
       dustem_sed = dustem_compute_sed(p_dim,st=st,SED_spec=SED_spec)
  
@@ -107,11 +108,11 @@ IF not keyword_set(st) THEN BEGIN
           ;stop
  
       endif         
-  endif
+endif
  
   ;# Extinction
-;   if isa(!dustem_data.ext) then begin
-  if not keyword_set(dustem_ext) and isa((*!dustem_data).ext) then begin
+
+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 then begin
@@ -122,44 +123,7 @@ IF not keyword_set(st) THEN BEGIN
           dustem_qext = toto[0]
           dustem_uext = toto[1]
       endif
-  endif
-  
-ENDIF ELSE BEGIN ;st is provided 
-    ;stop
-
-    ;# Emission
-    ;if isa(!dustem_data.sed) then begin
-    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 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]
-            ;stop    
-        endif
-    endif
-    
-    ;# Extinction
-    ;if isa(!dustem_data.ext) then begin
-    
-    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 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_spec=PSIEXT_spec,dustem_psi_ext=dustem_psi_ext) 
-            dustem_qsed = toto[0]
-            dustem_used = toto[1]
-            
-        endif
-    endif
-    
-ENDELSE 
+endif
  
  
 ;IC: Will come back for this to include all datasets and their associated data.
@@ -479,7 +443,7 @@ if test_m then begin
  
         ;update of the title here ?
  
-        if !dustem_end EQ 1 then begin
+        if !dustem_end EQ 1 then begin  ;IF & ONLY IF we're at the last iteration
             ;replacing my count - 3
             tit=!dustem_plot_range.title_m
             cmdin_m = !dustemcgwin_ncmds.pltit.pl
@@ -492,7 +456,7 @@ if test_m then begin
         endif
  
  
-        if !dustem_end EQ -1 then begin ;IF & ONLY IF we're at the last iteration
+        if !dustem_end EQ -1 then begin ;Subsequent iterations the end of the fit 
  
             tit=!dustem_plot_range.title_m
             cmdind_m = !dustemcgwin_ncmds.pltit.pl
@@ -742,8 +706,8 @@ ENDIF
 if test_x then begin
     ;Generating extinction window and saving window ID
  
-    if iswinext then begin
-        
+    if iswinext then begin 
+        ; fixed data 
         if !run_pol then cgwindow,wxsize=main_wxsize,wysize=main_wysize,wtitle='DUSTEMWRAP '+!dustem_version.version+' (EXTINCTION)' else 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) ;this has to be changed because the dimensions of this array change with the data sets present (extinction/emission).
         !dustemcgwin_id.ext = winid_x
@@ -864,7 +828,7 @@ if test_x then begin
  
         !dustemcgwin_ncmds.pltit.pl = cmdind_x
  
-    endif else begin 
+    endif else begin ;  refreshed runs 
  
  
         winid_x = !dustemcgwin_id.ext
@@ -979,7 +943,7 @@ if test_x then begin
  
     endif else begin ;EXT exists
  
-        if  ~iswinext then begin
+        if  ~iswinext then begin ; refreshed runs
  
             cmdind_x = !dustemcgwin_ncmds.ext.pl
             cgwindow,'dustem_plot_dataset', st, dustem_ext,EXT_spec,dataset='EXT', /refresh ,position=p_ext, winid=winid_x,cmdindex=cmdind_x,/replacecmd,_extra=_extra     
@@ -988,7 +952,7 @@ if test_x then begin
             cgwindow,'dustem_plot_dataset', st, dustem_ext,EXT_spec,dataset='EXT', /norm, /refresh,position=np_ext, winid=winid_x,cmdindex=cmdind_x,/replacecmd,_extra=_extra
  
  
-        endif else begin
+        endif else begin ;fixed runs
  
             cgwindow,'dustem_plot_dataset', st, dataset='EXT', position=p_ext, /addcmd, winid=winid_x, _extra=_extra & cmdind_x+=1 
             cgwindow,'dustem_plot_dataset', st, dustem_ext,EXT_spec, dataset='EXT', /refresh ,position=p_ext, /addcmd, winid=winid_x, _extra=_extra & cmdind_x+=1