diff --git a/src/idl/dustem_activate_plugins.pro b/src/idl/dustem_activate_plugins.pro index 64420a5..62d8ce6 100755 --- a/src/idl/dustem_activate_plugins.pro +++ b/src/idl/dustem_activate_plugins.pro @@ -41,7 +41,6 @@ ENDIF p_dim = p_min * (*(*!dustem_fit).param_init_values) st=dustem_run(p_dim) - if isa((*!dustem_fit).fixed_param_descs) then begin ;concatenating the parameter vectors diff --git a/src/idl/dustem_fit_sed_orion.pro b/src/idl/dustem_fit_sed_orion.pro index 2e341a6..dadb926 100755 --- a/src/idl/dustem_fit_sed_orion.pro +++ b/src/idl/dustem_fit_sed_orion.pro @@ -9,7 +9,7 @@ use_mode='G17_MODELC';'DBP90';'G17_MODELA';'THEMIS';;'USER_MODEL';'THEMIS';;'THE dustem_init,mode=use_mode,kwords=['logn-chrg-spin','plaw-pol','plaw-pol'],/pol;,kwords=['plaw-ed','logn','logn'];,/pol;kwords=['plaw-ed-chrg-spin'],/pol;,kwords=['plaw-ed'];kwords=['plaw-ed-chrg-spin'];,/pol; ; ;stop -!dustem_verbose=0 +!dustem_verbose=1 !dustem_show_plot=1 !dustem_nocatch=1 @@ -228,7 +228,9 @@ llims[6]=1.00E+04 llims[7]=1.00E-04 dustem_init_parinfo,pd,iv,up_limited=ulimed,lo_limited=llimed,up_limits=ulims,lo_limits=llims;,tied=tied +;stop dustem_init_plugins,pd +stop ; fpd = [ $ ; '(*!dustem_params).grains(1).mdust_o_mh'$ diff --git a/src/idl/dustem_init.pro b/src/idl/dustem_init.pro index e447e7a..32c55aa 100644 --- a/src/idl/dustem_init.pro +++ b/src/idl/dustem_init.pro @@ -79,17 +79,6 @@ PRO dustem_init,model=model $ ;- - - -;; ***COMMENT IC*** -;I think this procedure should be throughly revised. (and also the rest of the code corrected) -;Pointers are used when the need does not present itself. -;ie: defsysv, '!dustem_fit', ptr_new(dustem_fit_st), defsysv,'!dustem_inputs',ptr_new() or defsysv,'!dustem_params',ptr_new() which don't require initialization for instance -;; ***END COMMENT IC*** - - - - IF keyword_set(help) THEN BEGIN doc_library,'dustem_init' goto,the_end @@ -124,12 +113,6 @@ dustem_init_plugins,pd_bidon defsysv,'!dustem_nocatch',0 ;set to catch errors in SED fitting. -;; ***COMMENT AH*** -;; do we still need this ? --> -;==== define a stellar modifier to the ISRF -;toto=dustem_define_isrf_stellar_modifyer_variable() -;; ***END COMMENT AH*** - ;=== read info about instrument file=!dustem_wrap_soft_dir+'instrument_description.xcat' st=read_xcat(file,/silent) @@ -218,22 +201,6 @@ defsysv, '!dustemcgwin_id', { $ ;IDs of windows to plot prms: la_undef(), $ plgns: la_undef() $ } -;I am doing this to save time instead of filtering the _extra structure -; ;This part is not used so I will comment it -; defsysv, '!dustemcgwin_extra', { $ ;Data to fit -; sed: ptr_new(), $ ; -; ext: ptr_new(), $ ; -; qsed: ptr_new(), $ ; -; used: ptr_new(), $ ; -; polsed: ptr_new(), $ ; -; polfrac: ptr_new(), $ ; -; psi_em: ptr_new(), $ ; -; qext: ptr_new(), $ ; -; uext: ptr_new(), $ ; -; polext: ptr_new(), $ ; -; psi_ext: ptr_new() $ ; -; -; } defsysv, '!dustemcgwin_ncmds', { $ ;Data to fit sed: {pl:0, nrm:0}, $ ; @@ -378,12 +345,12 @@ defsysv, '!dustem_model', model (*!dustem_inputs).grain='GRAIN_THEMIS.DAT' (*!dustem_inputs).align='ALIGN_THEMIS.DAT' END - 'NY_MODELA':BEGIN + 'NY_MODELA':BEGIN ;TB removed? (*!dustem_inputs).grain='GRAIN_NY_MODELA.DAT' (*!dustem_inputs).align='ALIGN_G17_MODELA.DAT' END ;This is a user-defined model ;This will probably need to be modified. - 'USER_MODEL':BEGIN + 'USER_MODEL':BEGIN ;TB removed? (*!dustem_inputs).grain='GRAIN_USER.DAT' END ELSE:BEGIN @@ -416,7 +383,6 @@ if keyword_set(kwords) then defsysv, '!dustem_kwords', ptr_new(kwords) else defs st_model=dustem_read_all(dir_in,/silent) !dustem_params=ptr_new(st_model) - ;=== create dynamical storage if needed IF not file_test(!dustem_dat,/dir) THEN BEGIN spawn,'mkdir '+!dustem_dat @@ -483,7 +449,6 @@ endif ; /noerase IF keyword_set(wraptest) THEN BEGIN dir_out=!dustem_dat dustem_write_all,st_model,dir_out - ; stop st=dustem_run() IF keyword_set(plot_it) THEN BEGIN loadct,13 @@ -491,8 +456,6 @@ IF keyword_set(wraptest) THEN BEGIN ENDIF ENDIF -;stop - ;Initialize filters dustem_filter_init diff --git a/src/idl/dustem_read_isrf.pro b/src/idl/dustem_read_isrf.pro index af39d06..1b92b6d 100755 --- a/src/idl/dustem_read_isrf.pro +++ b/src/idl/dustem_read_isrf.pro @@ -28,7 +28,7 @@ IF !dustem_which EQ 'VERSTRAETE' THEN BEGIN Nisrf=n_elements(st) ENDIF ;IF getenv('DUSTEM_WHICH') EQ 'WEB3p8' THEN BEGIN -IF !dustem_which EQ 'WEB3p8' THEN BEGIN +IF !dustem_which EQ 'RELEASE' THEN BEGIN st=st(1:*) Nisrf=n_elements(st) ENDIF diff --git a/src/idl/dustem_run.pro b/src/idl/dustem_run.pro index 57d456a..deecfd5 100755 --- a/src/idl/dustem_run.pro +++ b/src/idl/dustem_run.pro @@ -45,7 +45,6 @@ CASE n_params() OF 0: BEGIN END 1: BEGIN - ;stop dustem_set_params,params END ELSE: BEGIN @@ -55,15 +54,9 @@ CASE n_params() OF END ENDCASE -;spawn,'dustem' -;st=dustem_read_all_res(getenv('DUSTEM_RES'),/silent) -;print,'params',params -;stop - spawn,!dustem_f90_exec - st=dustem_read_all_res(!dustem_res,/silent) - + the_end: RETURN,st diff --git a/src/idl/dustem_write_isrf_lv.pro b/src/idl/dustem_write_isrf_lv.pro index 3c3348e..db77253 100755 --- a/src/idl/dustem_write_isrf_lv.pro +++ b/src/idl/dustem_write_isrf_lv.pro @@ -38,15 +38,14 @@ ENDIF IF tag_exist(*!dustem_plugin,'STELLAR_POPULATION') THEN BEGIN - IF isa((*!dustem_plugin).stellar_population) THEN goto, the_end + IF isa((*!dustem_plugin).stellar_population.spec) THEN goto, the_end ENDIF -;NOW YOU HAVE TO LOOP ON THE COMMENTS TO SEE IF IT IS THE COMPOSITE ISRF FILE OR THE MATHIS ONE. +;MODIFY THIS TO DISPLAY THE ACTUAL VALUES BECAUSE IT IS JUST DISPLAYING EMPTY STRINGS AT THE MOMENT Ncomments=6 c=strarr(Ncomments) -;MODIFY THIS TO DISPLAY THE ACTUAL VALUES BECAUSE IT IS JUST DISPLAYING EMPTY STRINGS AT THE MOMENT ;First lines of the ISRF.DAT file c(0)='# DUSTEM: exciting radiation field featuring' -- libgit2 0.21.2