fixed with the right scope

Jean-Philippe Bernard
1 parent ccbd30b1
Showing 3 changed files with 50 additions and 44 deletions Show diff stats
src/idl/dustem_activate_plugins.pro
src/idl/dustem_plugin_stellar_population.pro
src/idl/dustem_stellarpopisrf_example.pro
@@ -96,7 +96,7 @@ dustem_run_plugins, p_dim ,param_descs, param_values, param_func, [&#39;ADD_SED&#39;], a
 ;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'] ,force_dustem_run=1,st=st,use_previous_fortran=use_previous_fortran ;dustem output is available at this step.
-dustem_run_plugins, p_dim ,param_descs, param_values, param_func, ['REPLACE_ISRF'] ,force_dustem_run=1,st=st,use_previous_fortran=use_previous_fortran ;dustem output is available at this step.
+dustem_run_plugins, p_dim ,param_descs, param_values, param_func, ['ADD_ISRF','REPLACE_ISRF'] ,force_dustem_run=1,st=st,use_previous_fortran=use_previous_fortran ;dustem output is available at this step.
  
 ;added this small condition to ensure that dustem is run
 ;(if no ISRF plugin is used)  
-FUNCTION dustem_plugin_stellar_population, key=key, val=val, scope=scope, paramtag=paramtag,help=help,test=test,initialize=initialize
+FUNCTION dustem_plugin_stellar_population, key=key, val=val, scope=scope, paramtag=paramtag,help=help,test=test
  
 ;+
 ; NAME:
@@ -39,31 +39,51 @@ IF keyword_set(help) THEN BEGIN
   goto,the_end
 ENDIF
  
+;print,keyword_set(scope)
+;print,keyword_set(paramtag)
+;print,keyword_set(key),keyword_set(val)
+;stop
+
 IF keyword_set(scope) THEN BEGIN
   message,'Scope keyword was set',/continue
-  stop
-ENDIF 
+  ;scope='STELLAR_POPULATION'
+  ;scope='REPLACE_ISRF'
+  scope='ADD_ISRF'
+  stellar_isrf=0.
+  goto,the_end
+  ;stop
+ENDIF
  
-IF keyword_set(paramtag) THEN BEGIN
-    message,'paramtag keyword was set',/continue
-    stop
-;    out=0
-;    goto, the_paramtag
+;==== read stellar population parameters if not already in memory
+defsysv,'!dustem_plugin_stellar_population',exist=exist
+IF exist EQ 0 THEN BEGIN
+    message,'Initializing stellar population parameters',/continue
+    file = !dustem_wrap_soft_dir+'Data/STELLARPOPS/EEM_dwarf_UBVIJHK_colors_Teff.xcat'
+    st=read_xcat(file,/silent)
+    defsysv,'!dustem_plugin_stellar_population',st
 ENDIF
-scope='STELLAR_POPULATION'
+
+Nstars=n_elements(!dustem_plugin_stellar_population)
+paramvalues=fltarr(Nstars,2)    ;first parameter is distance to the stars in pc, second is the number of such stars
+Nparam=Nstars*2
 stellar_isrf=0.
+spectral_types=!dustem_plugin_stellar_population.spt
  
-;==== read stellar population parameters if not already in memory
-IF keyword_set(initialize) THEN BEGIN
-    defsysv,'!dustem_plugin_stellar_population',exist=exist
-    IF exist EQ 0 THEN BEGIN
-        message,'Initializing stellar population parameters',/continue
-        file = !dustem_wrap_soft_dir+'Data/STELLARPOPS/EEM_dwarf_UBVIJHK_colors_Teff.xcat'
-        st=read_xcat(file,/silent)
-        defsysv,'!dustem_plugin_stellar_population',st
-    ENDIF
-    goto,the_end
+IF keyword_set(paramtag) THEN BEGIN
+    message,'paramtag keyword was set',/continue
+    paramtag=strarr(Nparam)
+    ii=0L
+    FOR i=0L,Nparam-1 DO BEGIN
+            ij=index2ij([i],[Nstars,2])
+            IF ij[0,1] EQ 0 THEN cc='dist to ' ELSE cc='N of '
+            paramtag[ii]=cc+spectral_types[ij[0,0]]
+            ii=ii+1
+    ENDFOR
+    ;stop
+    stellar_isrf=0.
+    goto, the_end
 ENDIF
+stellar_isrf=0.
  
 ;stop
  
@@ -85,21 +105,6 @@ pc2cm = 3.086e18 ;cm (cgs)
 ;This will help ease and shorten the fitting procedure
 ;If the user wants to use them without having to read the entirety of this plugin please contact the DustEmWrap team. 
  
-Nstars=n_elements(!dustem_plugin_stellar_population)
-paramvalues=fltarr(Nstars,2)    ;first parameter is distance to the stars in pc, second is the number of such stars
-Nparam=Nstars*2
-stellar_isrf=0.
-spectral_types=!dustem_plugin_stellar_population.spt
-
-paramtag=strarr(Nparam)
-ii=0L
-FOR i=0L,Nparam-1 DO BEGIN
-        ij=index2ij([i],[Nstars,2])
-        IF ij[0,1] EQ 0 THEN cc='dist to ' ELSE cc='N of '
-        paramtag[ii]=cc+spectral_types[ij[0,0]]
-        ii=ii+1
-ENDFOR
-
 IF keyword_set(key) THEN BEGIN
     ;stop
     FOR i=0L,n_elements(key)-1 DO BEGIN
@@ -127,13 +132,10 @@ IF keyword_set(key) THEN BEGIN
     fact=1./1.e20*1.e7/1.e4
     stellar_isrf=stellar_isrf*fact  ;ergs/cm2/s/Hz
 ENDIF
-  
-;the_scope:
-;scope='STELLAR_POPULATION'
  
-the_end:
-;print,minmax(stellar_isrf)
 ;stop
  
-RETURN, stellar_isrf
+the_end:
+
+RETURN,stellar_isrf
 END
@@ -117,8 +117,11 @@ dustem_define_la_common
 ;; example parameter initialisation 1
 ;; Here we attempt to fit the distance to a single O7V star
 ;; Other ISRF contributions are fixed to ~zero
-toto=dustem_plugin_stellar_population(/initialize)
+;toto=dustem_plugin_stellar_population(/initialize)
+scope=1
+toto=dustem_plugin_stellar_population(scope=scope)
 ;=== get the parameter tagnames
+paramtag=1
 toto=dustem_plugin_stellar_population(paramtag=paramtag)
  
 ;stop
@@ -132,7 +135,8 @@ iv = true_vals+[1.]               ; distance we use as an initial guess
  
 fpd=['dustem_plugin_stellar_population_'+strtrim(ind2+1,2) , $ ;number of O7V star (FIXED)
      '(*!dustem_params).G0'] ; Mathis field (FIXED TO ~ZERO)
-fiv=[1.,1.e-12]
+;fiv=[1.,1.e-12]
+fiv=[1.,1.]
  
 Npar=n_elements(pd)
 ulimed=replicate(0,Npar) & ulimed[0]=0
@@ -142,7 +146,7 @@ llims=replicate(1.e-15,Npar) &amp; llims[0]=15.
  
 ;=== INITIALIZE DUSTEMWRAP
  
-dustem_init,model=use_model,polarization=use_polarization
+dustem_init,model=use_model,polarization=use_polarization,/show_plots
 ;help,(*!dustem_plugin).(0),/str
 ;stop