Commit 18e0971f2d30f257290f989cf2ca08fb9e8de082

Authored by Annie Hughes
2 parents bfd73a3c 74043007
Exists in master

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

Showing 2 changed files with 12 additions and 2 deletions   Show diff stats
src/idl/dustem_init.pro
... ... @@ -84,6 +84,12 @@ ENDIF
84 84  
85 85 dustem_define_la_common
86 86  
  87 +defsysv,'!dustem_noobj',1 ;set to 1 to not use object graphics
  88 +
  89 +un_mouchard={iteration:0L,chi2:0.d0,rchi2:0.d0,parameters_descriptions:ptr_new(),parameters_values:ptr_new()}
  90 +mouchard=ptr_new(replicate(un_mouchard,1))
  91 +defsysv,'!iteration_mouchard',mouchard
  92 +
87 93 defsysv,'!dustem_verbose',0 ;1=verbose
88 94 IF keyword_set(verbose) THEN !dustem_verbose=1
89 95  
... ...
src/idl/dustem_mpfit_run.pro
... ... @@ -307,8 +307,12 @@ message,'======================================================================'
307 307 !Error_State.msg=''
308 308  
309 309 ;=== plotting the fit
310   -if !dustem_iter.act NE !dustem_iter.prv or !dustem_iter.prv EQ 1 then begin
311   - 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
  310 +if !dustem_iter.act NE !dustem_iter.prv or !dustem_iter.prv EQ 1 then begin
  311 + IF !dustem_noobj EQ 0 THEN BEGIN
  312 + 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
  313 + ENDIF ELSE BEGIN
  314 + 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
  315 + ENDELSE
312 316 if !dustem_iter.act EQ 1 then begin
313 317 !dustem_iter.prv=0
314 318 !dustem_iter.act=0
... ...