Merge branch 'master' of https://gitlab.irap.omp.eu/OV-GSO-DC/dustem-wrapper_idl

Annie Hughes
2 parents 70982162 cbdd1393
Showing 3 changed files with 21 additions and 6 deletions Show diff stats
src/idl/dustem_fit_intensity_example.pro
src/idl/dustemwrap_plot.pro
src/idl/dustemwrap_plot_noobj.pro
@@ -331,6 +331,17 @@ if keyword_set(wait) then begin
    wait,wait
 end
  
+
+
+;IC: -
+;The final plot is automatically plotted
+;and a (Final run) string is automatically added
+;to modify this go to dustemwrap_plot and search for the string '(FINAL_RUN)' 
+;This is true for OOP plotting.
+;However, even thought the last iteration for noobj plotting is plotted, the '(FINAL_RUN)' string isn't applied
+;to modify this, got to dustemwrap_plot_noobj and search for the '(RUNNING)' string. 
+;an extra condition using !dustem_end (signaling end of fit) will have to be used. 
+
 ;=== MAKE THE FINAL PLOT
 IF keyword_set(postscript) THEN BEGIN
     dir_ps='./'
@@ -340,7 +351,7 @@ IF keyword_set(postscript) THEN BEGIN
 ENDIF
 IF !dustem_noobj THEN BEGIN
   dustemwrap_plot_noobj,*(*!dustem_fit).CURRENT_PARAM_VALUES,dummy,xr=xr,/xstyle,yr=yr,/ysty,/ylog,/xlog,title=tit+' (Final fit)'
-ENDIF ELSE BEGIN
+ ENDIF ELSE BEGIN
   dustemwrap_plot,*(*!dustem_fit).CURRENT_PARAM_VALUES,dummy,xr=xr,/xstyle,yr=yr,/ysty,/ylog,/xlog,title=tit+' (Final fit)'
 ENDELSE
  
@@ -355,6 +366,11 @@ if keyword_set(wait) then begin
    wait,wait
 end
  
+;IC: Last iteration is automatically plotted.
+;I think modifications will have to be applied to dustemwrap_plot...
+;idea: create a system variable that signals if the fits file has been successfully saved and use it in the dustemwrap_plot(obj/noobj) routine(s) 
+;to add the '(From saved FITS file)' string to the title
+;
 IF keyword_set(fits_save_and_restore) THEN BEGIN
    message,'Writing out results structure: '+fits_save_and_restore,/info
    dustem_write_fits_table,filename=fits_save_and_restore,help=help
@@ -434,7 +434,7 @@ if test_m then begin
  
         ;NB issue here because the user can't modify the title after the dustem_mpfit_data call at the main procedure level (user proc)
         ;Getting the width of the title 
-        tit=string(_extra.title);
+        tit=!dustem_plot_range.title_m;
  
         cgtext, 0.3, 0.95,tit+' (RUNNING)',color=0,/normal,charsize=-1,width=thiswidth,/addcmd & cmdind_m+=1
         widthtot = thiswidth
@@ -836,7 +836,7 @@ if test_x then begin
  
  
         ;Getting the width of the title 
-        tit=string(_extra.title);
+        tit=!dustem_plot_range.title_x;
  
         cgtext, 0.3, 0.95,tit+' (RUNNING)',color=0,/normal,charsize=-1,width=thiswidth,/addcmd & cmdind_x+=1
         widthtot = thiswidth
@@ -171,7 +171,6 @@ new_mouchard.chi2=(*!dustem_fit).chi2
 new_mouchard.rchi2=(*!dustem_fit).rchi2
  
  
-
 ;IC: I've commented this test below but it was uncommented. I don't understand its function. 
 ;Current parameter values including plugins have been available at each iteration prior to commenting this.
 ;Leaving as is.
@@ -412,7 +411,7 @@ if test_m then begin
  
     ;NB issue here because the user can't modify the title after the dustem_mpfit_data call at the main procedure level (user proc)
     ;Getting the width of the title 
-    tit=string(_extra.title);
+    tit=!dustem_plot_range.title_m;
  
     cgtext, 0.3, 0.95,tit+' (RUNNING)',color=0,/normal,charsize=-1,width=thiswidth 
     widthtot = thiswidth
@@ -682,7 +681,7 @@ if test_x then begin
  
  
     ;Getting the width of the title 
-    tit=string(_extra.title);
+    tit=!dustem_plot_range.title_x;
  
     cgtext, 0.3, 0.95,tit+' (RUNNING)',color=0,/normal,charsize=-1,width=thiswidth
     widthtot = thiswidth