replaced V2.0 by value in dustem_version ssytem variable

Jean-Philippe Bernard
1 parent 11c71cbb
Showing 1 changed file with 7 additions and 6 deletions Show diff stats
src/idl/dustemwrap_plot.pro
@@ -74,7 +74,8 @@ print,&#39;!dustem_inter chi^2:&#39;,!dustem_iter.act,(*!dustem_fit).rchi2,(*!dustem_fit
 dd=(*(*!dustem_data).sed).values
 ss=(*(*!dustem_data).sed).sigma
 recomputed_chi2_sed   = total((dd-dustem_sed)^2/ss^2)
-recomputed_rchi2_sed  = recomputed_chi2_sed / n_elements((*(*!dustem_data).sed).values)
+dof= n_elements((*(*!dustem_data).sed).values) - n_elements(*(*!dustem_fit).PARAM_DESCS)
+recomputed_rchi2_sed  = recomputed_chi2_sed / dof
  
 print,'recomputed chi^2:',!dustem_iter.act,recomputed_rchi2_sed,recomputed_chi2_sed
 mouchard=*!iteration_mouchard
@@ -90,7 +91,7 @@ mouchard=[mouchard,new_mouchard]
  
 print,new_mouchard
  
-;stop
+stop
  
  
 ;LIST OF TESTS THAT NEED TO BE RAN SO THAT THE PLOTTING OF THE MODEL SPECTRA OCCURS
@@ -224,7 +225,7 @@ if test_m then begin
  
     if iswinsed then begin    ;This is when the cgwindow does not exist already
  
-        if !run_pol then cgwindow,wxsize=main_wxsize,wysize=main_wysize,wtitle='DUSTEMWRAP v2.0 (EMISSION)' else cgwindow,wxsize=main_wxsize,wysize=main_wysize,wtitle='DUSTEMWRAP v2.0 (EMISSION)';, wback='grey';,wobject=winobj_m
+        if !run_pol then cgwindow,wxsize=main_wxsize,wysize=main_wysize,wtitle='DUSTEMWRAP '+!dustem_version.version+' (EMISSION)' else cgwindow,wxsize=main_wxsize,wysize=main_wysize,wtitle='DUSTEMWRAP '+!dustem_version.version+' (EMISSION)';, wback='grey';,wobject=winobj_m
         winid_m = cgquery(dimensions=dim_m,/current) ;this has to be changed because the dimensions of this array change with the data sets present (extinction/emission).
         !dustemcgwin_id.sed = winid_m
  
@@ -624,7 +625,7 @@ if test_x then begin
  
     if iswinext then begin
  
-        if !run_pol then cgwindow,wxsize=main_wxsize,wysize=main_wysize,wtitle='DUSTEMWRAP v2.0 (EXTINCTION)' else cgwindow,wxsize=main_wxsize,wysize=main_wysize,wtitle='DUSTEMWRAP v2.0 (EXTINCTION)';, wback='grey';,wobject=winobj_m
+        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
  
@@ -1028,7 +1029,7 @@ IF ~iswinprms THEN BEGIN;(NEXT RUNS)
     cgwindow,'dustemcgwin_dataset', st, res, errors, p_dim,dataset='PARAMETERS', /refresh, winid=winid_prms,/replacecmd,cmdindex=cmdind_prms, _extra=_extra
     cgcontrol, winid_prms ,execute=1 
 ENDIF ELSE BEGIN ;(FIRST RUN)
-    cgwindow,wxpos=param_wxpos,wypos=param_wypos,wxsize=param_wxsize,wysize=param_wysize,wtitle='DUSTEMWRAP v2.0 (PARAMETERS)' ; keeping the same y dimension of the emission/extinction plot? 
+    cgwindow,wxpos=param_wxpos,wypos=param_wypos,wxsize=param_wxsize,wysize=param_wysize,wtitle='DUSTEMWRAP '+!dustem_version.version+' (PARAMETERS)' ; keeping the same y dimension of the emission/extinction plot? 
 ;    cgwindow,wxsize=350,wysize=200,wtitle='DUSTEMWRAP v2.0 (PARAMETERS)' ; keeping the same y dimension of the emission/extinction plot? 
     winid_prms = cgquery(dimensions=dim_prms,/current) ;we don't need the dimension of the window so far/ I don't know why I needed it before
     cgcontrol, winid_prms, execute=0
@@ -1052,7 +1053,7 @@ IF (tag_names(*!dustem_plugin))(0) NE &#39;NONE&#39; THEN BEGIN
         cgwindow,'dustemcgwin_dataset', st, res, errors, p_dim,dataset='PLUGINS', /refresh, winid=winid_plgns,/replacecmd,cmdindex=cmdind_plgns, _extra=_extra
         cgcontrol, winid_plgns ,execute=1 
     ENDIF ELSE BEGIN ;(FIRST RUN)
-        cgwindow,wxpos=plugin_wxpos,wypos=plugin_wypos,wxsize=plugin_wxsize,wysize=plugin_wysize,wtitle='DUSTEMWRAP v2.0 (PLUGINS)' ; keeping the same y dimension of the emission/extinction plot? 
+        cgwindow,wxpos=plugin_wxpos,wypos=plugin_wypos,wxsize=plugin_wxsize,wysize=plugin_wysize,wtitle='DUSTEMWRAP '+!dustem_version.version+' (PLUGINS)' ; keeping the same y dimension of the emission/extinction plot? 
         ;cgwindow,wxsize=350,wysize=200,wtitle='DUSTEMWRAP v2.0 (PLUGINS)' ; keeping the same y dimension of the emission/extinction plot? 
         winid_plgns = cgquery(dimensions=dim_plgns,/current) ;we don't need the dimension of the window so far/ I don't know why I needed it before
         cgcontrol, winid_plgns, execute=0