Commit 604f0859b0798c81b76cba349d0834d1d8a68de7

Authored by Annie Hughes
2 parents 3466882c 1dceb92c
Exists in master

Merge branch 'master' of https://gitlab.irap.omp.eu/OV-GSO-DC/dustem-wrapper_idl

src/idl/dustem_compute_stokes.pro
... ... @@ -4,8 +4,6 @@ FUNCTION dustem_compute_stokes,p_dim,$
4 4 U_spec=U_spec,$
5 5 PSI_spec=PSI_spec,$
6 6 dustem_psi_em=dustem_psi_em,$
7   - out_st=out_st,$
8   - _extra=extra,$
9 7 help=help
10 8  
11 9 ;+
... ... @@ -16,7 +14,7 @@ FUNCTION dustem_compute_stokes,p_dim,$
16 14 ; CATEGORY:
17 15 ; Dustem
18 16 ; CALLING SEQUENCE:
19   -; out=dustem_compute_stokes(p_dim[,st][,Q_spec][,U_spec][,PSI_spec][,dustem_psi_em][,out_st=][,_extra=]
  17 +; out=dustem_compute_stokes(p_dim[,st][,Q_spec][,U_spec][,PSI_spec][,dustem_psi_em]
20 18 ; INPUTS:
21 19 ; p_dim = parameter values
22 20 ; OPTIONAL INPUT PARAMETERS:
... ... @@ -26,7 +24,7 @@ FUNCTION dustem_compute_stokes,p_dim,$
26 24 ; out[0] = Computed Stokes Q emission for spectrum points in !dustem_data
27 25 ; out[1] = Computed Stokes U emission for spectrum points in !dustem_data
28 26 ; OPTIONAL OUTPUT PARAMETERS:
29   -; out_st = Dustem output structure
  27 +; st = Dustem output structure
30 28 ; Q_spec = Dustem Stokes Q emission
31 29 ; U_spec = Dustem Stokes U emission
32 30 ; PSI_spec = Dustem Polarization angle output in emission
... ... @@ -55,8 +53,7 @@ IF keyword_set(help) THEN BEGIN
55 53 ENDIF
56 54  
57 55 IF not keyword_set(st) THEN BEGIN
58   - dustem_activate_plugins,p_dim/(*(*!dustem_fit).param_init_values),st
59   - ;st=dustem_run(p_dim)
  56 + dustem_activate_plugins,p_dim/(*(*!dustem_fit).param_init_values),st=st
60 57 ENDIF
61 58  
62 59  
... ... @@ -174,8 +171,6 @@ IF count_uspec NE 0 THEN BEGIN
174 171 if isa(dustem_used) then dustem_used[ind_uspec]=interpol(U_spec,st.polsed.wav,(((*(*!dustem_data).used).wav)[ind_uspec]))
175 172 ENDIF
176 173  
177   -out_st=st
178   -
179 174 ;generating interpolates for Psi_em
180 175 dustem_psi_em = 0.5*atan(dustem_used,dustem_qsed)/!dtor
181 176  
... ...
src/idl/dustem_write_fits_table.pro
... ... @@ -63,11 +63,11 @@ ENDELSE
63 63  
64 64 IF !run_pol THEN BEGIN
65 65 ;This is needed to compute Q,U of both SED and spectra
66   - dustem_predicted_polsed=dustem_compute_stokes(*(*!dustem_fit).current_param_values,bidon, $
67   - dustem_predicted_Qsed,dustem_predicted_Used, $
68   - dustem_predicted_Q_spec,dustem_predicted_U_spec,dustem_predicted_PSI_spec, $
  66 + toto=dustem_compute_stokes(*(*!dustem_fit).current_param_values,bidon, $
  67 + Q_spec=dustem_predicted_Q_spec,U_spec=dustem_predicted_U_spec,PSI_spec=dustem_predicted_PSI_spec, $
69 68 dustem_psi_em,out_st=out_st)
70   -
  69 + dustem_predicted_Qsed=toto[0]
  70 + dustem_predicted_Used=toto[1]
71 71 ;Same in extinction, but does not work in polarization extinction was not fitted.
72 72 ; dustem_predicted_polext=dustem_compute_stokext(*(*!dustem_fit).current_param_values,bidon, $
73 73 ; dustem_predicted_Qext,dustem_predicted_Uext, $
... ...