modifs because gdl does not accept keywords with same name as functions

Annie Hughes
1 parent 07c38c5f
Showing 4 changed files with 16 additions and 17 deletions Show diff stats
src/idl/dustem_activate_plugins.pro
src/idl/dustem_compute_sed.pro
src/idl/dustem_run_plugins.pro
src/idl/dustem_run_prediction_example.pro
@@ -80,7 +80,7 @@ endelse
 ;PART WHERE THE PLUGINS RUN ACCORDING TO THEIR SCOPES. 
  
 ;normal (additive) plugins come first as they can be used by other plugins 
-;The ISRF plugin is next - we can always change its scope however we please to. DustEm runs here. This is with the /dustem_run keyword. 
+;The ISRF plugin is next - we can always change its scope however we please to. DustEm runs here. This is with the /force_dustem_run keyword. 
 ;The plugins that use the DustEM output come next - we can always change their 'common' scope 
  
 ;IF /avoid is used the specified scopes are avoided. They're considered when /avoid is missing.
@@ -91,7 +91,7 @@ dustem_run_plugins, p_dim ,param_descs, param_values, param_func, [&#39;*STELLAR*&#39;,&#39;
 ;=== it would run fine if avoid was set to 1
 ;IC: I think the segmentation fault comes from the fact that the user wants to use models that have the /pol keyword in the GRAIN.DAT file without being in polarization mode.
  
-dustem_run_plugins, p_dim ,param_descs, param_values, param_func, ['*STELLAR*','*ISRF*'] ,dustem_run=1,st=st ;dustem output is available at this step.
+dustem_run_plugins, p_dim ,param_descs, param_values, param_func, ['*STELLAR*','*ISRF*'] ,force_dustem_run=1,st=st ;dustem output is available at this step.
  
 ;added this small condition to ensure that dustem is run
 ;(if no ISRF plugin is used)  
@@ -59,11 +59,10 @@ IF keyword_set(help) THEN BEGIN
 ENDIF
  
 IF not keyword_set(st) THEN BEGIN
-  dustem_activate_plugins,p_dim/(*(*!dustem_fit).param_init_values),st=st  
+   dustem_activate_plugins,p_dim/(*(*!dustem_fit).param_init_values),st=st  
 ENDIF
  
 ; Convert into MJy/sr/1d20
-
 fact = 1.e4*(*!dustem_HCD)/(4.*!pi)/(3.e8/1.e-6/st.sed.wav)*1.e20/1.e7 ;this is correct despite the way it is presented (1.e4/1e.7*1e.20=1.e17 which is the factor to convert from ergs to Mega Janskys)
 SED_spec = st.sed.em_tot * fact
  
@@ -5,7 +5,7 @@ PRO dustem_run_plugins, p_dim ,$
                         scopes,$
                         st=st,$
                         avoid=avoid,$
-                        dustem_run=dustem_run,$
+                        force_dustem_run=force_dustem_run,$
                         help=help
  
 ;+
@@ -20,7 +20,7 @@ PRO dustem_run_plugins, p_dim ,$
 ;    DustEMWrap, Distributed, Mid-Level, Plugins
 ;
 ; CALLING SEQUENCE:
-;    dustem_run_plugins,p_dim,param_descs,param_values,scopes,[,st][,avoid][,dustem_run][,/help] 
+;    dustem_run_plugins,p_dim,param_descs,param_values,scopes,[,st][,avoid][,force_dustem_run][,/help] 
 ;
 ; INPUTS:
 ;    p_dim  = parameter values 
@@ -31,7 +31,7 @@ PRO dustem_run_plugins, p_dim ,$
 ;
 ; OPTIONAL INPUT PARAMETERS:
 ;    avoid      = scopes should be avoided
-;    dustem_run = Dustem should be run
+;    force_dustem_run = Dustem should be run
 ;
 ; OUTPUTS:
 ;    None
@@ -55,7 +55,7 @@ PRO dustem_run_plugins, p_dim ,$
 ; PROCEDURES AND SUBROUTINES USED:
 ;
 ; EXAMPLES
-;    dustem_activate_plugins, p_min, pram_descs, param_values, param_func, scopes, st=st, avoid=avoid, dustem_run=dustem_run 
+;    dustem_run_plugins, p_min, param_descs, param_values, param_func, scopes, st=st, avoid=avoid, /force_dustem_run 
 ;
 ; MODIFICATION HISTORY:
 ;    Written by IC 
@@ -76,7 +76,7 @@ IF (tag_names(*!dustem_plugin))(0) EQ &#39;NONE&#39; THEN goto, the_end
  
 ;Just to be sure 
 if not keyword_set(avoid) then avoid=0
-if not keyword_set(dustem_run) then dustem_run=0
+if not keyword_set(force_dustem_run) then force_dustem_run=0
  
 ;stop
  
@@ -135,7 +135,7 @@ IF ~test_all_scopes THEN BEGIN
  
 	        ;==============Dry run of the plugins to obtain their scopes and run them accordingly==============
  
-	        str='toto='+ftn+'(scope=scope)' & str=str(0)        
+	        str='toto='+ftn+'(scope=scope)' & str=str[0]       
                 toto=execute(str)
 	        ((*!dustem_plugin).(k).scope)=ptr_new(scope)
  
@@ -177,7 +177,8 @@ FOR i=0L,n_elements(scopes)-1 DO BEGIN
 	;Now locating the indices of this scope in !dustem_plugin. 
  
 	FOR j=0L,n_tags(*!dustem_plugin)-1 DO BEGIN
-        
+
+           stop
         test = strcmp((*((*!dustem_plugin).(j).scope)),scope_to_match,strlen(scope_to_match),/FOLD_CASE) EQ 1
  
         IF test and keyword_set(avoid) THEN BEGIN
@@ -271,10 +272,9 @@ ENDFOR
  
  
 the_end:
-if keyword_set(dustem_run) then begin ;and idd gt 0. : remved this so that dustem is always run when the keyword is mentioned.
+if keyword_set(force_dustem_run) then begin ;and idd gt 0. : remved this so that dustem is always run when the keyword is mentioned.
    st = dustem_run(p_dim)
    !dustem_current = ptr_new(st)
 endif 
  
-
 END
@@ -8,6 +8,7 @@ PRO dustem_run_prediction_example, model $
                                    ,show=show $
                                    ,fits_save=fits_save $
                                    ,noobj=noobj $
+                                   ,noexit=noexit $
                                    ,help=help
  
 ;+
@@ -204,7 +205,6 @@ dustem_Uext=dustem_Iext*0.
  
 ;== Now we have a predicted SED (I), we fill up a structure that we
 ;== will write to the sed_outfile
-;== if you 
 sed.stokesI=dustem_Ised
 sed.stokesQ=dustem_Qsed
 sed.stokesU=dustem_Used
@@ -247,9 +247,9 @@ message,&#39;Wrote &#39;+use_ext_outfile,/continue
  
 ;=== MAKE A PLOT TO VISUALISE THE OUTPUT
 IF !dustem_noobj THEN BEGIN
-  dustemwrap_plot_noobj,*(*!dustem_fit).CURRENT_PARAM_VALUES,st=dummy,xr=xr,/xstyle,yr=yr,/ysty,/ylog,/xlog,title=tit
+  dustemwrap_plot_noobj,pval,st=dummy,xr=xr,/xstyle,yr=yr,/ysty,/ylog,/xlog,title=tit
  ENDIF ELSE BEGIN
-  dustemwrap_plot,*(*!dustem_fit).CURRENT_PARAM_VALUES,st=dummy,xr=xr,/xstyle,yr=yr,/ysty,/ylog,/xlog,title=tit
+  dustemwrap_plot,pval,st=dummy,xr=xr,/xstyle,yr=yr,/ysty,/ylog,/xlog,title=tit
 ENDELSE
  
  
@@ -260,6 +260,6 @@ ENDIF
  
 the_end:
 message,'Finished dustem_run_prediction_example',/info
-stop
+if keyword_set(noexit) then stop
  
 END