removed worst bugs

Annie Hughes
1 parent 1e69909c
Showing 1 changed file with 52 additions and 28 deletions Show diff stats
src/idl/dustem_init_params.pro
@@ -163,7 +163,7 @@ if keyword_set(fpd) then begin
       stop
    end
 ;== CHECK IF USER HAS MADE SOMETHING FIXED AND FREE
-   match,pd,fpd,a,b,count=ct
+   match,strupcase(pd),strupcase(fpd),a,b,count=ct
    if ct ne 0 then begin
       message, 'Parameter(s) that are both free and fixed?',/info
       print,'Matching free parameters: '+pd[a]
@@ -225,13 +225,18 @@ if par_status eq 1 and not keyword_set(force_reset) then begin
       old_ulims[i]=(old_parinfo[i].limits[1])*old_iv[i]
       old_llims[i]=(old_parinfo[i].limits[0])*old_iv[i]
    endfor
-   match,new_pd,old_pd,a,b,count=ndups
+   ; check for duplicates 
+   noldpars=n_elements(old_pd)
+   match,strupcase(new_pd),strupcase(old_pd),a,b,count=ndups
    if ndups gt noldpars then begin
-      message, 'Number of duplicates exceeds number of parameters. This should not happen ?'/info
+      message, 'Number of duplicates exceeds number of existing parameters. This should not happen ?'/info
       stop
    endif
-   if ndups gt 0 and ndups lt noldpars then begin
-      if  !dustem_verbose NE 0 then message,string(ndups)+' matching parameters found. Updating values for '+old_pd[b],/info
+   if ndups gt 0 and ndups le noldpars then begin
+      if  !dustem_verbose NE 0 then begin
+         message,string(ndups)+' matching parameters found. Updating values...',/info
+         for i=0,ndups-1 do print,old_pd[b[i]]
+      end
       remove,b,old_pd
       remove,b,old_iv
       remove,b,old_parinfo
@@ -241,29 +246,35 @@ if par_status eq 1 and not keyword_set(force_reset) then begin
       remove,b,old_llims
       remove,b,old_fixed
       remove,b,old_tied
-      pd=[new_pd,old_pd]
-      iv=[new_iv,old_iv]
-      ulimed=[new_ulimed,old_ulimed]
-      llimed=[new_llimed,old_llimed]
-      ulims=[new_ulims,old_ulims]
-      llims=[new_llims,old_llims]
-      fixed=[new_fixed,old_fixed]
-      tied=[new_tied,old_tied]
    endif
-      ; if ndups eq noldpars, then this is equivalent to a reset
-      if ndups eq noldpars and  !dustem_verbose NE 0 then $
-         message,'Updating existing parameters to their new values',/info
+   ;merge the structures
+   pd=[new_pd,old_pd]
+   iv=[new_iv,old_iv]
+   ulimed=[new_ulimed,old_ulimed]
+   llimed=[new_llimed,old_llimed]
+   ulims=[new_ulims,old_ulims]
+   llims=[new_llims,old_llims]
+   fixed=[new_fixed,old_fixed]
+   tied=[new_tied,old_tied]
 endif
  
+
+;; stop
+;; message,'line 262',/info
+;; if ptr_valid((*!dustem_fit).param_descs) then print,(*(*!dustem_fit).param_descs)
+;; if ptr_valid((*!dustem_fit).fixed_param_descs) then print,(*(*!dustem_fit).fixed_param_descs)
+;; stop
+
 ;== INITIALIZE DUST MODEL PARAMETERS and PLUGIN FREE PARAMETERS
 dustem_init_parinfo,pd,iv,up_limited=ulimed,lo_limited=llimed,up_limits=ulims,lo_limits=llims,fixed=fixed,tied=tied
  
-;== INITIALIZE ANY PLUGINS
-IF not keyword_set(no_reset_plugin_structure) THEN BEGIN
-   dustem_init_plugins,pd,fpd=fpd
-ENDIF
+;; stop
+;; message,'line 271',/info
+;; if ptr_valid((*!dustem_fit).param_descs) then print,(*(*!dustem_fit).param_descs)
+;; if ptr_valid((*!dustem_fit).fixed_param_descs) then print,(*(*!dustem_fit).fixed_param_descs)
+;; stop
  
-;== INITIALIZE ANY FIXED PARAMETERS FOR DUST MODEL AND PLUGINS
+;== Initialize ANY FIXED PARAMETERS FOR DUST MODEL AND PLUGINS
 IF keyword_set(fpd) THEN BEGIN
 ;== PLAY NICE -- check what already exists in the fixed parameter structure
    fpar_status=ptr_valid((*!dustem_fit).fixed_param_descs)
@@ -282,26 +293,39 @@ IF keyword_set(fpd) THEN BEGIN
       old_fiv=(*(*!dustem_fit).fixed_param_init_values)
       noldfixed=n_elements(old_fpd)
  
-      match,new_fpd,old_fpd,a,b,count=ndups
+      match,strupcase(new_fpd),strupcase(old_fpd),a,b,count=ndups
       if ndups gt noldfixed then begin
          message, 'Number of duplicates exceeds number of fixed parameters. This should not happen ?'/info
          stop
       endif
-      if ndups gt 0 and ndups lt noldfixed then begin
+      if ndups gt 0 and ndups le noldfixed then begin
          if  !dustem_verbose NE 0 then message,string(ndups)+' matching fixed parameters found. Updating values for '+old_fpd[b],/info
          remove,b,old_fpd
          remove,b,old_fiv
-         fpd=[new_fpd,old_fpd]
-         fiv=[new_fiv,old_fiv]
       endif
-      if ndups eq noldfixed and  !dustem_verbose NE 0 then $
-         message,'Updating fixed parameters to their new values',/info
+      fpd=[new_fpd,old_fpd]
+      fiv=[new_fiv,old_fiv]
    endif
-
    dustem_init_fixed_params,fpd,fiv
 ENDIF
+;; stop
+;; message,'line 312',/info
+;; if ptr_valid((*!dustem_fit).param_descs) then print,(*(*!dustem_fit).param_descs)
+;; if ptr_valid((*!dustem_fit).fixed_param_descs) then print,(*(*!dustem_fit).fixed_param_descs)
+;; stop
+
+;== INITIALIZE ANY PLUGINS
+IF not keyword_set(no_reset_plugin_structure) THEN BEGIN
+   dustem_init_plugins,pd,fpd=fpd
+ENDIF
+;; stop
+;; message,'line 322',/info
+;; if ptr_valid((*!dustem_fit).param_descs) then print,(*(*!dustem_fit).param_descs)
+;; if ptr_valid((*!dustem_fit).fixed_param_descs) then print,(*(*!dustem_fit).fixed_param_descs)
+;; stop
  
 if !dustem_verbose NE 0 then message,'Finished initializing free and fixed parameters of dust model and plugins',/info
+;;stop
  
 the_end: