modified to fix bugs when running under fawlty

Jean-Philippe Bernard
1 parent 95bdc476
Showing 4 changed files with 90 additions and 63 deletions Show diff stats
src/idl/dustem_activate_plugins.pro
src/idl/dustem_plugin_stellar_population.pro
src/idl/dustem_run_plugins.pro
src/idl/dustem_write_isrf_lv.pro
@@ -76,6 +76,9 @@ endelse
 ;IF /avoid is used the specified scopes are avoided. They're considered when /avoid is missing.
 ;using '**' so not to write the entire scope
 dustem_run_plugins, p_dim ,param_descs, param_values, param_func, ['*STELLAR*','*REPLACE*','*ISRF*'], avoid=1
+;stop
+;=== The line below makes fawlty go Segmentation fault. st is undefined at that stage
+;=== it would run fine if avoid was set to 1
 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.
  
 ;added this small condition to ensure that dustem is run
-Function dustem_plugin_stellar_population, key=key, val=val, scope=scope, paramtag=paramtag,help=help 
+Function dustem_plugin_stellar_population, key=key, val=val, scope=scope, paramtag=paramtag,help=help,test=test
  
 ;+
 ; NAME:
@@ -32,6 +32,8 @@ Function dustem_plugin_stellar_population, key=key, val=val, scope=scope, paramt
 ;-
 ;- HISTORY: ADDED STELLAR LUMINOSITY CLASSES
  
+IF keyword_set(test) THEN stop
+
 IF keyword_set(help) THEN BEGIN
   doc_library,'dustem_plugin_stellar_population'
   goto,the_end
@@ -88,8 +90,12 @@ IF keyword_set(key) THEN BEGIN
     T_eff_MS = V2
     R_star_MS = V7
  
-    
-    lumclass = (strmid(key,2)).remove(-1) ; extracting the luminosity class strings 
+    ;JPB: This is highly non standard and makes Fawlty go "Segmentation fault"
+    ;lumclass = (strmid(key,2)).remove(-1) ; extracting the luminosity class strings 
+    lumclass=strarr(n_elements(key))
+    FOR i=0L,n_elements(key)-1 DO BEGIN
+        lumclass[i]=strmid(key[i],2,1)
+    ENDFOR
     params = strmid(key,0,/reverse_offset) ; extracting the indices (in the 'key' array) of the stellar parameters to fit  
  
     ; Locating the O3 stellar population parameters - this new code structure accounts for the presence of different luminosity classes.
@@ -1855,7 +1861,7 @@ IF keyword_set(key) THEN BEGIN
  
     comp_pop=replicate(one_pop,popnumber) ; Replication of the default and initialized stellar population structure to create the composite stellar population structure. All the tag values are by default set to te null value
  
-    
+    ;stop
  
     ;Filling the tags of the compsite stellar population structure using the indices defined above
  
 PRO dustem_run_plugins, p_dim ,$
-param_descs,$
-param_values,$
-param_func,$
-scopes,$
-st=st,$
-avoid=avoid,$
-dustem_run=dustem_run,$
-help=help
+						param_descs,$
+						param_values,$
+						param_func,$
+						scopes,$
+						st=st,$
+						avoid=avoid,$
+						dustem_run=dustem_run,$
+						help=help
  
 ;+
 ; NAME:
@@ -54,12 +54,15 @@ help=help
 ;Because I don't want to run this block each time the procedure is run I will test on the presence of all the scope tags in !dustem_plugin
 ;if all of them are present then this block has been run. 
  
+;stop 
+
 IF (tag_names(*!dustem_plugin))(0) EQ 'NONE' 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
  
+;stop
  
 test_all_scopes = 1. 
 FOR i=0L,n_tags(*!dustem_plugin)-1 DO BEGIN
@@ -69,6 +72,8 @@ FOR i=0L,n_tags(*!dustem_plugin)-1 DO BEGIN
  
 ENDFOR
  
+;stop
+
 IF ~test_all_scopes THEN BEGIN
 	;FIRST LOOP TO RETRIEVE THE SCOPES OF ALL THE PLUGINS
 	f=1 ; Initializing the index that is associated to each plugin 
@@ -121,6 +126,7 @@ IF ~test_all_scopes THEN BEGIN
 	ENDFOR
 ENDIF
  
+;stop
  
 ;LOCATING THE PLUGINS THAT SHOULD BE RUN
  
@@ -172,68 +178,79 @@ FOR i=0L,n_elements(scopes)-1 DO BEGIN
  
 ENDFOR
  
-
+;stop
 ;RUNNING THE PLUGINS ACCORDING TO THEIR SCOPES
  
 f=1 ; Initializing the index that is associated to each plugin 
 FOR i=0L,n_elements(param_descs)-1 DO BEGIN
  
-	 parameter_type=dustem_parameter_description2type(param_descs[i],string_name=string_name) ; Looping over the parameter description vector (here saved in a system variable) to sort out its different elements with repect to their types
-	   
-	  IF parameter_type EQ 'PLUGIN' THEN BEGIN   ; Selecting the plugins
-	        
-	       ftn = strmid(param_descs(i),0) ; String containing the name of the plugin and the keyword used (ie: dustem_create_continuum_2)    
-	       ii = strsplit(ftn,'_',count=countx) & ii = ii(countx-1)-1 ; Locating the last underscore to automate the extraction of the plugin's keyword
-	       ftn = strmid(ftn,0,ii) ; String containing the name of the plugin without the associated keyword
-	        
-	       k=where(strmid(tag_names(*!dustem_plugin),0,8) eq strmid(strupcase(strmid(ftn,14)),0,8),counte) ; Selecting a plugin through matching the string name of the plugin from the scope system variable with the one read from the parameter description vector
-	        
-	       tmp = where(param_func eq f, count) ; Array of indices helping with the sorting out of the different plugins (as a plugin can be called several times with different keywords so as to fit several quantities) 
-	       PDO_tmp = param_descs(tmp) ; Array containing the different calls of each plugin at a time
-	         
-	       p_dim_tmp = param_values(tmp) ; Array containing the values of the parameters used for the run
-	        
-	       vari = strmid(PDO_tmp(0),ii+1) ; Test variable to be used to alter the initialization of the index and value arrays below for a keyword can be a scalar or a string
-	        
-	        ; Initialization of the index and value arrays. These arrays will be used (below) when calling the plugins (with the default key=key and val=val keywords)
-	        
-	       if strlen(strtrim(string(vari),2)) gt 1 then begin
-	           index = strarr(count) & value = fltarr(count)  
-	       endif else  begin
-	           index = fltarr(count) & value = fltarr(count)
-	       endelse
-	        
-	        ; Filling the index and value arrays for one plugin at a time  
-	       FOR l=0, count-1 DO BEGIN
-	          index[l] = strmid(PDO_tmp[l],ii+1) 
-	          value[l] = p_dim_tmp[l]                      
-	       ENDFOR    
-	        
-	       ;==============Runnig of the plugins according to their scopes==============
+	parameter_type=dustem_parameter_description2type(param_descs[i],string_name=string_name) ; Looping over the parameter description vector (here saved in a system variable) to sort out its different elements with repect to their types
+	  
+	IF parameter_type EQ 'PLUGIN' THEN BEGIN   ; Selecting the plugins
+	    ;stop
+       ftn = strmid(param_descs(i),0) ; String containing the name of the plugin and the keyword used (ie: dustem_create_continuum_2)    
+       ii = strsplit(ftn,'_',count=countx) & ii = ii(countx-1)-1 ; Locating the last underscore to automate the extraction of the plugin's keyword
+       ftn = strmid(ftn,0,ii) ; String containing the name of the plugin without the associated keyword
+        
+       k=where(strmid(tag_names(*!dustem_plugin),0,8) eq strmid(strupcase(strmid(ftn,14)),0,8),counte) ; Selecting a plugin through matching the string name of the plugin from the scope system variable with the one read from the parameter description vector
+       ;help,f
+       ;stop
+       tmp = where(param_func eq f, count) ; Array of indices helping with the sorting out of the different plugins (as a plugin can be called several times with different keywords so as to fit several quantities) 
+       PDO_tmp = param_descs(tmp) ; Array containing the different calls of each plugin at a time
+         
+       p_dim_tmp = param_values(tmp) ; Array containing the values of the parameters used for the run
+        
+       vari = strmid(PDO_tmp(0),ii+1) ; Test variable to be used to alter the initialization of the index and value arrays below for a keyword can be a scalar or a string
+        
+        ; Initialization of the index and value arrays. These arrays will be used (below) when calling the plugins (with the default key=key and val=val keywords)
+       ;print,ftn,ii,ftn,counte
+       ;print,PDO_tmp,p_dim_tmp,vari
+       if strlen(strtrim(string(vari),2)) gt 1 then begin
+           index = strarr(count) & value = fltarr(count)  
+       endif else  begin
+           index = fltarr(count) & value = fltarr(count)
+       endelse
+       ;help,'<<<<',index,count
+
+        ; Filling the index and value arrays for one plugin at a time  
+       FOR l=0, count-1 DO BEGIN
+          index[l] = strmid(PDO_tmp[l],ii+1) 
+          value[l] = p_dim_tmp[l]                      
+       ENDFOR    
+        
+       ;==============Running of the plugins according to their scopes==============
+   
+       
+       if keyword_set(avoid) then idd=product(indices[k,*]) else idd=total(indices[k,*])
+        	   
+       IF  idd GE 1 THEN BEGIN
+           str='((*!dustem_plugin).('+strtrim(k,2)+').spec)=ptr_new('+ftn+'(key=index,val=value)'+')' & str=str(0)
+           ;print,'>>>>>',str
+           ;stop
+           ;plante fawlty quand
+           ;((*!dustem_plugin).(1).spec)=ptr_new(dustem_plugin_stellar_population(key=index,val=value))
+           toto=execute(str)
+           ;stop
+           IF !dustem_verbose NE 0 THEN message,strupcase(strmid(ftn,7)),/info
+       ENDIF
  
-	       
-	       if keyword_set(avoid) then idd=product(indices[k,*]) else idd=total(indices[k,*])
-            	   
-	       IF  idd GE 1 THEN BEGIN
-	           
-               str='((*!dustem_plugin).('+strtrim(k,2)+').spec)=ptr_new('+ftn+'(key=index,val=value)'+')' & str=str(0)
-               toto=execute(str) & IF !dustem_verbose NE 0 THEN message,strupcase(strmid(ftn,7)),/info
-               
-	      ENDIF
-    	   
-    	     
-	          
-	       f=f+1 & i=i+count-1 ; Incrementing the parameter and same-type plugin indices  
+	     
+          
+      f=f+1 & i=i+count-1 ; Incrementing the parameter and same-type plugin indices  
  
-	  ENDIF
-	ENDFOR
-	
+	ENDIF
+ENDFOR
+
+;stop
+
 if keyword_set(dustem_run) then begin
  
     st = dustem_run(p_dim) 
     !dustem_current = ptr_new(st)
  
 endif 
-	
+
+;stop
+
 the_end:
 END
 \ No newline at end of file
@@ -86,7 +86,8 @@ IF ctpop NE 0 or ctusrisrf NE 0 THEN BEGIN
     final_isrf = fltarr(n_elements(st)) ;Initializing the ISRF vector
     Ncomments=3 ;default number of comments in the .DAT file (minus the ISRF used)
     c=strarr(Ncomments)
-    c(0)='# DUSTEM: exciting radiation field featuring' 
+    c(0)='# DUSTEM: exciting radiation field featuring'
+    ;stop
     IF ctpop NE 0 THEN final_isrf=final_isrf+(*(*!dustem_plugin).(tstpop).spec)
     IF ctusrisrf NE 0 THEN final_isrf=final_isrf+(*(*!dustem_plugin).(tstusrisrf).spec)