OV-GSO-DC / dustem-wrapper_idl

Commit 1dceb92c944967f7fbbb53a08c5b53ff5400c0af

Authored by Jean-Philippe Bernard
2 parents f9065c74 2ffa8f64
Exists in master

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

Showing 5 changed files with 21 additions and 15 deletions   Show diff stats
Inline Side-by-side
instrument_description.xcat
  Diff comments   View file @1dceb92
... ... @@ -120,8 +120,8 @@ NIRCAMB NIRCAMB29 4.815854 flambda=cste
120 120 \========= Contact Scientist: Karl Gordon, STScI, kgordon@stsci.edu ============================================================================================
121 121 \========= Reference wavelength = pivot wavelength, see Gordon et al (2022) =================================================================
122 122 \========= Transmissions represent total throughput of energy ===============================================================================
123   -MIRI MIRI1 5.63619630 flambda=cste F560W jwst_miri_f0560w.fits
124   -MIRI MIRI2 7.64577776 flambda=cste F770W jwst_miri_f0770w.fits
  123 +MIRI MIRI1 5.63619630 flambda=cste F0560W jwst_miri_f0560w.fits
  124 +MIRI MIRI2 7.64577776 flambda=cste F0770W jwst_miri_f0770w.fits
125 125 MIRI MIRI3 9.95328271 flambda=cste F1000W jwst_miri_f1000w.fits
126 126 MIRI MIRI4 10.5958888 flambda=cste F1065C jwst_miri_f1065c.fits
127 127 MIRI MIRI5 11.3049857 flambda=cste F1140C jwst_miri_f1140c.fits
... ...
src/idl/dustem_get_band_flux.pro
  Diff comments   View file @1dceb92
... ... @@ -238,7 +238,8 @@ FUNCTION DUSTEM_GET_BAND_FLUX, dpath, inst, xs=xs, ys=ys, smi=smi, unit=unit, VE
238 238 for itp=0,ntype-1 do begin
239 239 inu = 1d17 * yw(ixw,itp)/nu/1d9 ; MJy/sr
240 240 y0 = INTERPOL(yw(ixw,itp),nu,wbd(k))
241   - cc = HFI_COLOR_CORRECTION( bp,bnm(k),bolo_cc, nu,inu )
  241 +; cc = HFI_COLOR_CORRECTION( bp,bnm(k),bolo_cc, nu,inu )
  242 + cc = HFI_COLOR_CORRECTION_DUSTEM( bp.name,bp.freq/1e9,bp.trans,bnm(k),bolo_cc, nu,inu )
242 243 smdat.(itx).ym(k,itp) = cc.cc * y0 ; SED (erg/cm2/s/sr) @ band center
243 244 smdat.(itx).flx(k,itp) = 1d17*cc.cc*y0/wbd(k)/1d9 ; in MJy/sr
244 245 smdat.(itx).cc(k,itp) = cc.cc
... ...
src/idl/dustem_plugin_modify_dust_pol.pro
  Diff comments   View file @1dceb92
... ... @@ -8,7 +8,7 @@ FUNCTION dustem_plugin_modify_dust_pol, key=key, val=val, scope=scope, paramtag=
8 8 ; CATEGORY:
9 9 ; DUSTEM Wrapper
10 10 ; CALLING SEQUENCE:
11   -; a=dustem_plugin_modify_dust_pol(st,[key=][val=][,scope=][,paramtag=][,/help])
  11 +; a=dustem_plugin_modify_dust_pol(st,[key=][val=][,scope=][,paramtag=][,paramdefault=][,/help])
12 12 ; INPUTS:
13 13 ; st = dustem structure
14 14 ; OPTIONAL INPUT PARAMETERS:
... ... @@ -38,8 +38,6 @@ IF keyword_set(help) THEN BEGIN
38 38 GOTO,the_end
39 39 ENDIF
40 40  
41   -
42   -
43 41 IF keyword_set(scope) THEN BEGIN
44 42 out=0
45 43 GOTO, the_end
... ... @@ -57,7 +55,7 @@ if ~isa(!dustem_current) then begin
57 55 ENDIF else st=(*!dustem_current)
58 56  
59 57 ;below are the default values for the plugin parameters
60   -smallp_fact=1. ;This is the default multiplicative factore to the dust polarization
  58 +smallp_fact=1. ;This is the default dust polarization factor
61 59 psi=0. ;This is the default polarization angle
62 60  
63 61 IF keyword_set(key) THEN BEGIN
... ... @@ -102,7 +100,7 @@ RETURN, out
102 100  
103 101 the_end:
104 102 scope='REPLACE_POLSED'
105   -paramtag=['p','Psi (deg)']
  103 +paramtag=['p',textoidl('\psi')+' [deg]']
106 104  
107 105  
108 106 END
... ...
src/idl/dustem_plugin_synchrotron.pro
  Diff comments   View file @1dceb92
... ... @@ -52,8 +52,8 @@ psi=0. ;default polarization angle
52 52 smallp=0.3;0.3 ;default polarization fraction
53 53 scope='ADD_SED+ADD_POLSED'
54 54 ;paramtag=['s (plaw_index)','Amp','p','Psi (deg)']
55   -paramtag=[textoidl('\alpha_{CR}'),'Amp','p','Psi [deg]']
56   -paramdefault=[s,A,psi,smallp]
  55 +paramtag=[textoidl('\alpha_{CR}'),'Amp','p',textoidl('\psi')+' [deg]']
  56 +paramdefault=[s,A,smallp,psi]
57 57 IF keyword_set(key) THEN BEGIN
58 58  
59 59 ind1=where(key EQ 1,count1)
... ...
src/idl/dustemwrap_plot.pro
  Diff comments   View file @1dceb92
... ... @@ -101,7 +101,9 @@ IF not keyword_set(st) THEN BEGIN
101 101 if !run_pol && !run_lin then begin
102 102  
103 103 dustem_polsed = dustem_compute_polsed(p_dim,st=st,P_spec=P_spec,SP_spec=SP_spec,dustem_polfrac=dustem_polfrac)
104   - toto = dustem_compute_stokes(p_dim,st=st,dustem_qsed=dustem_qsed,dustem_used=dustem_used,Q_spec=Q_spec,U_spec=U_spec,PSI_spec=PSI_spec,dustem_psi_em=dustem_psi_em)
  104 + toto = dustem_compute_stokes(p_dim,st=st,Q_spec=Q_spec,U_spec=U_spec,PSI_spec=PSI_spec,dustem_psi_em=dustem_psi_em)
  105 + dustem_qsed = toto[0]
  106 + dustem_used = toto[1]
105 107 ;stop
106 108  
107 109 endif
... ... @@ -116,8 +118,9 @@ IF not keyword_set(st) THEN BEGIN
116 118  
117 119 ;stop
118 120 dustem_polext = dustem_compute_polext(p_dim,st=st,POLEXT_spec=POLEXT_spec,SPEXT_spec=SPEXT_spec,dustem_fpolext=dustem_fpolext)
119   - toto = dustem_compute_stokext(p_dim,st=st,dustem_qext=dustem_qext,dustem_uext=dustem_uext,QEXT_spec=QEXT_spec,UEXT_spec=UEXT_spec,PSIEXT_spec=PSIEXT_spec,dustem_psi_ext=dustem_psi_ext)
120   -
  121 + toto = dustem_compute_stokext(p_dim,st=st,QEXT_spec=QEXT_spec,UEXT_spec=UEXT_spec,PSIEXT_spec=PSIEXT_spec,dustem_psi_ext=dustem_psi_ext)
  122 + dustem_qext = toto[0]
  123 + dustem_uext = toto[1]
121 124 endif
122 125 endif
123 126  
... ... @@ -132,7 +135,9 @@ ENDIF ELSE BEGIN ;st is provided
132 135 if !run_pol && !run_lin then begin
133 136  
134 137 dustem_polsed = dustem_compute_polsed(p_dim,st=st,P_spec=P_spec,SP_spec=SP_spec,dustem_polfrac=dustem_polfrac)
135   - toto = dustem_compute_stokes(p_dim,st=st,dustem_qsed=dustem_qsed,dustem_used=dustem_used,Q_spec=Q_spec,U_spec=U_spec,PSI_spec=PSI_spec,dustem_psi_em=dustem_psi_em)
  138 + toto = dustem_compute_stokes(p_dim,st=st,Q_spec=Q_spec,U_spec=U_spec,PSI_spec=PSI_spec,dustem_psi_em=dustem_psi_em)
  139 + dustem_qsed = toto[0]
  140 + dustem_used = toto[1]
136 141 ;stop
137 142 endif
138 143 endif
... ... @@ -147,7 +152,9 @@ ENDIF ELSE BEGIN ;st is provided
147 152 if !run_pol && !run_lin then begin
148 153  
149 154 dustem_polext = dustem_compute_polext(p_dim,st=st,POLEXT_spec=POLEXT_spec,SPEXT_spec=SPEXT_spec,dustem_fpolext=dustem_fpolext)
150   - toto = dustem_compute_stokext(p_dim,st=st,dustem_qext=dustem_qext,dustem_uext=dustem_uext,QEXT_spec=QEXT_spec,UEXT_spec=UEXT_spec,PSIEXT_spec=PSIEXT_spec,dustem_psi_ext=dustem_psi_ext)
  155 + toto = dustem_compute_stokext(p_dim,st=st,QEXT_spec=QEXT_spec,UEXT_spec=UEXT_spec,PSIEXT_spec=PSIEXT_spec,dustem_psi_ext=dustem_psi_ext)
  156 + dustem_qsed = toto[0]
  157 + dustem_used = toto[1]
151 158  
152 159 endif
153 160 endif
... ...