saved dustem_params and nocheck keyword to integral for gdl users

Annie Hughes
1 parent 54f8eed5
Showing 1 changed file with 12 additions and 5 deletions Show diff stats
src/idl/dustem_plugin_dl07_isrf_model.pro
@@ -115,9 +115,12 @@ Ngrains=(*!dustem_params).ngrains
 spec_grains=fltarr(Nwavs,ngrains) 
 spec2_grains=fltarr(Nwavs,ngrains)
  
-
 ;==== save everything to put back later
-saved_pd=0 & saved_pinfo=0 & saved_fpd=0
+saved_params=0 & saved_pd=0 & saved_pinfo=0 & saved_fpd=0
+IF ptr_valid(!dustem_params) THEN BEGIN
+   dparams=*!dustem_params
+   saved_params=1
+END
 IF ptr_valid((*!dustem_fit).param_descs) THEN BEGIN
   pd=*(*!dustem_fit).param_descs
   iv=*(*!dustem_fit).param_init_values
@@ -133,6 +136,7 @@ IF ptr_valid((*!dustem_fit).fixed_param_descs) THEN BEGIN
   fiv=*(*!dustem_fit).fixed_param_init_values
   saved_fpd=1
 ENDIF
+stop
  
 ;==== Run dustem with G0(a.k.a. U)=1.
 param_desc=['(*!dustem_params).G0']
@@ -173,10 +177,10 @@ IF gamma NE 0. THEN BEGIN
     ;integrate over U
     ;stop
     FOR j=0L,Nwavs-1 DO BEGIN
-        integ=integral(Us,reform(specs[*,j]),Umin,Umax)
+        integ=integral(Us,reform(specs[*,j]),Umin,Umax,/no_check)
         spec[j]=spec[j]+integ[0]
         for k=0,ngrains-1 do begin
-           integ_grains=integral(Us,reform(specs_grains[*,j,k]),Umin,Umax)
+           integ_grains=integral(Us,reform(specs_grains[*,j,k]),Umin,Umax,/no_check)
            spec_grains[j,k]=spec_grains[j,k]+integ_grains[0]
         endfor
     ENDFOR
@@ -193,7 +197,7 @@ for k=0,ngrains-1 do st.sed.(k+1)=spec_grains[*,k]
 if saved_pd eq 1 then begin
   (*!dustem_fit).param_descs=ptr_new(pd)
   (*!dustem_fit).param_init_values=ptr_new(iv)
-  (*!dustem_fit).param_init_values=ptr_new(cv)
+  (*!dustem_fit).current_param_values=ptr_new(cv)
 end
 if saved_fpd eq 1 then begin
   (*!dustem_fit).fixed_param_descs=ptr_new(fpd)
@@ -202,6 +206,9 @@ end
 if saved_pinfo eq 1 then begin
    !dustem_parinfo=ptr_new(parinfo)
 end
+if saved_params eq 1 then begin
+   !dustem_params=ptr_new(dparams)
+end
  
  
 the_end: