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

Jean-Philippe Bernard
2 parents f9065c74 2ffa8f64
Showing 5 changed files with 21 additions and 15 deletions Show diff stats
instrument_description.xcat
src/idl/dustem_get_band_flux.pro
src/idl/dustem_plugin_modify_dust_pol.pro
src/idl/dustem_plugin_synchrotron.pro
src/idl/dustemwrap_plot.pro
@@ -120,8 +120,8 @@ NIRCAMB    NIRCAMB29  4.815854               flambda=cste                       
 \========= Contact Scientist: Karl Gordon, STScI, kgordon@stsci.edu  ============================================================================================
 \========= Reference wavelength = pivot wavelength, see Gordon et al (2022) =================================================================
 \========= Transmissions represent total throughput of energy ===============================================================================
-MIRI       MIRI1      5.63619630              flambda=cste                               F560W                jwst_miri_f0560w.fits
-MIRI       MIRI2      7.64577776              flambda=cste                               F770W                jwst_miri_f0770w.fits
+MIRI       MIRI1      5.63619630              flambda=cste                               F0560W               jwst_miri_f0560w.fits
+MIRI       MIRI2      7.64577776              flambda=cste                               F0770W               jwst_miri_f0770w.fits
 MIRI       MIRI3      9.95328271              flambda=cste                               F1000W               jwst_miri_f1000w.fits
 MIRI       MIRI4      10.5958888              flambda=cste                               F1065C               jwst_miri_f1065c.fits
 MIRI       MIRI5      11.3049857              flambda=cste                               F1140C               jwst_miri_f1140c.fits
@@ -238,7 +238,8 @@ FUNCTION DUSTEM_GET_BAND_FLUX, dpath, inst, xs=xs, ys=ys, smi=smi, unit=unit, VE
            for itp=0,ntype-1 do begin
               inu = 1d17 * yw(ixw,itp)/nu/1d9 ; MJy/sr 
               y0 = INTERPOL(yw(ixw,itp),nu,wbd(k))
-              cc = HFI_COLOR_CORRECTION( bp,bnm(k),bolo_cc, nu,inu )
+;              cc = HFI_COLOR_CORRECTION( bp,bnm(k),bolo_cc, nu,inu )
+              cc = HFI_COLOR_CORRECTION_DUSTEM( bp.name,bp.freq/1e9,bp.trans,bnm(k),bolo_cc, nu,inu )
               smdat.(itx).ym(k,itp)  = cc.cc * y0                  ; SED (erg/cm2/s/sr) @ band center
               smdat.(itx).flx(k,itp) = 1d17*cc.cc*y0/wbd(k)/1d9    ; in MJy/sr
               smdat.(itx).cc(k,itp)  = cc.cc
@@ -8,7 +8,7 @@ FUNCTION dustem_plugin_modify_dust_pol, key=key, val=val, scope=scope, paramtag=
 ; CATEGORY:
 ;    DUSTEM Wrapper
 ; CALLING SEQUENCE:
-;    a=dustem_plugin_modify_dust_pol(st,[key=][val=][,scope=][,paramtag=][,/help])
+;    a=dustem_plugin_modify_dust_pol(st,[key=][val=][,scope=][,paramtag=][,paramdefault=][,/help])
 ; INPUTS:
 ;    st = dustem structure
 ; OPTIONAL INPUT PARAMETERS:
@@ -38,8 +38,6 @@ IF keyword_set(help) THEN BEGIN
   GOTO,the_end
 ENDIF
-
-
 IF keyword_set(scope) THEN BEGIN
     out=0
     GOTO, the_end
@@ -57,7 +55,7 @@ if ~isa(!dustem_current) then begin
 ENDIF else st=(*!dustem_current)
 ;below are the default values for the plugin parameters
-smallp_fact=1.     ;This is the default multiplicative factore to the dust polarization
+smallp_fact=1.     ;This is the default dust polarization factor
 psi=0.             ;This is the default polarization angle
 IF keyword_set(key) THEN BEGIN 
@@ -102,7 +100,7 @@ RETURN, out
 the_end:
 scope='REPLACE_POLSED'
-paramtag=['p','Psi (deg)']
+paramtag=['p',textoidl('\psi')+' [deg]']
 END
@@ -52,8 +52,8 @@ psi=0.        ;default polarization angle
 smallp=0.3;0.3    ;default polarization fraction
 scope='ADD_SED+ADD_POLSED'
 ;paramtag=['s (plaw_index)','Amp','p','Psi (deg)']
-paramtag=[textoidl('\alpha_{CR}'),'Amp','p','Psi [deg]']
-paramdefault=[s,A,psi,smallp]
+paramtag=[textoidl('\alpha_{CR}'),'Amp','p',textoidl('\psi')+' [deg]']
+paramdefault=[s,A,smallp,psi]
 IF keyword_set(key) THEN BEGIN 
   ind1=where(key EQ 1,count1)
@@ -101,7 +101,9 @@ IF not keyword_set(st) THEN BEGIN
       if !run_pol && !run_lin then begin
           dustem_polsed = dustem_compute_polsed(p_dim,st=st,P_spec=P_spec,SP_spec=SP_spec,dustem_polfrac=dustem_polfrac)
-          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) 
+          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) 
+          dustem_qsed = toto[0]
+          dustem_used = toto[1]
           ;stop
       endif         
@@ -116,8 +118,9 @@ IF not keyword_set(st) THEN BEGIN
           ;stop                              
           dustem_polext = dustem_compute_polext(p_dim,st=st,POLEXT_spec=POLEXT_spec,SPEXT_spec=SPEXT_spec,dustem_fpolext=dustem_fpolext)
-          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) 
-          
+          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) 
+          dustem_qext = toto[0]
+          dustem_uext = toto[1]
       endif
   endif
@@ -132,7 +135,9 @@ ENDIF ELSE BEGIN ;st is provided
         if !run_pol && !run_lin then begin
             dustem_polsed = dustem_compute_polsed(p_dim,st=st,P_spec=P_spec,SP_spec=SP_spec,dustem_polfrac=dustem_polfrac)
-            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) 
+            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) 
+            dustem_qsed = toto[0]
+            dustem_used = toto[1]
             ;stop    
         endif
     endif
@@ -147,7 +152,9 @@ ENDIF ELSE BEGIN ;st is provided
         if !run_pol && !run_lin then begin
             dustem_polext = dustem_compute_polext(p_dim,st=st,POLEXT_spec=POLEXT_spec,SPEXT_spec=SPEXT_spec,dustem_fpolext=dustem_fpolext)
-            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) 
+            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) 
+            dustem_qsed = toto[0]
+            dustem_used = toto[1]
         endif
     endif