Commit 0644df2fa795aa58fc375d8195e8ed20872fad7f

Authored by Annie Hughes
2 parents 259e95e6 32306a78
Exists in master

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

Data/EXAMPLE_OBSDATA/example_sed3.xcat
1   -\Written by write_xcat.pro on Fri Sep 16 11:17:51 2022
2   -|INSTRU |FILTER |WAVE |STOKESI |STOKESQ |STOKESU |LARGEP |SMALLP |PSI |SIGMAII |SIGMAQQ |SIGMAUU |SIGMAIQ |SIGMAIU |SIGMAQU |SIGMA_LARGEP |SIGMA_SMALLP |SIGMA_PSI |
3   -|char |char |real |real |real |real |real |real |real |real |real |real |real |real |real |real |real |real |
4   -|NULL |NULL |NULL |NULL |NULL |NULL |NULL |NULL |NULL |NULL |NULL |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
5   -IRAS IRAS1 12.0000 0.0312461 6.87692e-11 4.67709e-12 6.89280e-11 2.20597e-09 1.94539 3.12461e-08 6.87692e-17 4.67709e-18 0.00000 0.00000 0.00000 6.84741e-17 7.01349e-14 859023.
6   -IRAS IRAS2 25.0000 0.0332762 1.29234e-08 4.17568e-11 1.29235e-08 3.88371e-07 0.0925635 3.32762e-08 1.29234e-14 4.17568e-17 0.00000 0.00000 0.00000 1.29233e-14 1.16710e-11 205.879
7   -IRAS IRAS3 60.0000 0.121636 0.000527519 6.55937e-10 0.000527519 0.00433688 3.56219e-05 1.21636e-07 5.27519e-10 6.55937e-16 0.00000 0.00000 0.00000 5.27519e-10 3.58093e-08 1.93480e-06
8   -IRAS IRAS4 100.000 0.363825 0.00873832 3.06372e-09 0.00873832 0.0240179 1.00442e-05 3.63825e-07 8.73832e-09 3.06372e-15 0.00000 0.00000 0.00000 8.73832e-09 6.76007e-08 3.29339e-08
9   -PACS PACS3 160.000 0.546916 0.0271989 1.29772e-08 0.0271989 0.0497314 1.36686e-05 5.46916e-07 2.71989e-08 1.29772e-14 0.00000 0.00000 0.00000 2.71989e-08 9.54528e-08 1.43989e-08
10   -SPIRE SPIRE1 250.000 0.424589 0.0297081 4.70500e-08 0.0297081 0.0699690 4.53709e-05 4.24589e-07 2.97081e-08 4.70500e-14 0.00000 0.00000 0.00000 2.97081e-08 1.76323e-07 4.37582e-08
11   -SPIRE SPIRE2 350.000 0.244398 0.0192874 1.29648e-07 0.0192874 0.0789179 0.000192568 2.44398e-07 1.92874e-08 1.29648e-13 0.00000 0.00000 0.00000 1.92874e-08 3.48390e-07 2.86069e-07
12   -SPIRE SPIRE3 500.000 0.112676 0.00925922 3.86921e-07 0.00925922 0.0821755 0.00119713 1.12676e-07 9.25922e-09 3.86921e-13 0.00000 0.00000 0.00000 9.25922e-09 7.89238e-07 3.70459e-06
13   -HFI HFI2 550.078 0.0883478 0.00729375 5.03675e-07 0.00729374 0.0825572 0.00197830 8.83478e-08 7.29375e-09 5.03675e-13 0.00000 0.00000 0.00000 7.29375e-09 1.01160e-06 7.77192e-06
14   -HFI HFI3 849.270 0.0271711 0.00218088 1.81039e-06 0.00218088 0.0802650 0.0237811 2.71711e-08 2.18088e-09 1.81039e-12 0.00000 0.00000 0.00000 2.18088e-09 3.19117e-06 0.000312692
15   -HFI HFI4 1381.53 0.00615806 0.000453698 7.90003e-06 0.000453767 0.0736867 0.498782 6.15806e-09 4.53698e-10 7.90003e-12 0.00000 0.00000 0.00000 4.53563e-10 1.28422e-05 0.0320315
16   -HFI HFI5 2096.45 0.00159657 9.80646e-05 2.91357e-05 0.000102301 0.0640756 8.27353 1.59657e-09 9.80646e-11 2.91357e-11 0.00000 0.00000 0.00000 9.24736e-11 3.88493e-05 2.72364
17   -HFI HFI6 2997.92 0.000798209 2.97154e-05 8.26632e-05 8.78420e-05 0.110049 35.1139 7.98209e-10 2.97154e-11 8.26632e-11 0.00000 0.00000 0.00000 7.66042e-11 0.000135404 3.80555
18   -LFI LFI1 4285.71 0.000973474 7.80011e-06 0.000240501 0.000240627 0.247184 44.0712 9.73474e-10 7.80011e-12 2.40501e-10 0.00000 0.00000 0.00000 2.40256e-10 0.000316293 0.114042
19   -LFI LFI2 6818.18 0.00331002 1.44711e-06 0.000968648 0.000968649 0.292641 44.9572 3.31002e-09 1.44711e-12 9.68647e-10 0.00000 0.00000 0.00000 9.68645e-10 0.000114283 0.00126784
20   -LFI LFI3 10000.0 0.0121215 2.65458e-07 0.00359884 0.00359884 0.296897 44.9979 1.21215e-08 2.65458e-13 3.59884e-09 0.00000 0.00000 0.00000 3.59884e-09 3.17654e-05 1.68249e-05
  1 +\Written by write_xcat.pro on Fri Sep 16 14:11:25 2022
  2 +|INSTRU |FILTER |WAVE |STOKESI |STOKESQ |STOKESU |LARGEP |SMALLP |PSI |SIGMAII |SIGMAQQ |SIGMAUU |SIGMAIQ |SIGMAIU |SIGMAQU |SIGMA_LARGEP |SIGMA_SMALLP |SIGMA_PSI |
  3 +|char |char |real |real |real |real |real |real |real |real |real |real |real |real |real |real |real |real |
  4 +|NULL |NULL |NULL |NULL |NULL |NULL |NULL |NULL |NULL |NULL |NULL |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
  5 +IRAS IRAS1 12.0000 0.0312461 6.46219e-11 2.81975e-11 7.05059e-11 2.25647e-09 11.7869 3.12461e-08 6.46219e-17 2.81975e-17 0.00000 0.00000 0.00000 5.87960e-17 6.02221e-14 5.61792e+06
  6 +IRAS IRAS2 25.0000 0.0332762 1.21441e-08 4.46183e-09 1.29378e-08 3.88800e-07 10.0869 3.32762e-08 1.21441e-14 4.46183e-15 0.00000 0.00000 0.00000 1.12304e-14 1.01421e-11 26360.3
  7 +IRAS IRAS3 60.0000 0.121636 0.000495706 0.000180423 0.000527519 0.00433688 10.0000 1.21636e-07 4.95706e-10 1.80423e-10 0.00000 0.00000 0.00000 4.58825e-10 3.11663e-08 0.640974
  8 +IRAS IRAS4 100.000 0.363825 0.00821133 0.00298868 0.00873832 0.0240179 10.0000 3.63825e-07 8.21133e-09 2.98868e-09 0.00000 0.00000 0.00000 7.60040e-09 5.90041e-08 0.0386945
  9 +PACS PACS3 160.000 0.546916 0.0255586 0.00930258 0.0271989 0.0497314 10.0000 5.46916e-07 2.55586e-08 9.30258e-09 0.00000 0.00000 0.00000 2.36570e-08 8.36116e-08 0.0124316
  10 +SPIRE SPIRE1 250.000 0.424589 0.0279165 0.0101608 0.0297081 0.0699691 10.0000 4.24589e-07 2.79165e-08 1.01608e-08 0.00000 0.00000 0.00000 2.58394e-08 1.54863e-07 0.0113816
  11 +SPIRE SPIRE2 350.000 0.244398 0.0181242 0.00659681 0.0192875 0.0789181 10.0002 2.44398e-07 1.81242e-08 6.59681e-09 0.00000 0.00000 0.00000 1.67757e-08 3.06340e-07 0.0175311
  12 +SPIRE SPIRE3 500.000 0.112676 0.00870082 0.00316723 0.00925935 0.0821767 10.0011 1.12676e-07 8.70082e-09 3.16723e-09 0.00000 0.00000 0.00000 8.05337e-09 6.94261e-07 0.0365212
  13 +HFI HFI2 550.078 0.0883478 0.00685388 0.00249511 0.00729392 0.0825591 10.0019 8.83478e-08 6.85388e-09 2.49511e-09 0.00000 0.00000 0.00000 6.34382e-09 8.89904e-07 0.0463657
  14 +HFI HFI3 849.270 0.0271711 0.00204936 0.000747717 0.00218150 0.0802878 10.0223 2.71711e-08 2.04936e-09 7.47716e-10 0.00000 0.00000 0.00000 1.89644e-09 2.80602e-06 0.155341
  15 +HFI HFI4 1381.53 0.00615806 0.000426337 0.000163074 0.000456461 0.0741241 10.4659 6.15806e-09 4.26337e-10 1.63074e-10 0.00000 0.00000 0.00000 3.92736e-10 1.12487e-05 0.774804
  16 +HFI HFI5 2096.45 0.00159657 9.21506e-05 6.26758e-05 0.000111445 0.0698026 17.1107 1.59657e-09 9.21506e-11 6.26758e-11 0.00000 0.00000 0.00000 8.28282e-11 3.55456e-05 4.75828
  17 +HFI HFI6 2997.92 0.000798209 2.79233e-05 9.28265e-05 9.69354e-05 0.121441 36.6290 7.98209e-10 2.79233e-11 9.28265e-11 0.00000 0.00000 0.00000 8.74409e-11 0.000155717 2.90968
  18 +LFI LFI1 4285.71 0.000973474 7.32971e-06 0.000243169 0.000243279 0.249908 44.1367 9.73474e-10 7.32971e-12 2.43169e-10 0.00000 0.00000 0.00000 2.42955e-10 0.000320531 0.104624
  19 +LFI LFI2 6818.18 0.00331002 1.35983e-06 0.000969142 0.000969143 0.292791 44.9598 3.31002e-09 1.35983e-12 9.69142e-10 0.00000 0.00000 0.00000 9.69141e-10 0.000114355 0.00119005
  20 +LFI LFI3 10000.0 0.0121215 2.49440e-07 0.00359893 0.00359893 0.296904 44.9980 1.21215e-08 2.49440e-13 3.59893e-09 0.00000 0.00000 0.00000 3.59893e-09 3.17664e-05 1.58088e-05
... ...
src/idl/dustem_make_polarization_sed_example.pro
... ... @@ -126,6 +126,19 @@ pd = [ $
126 126 ]
127 127 p_truth=[1.,7.8000E-04,7.8000E-04,7.8000E-04,3., 1.e-2, 0.3, 45.]
128 128  
  129 +pd = [ $
  130 + '(*!dustem_params).G0', $ ;G0
  131 + '(*!dustem_params).grains(0).mdust_o_mh',$ ;PAH0 mass fraction
  132 + '(*!dustem_params).grains(1).mdust_o_mh',$ ;PAH0 mass fraction
  133 + '(*!dustem_params).grains(2).mdust_o_mh', $ ;PAH1 mass fraction
  134 + 'dustem_plugin_modify_dust_pol_2', $ ;This will set the polarization angle
  135 + 'dustem_plugin_synchrotron_1', $ ;Synchrotron spectra index
  136 + 'dustem_plugin_synchrotron_2', $ ;Synchrotron amplitude at 10 mm
  137 + 'dustem_plugin_synchrotron_3', $ ;Synchrotron polarization fraction
  138 + 'dustem_plugin_synchrotron_4' $ ;Synchrotron polarization angle
  139 + ]
  140 +p_truth=[1.,7.8000E-04,7.8000E-04,7.8000E-04,10.,3., 1.e-2, 0.3, 45.]
  141 +
129 142  
130 143 ;iv=p_truth+[0.,8.e-4,8.e-4,8.e-4] ;shifted from solution
131 144 iv=p_truth
... ... @@ -193,9 +206,10 @@ message,'Wrote '+filename,/continue
193 206  
194 207 filename_final=!dustem_wrap_soft_dir+'/Data/EXAMPLE_OBSDATA/example_sed3.xcat'
195 208 str='cp '+filename+' '+filename_final
196   -spawn,str
  209 +message,'Do '+str+' to make change permanent',/continue
  210 +;spawn,str
197 211  
198   -message,'Wrote '+filename_final,/continue
  212 +;message,'Wrote '+filename_final,/continue
199 213  
200 214 the_end:
201 215  
... ...
src/idl/dustem_plugin_modify_dust_pol.pro
... ... @@ -55,13 +55,13 @@ IF keyword_set(paramtag) THEN BEGIN
55 55 ENDIF
56 56  
57 57 ;below are the default values for the plugin parameters
58   -smallp=1. ;This is 1% fixed polarization
59   -psi=0.
  58 +smallp_fact=1. ;This is the default multiplicative factore to the dust polarization
  59 +psi=0. ;This is the default polarization angle
60 60  
61 61 IF keyword_set(key) THEN BEGIN
62 62 ind1=where(key EQ 1,count1)
63 63 ind2=where(key EQ 2,count2)
64   - IF count1 NE 0 THEN smallp=val[ind1[0]] ; setting smallp from pd - this is another polarization fraction (constant) that is applied to the total dust emission
  64 + IF count1 NE 0 THEN smallp_fact=val[ind1[0]] ; setting smallp from pd - this is another polarization fraction (constant) that is applied to the total dust emission
65 65 IF count2 NE 0 THEN psi=val[ind2[0]] & !dustem_psi = psi ; setting psi from pd. !dustem_psi here helps for the plotting.
66 66 ENDIF
67 67  
... ... @@ -72,16 +72,7 @@ I=((st.sed).em_tot)*fact ; This is the total intensity emission I
72 72 Nwaves=(size(I))[1]
73 73  
74 74 frac_model=P/I ;This is the polarization fraction in the model
75   -frac_used=frac_model
76   -IF keyword_set(key) THEN BEGIN
77   - IF count1 NE 0 THEN BEGIN
78   - frac_used[*]=smallp/100.
79   - ENDIF
80   -ENDIF
81   -
82   -;frac=P/I*smallp
83   -tes=where(finite(frac_used) eq 0,count)
84   -IF count NE 0 THEN frac_used[tes]=0.
  75 +frac_used=frac_model*smallp_fact
85 76  
86 77 psi_used = replicate(psi,Nwaves)
87 78  
... ...
src/idl/dustem_plugin_synchrotron.pro
... ... @@ -79,7 +79,7 @@ polar_ippsi2iqu,output[*,0],Q,U,replicate(smallp,Nwavs),replicate(psi,Nwavs)
79 79 output[*,1]=Q
80 80 output[*,2]=U
81 81  
82   -stop
  82 +;stop
83 83  
84 84 scope='ADD_SED+ADD_POLSED'
85 85  
... ...
src/idl/dustemcgwin_dataset.pro
... ... @@ -115,7 +115,7 @@ if keyword_set(dataset) then begin
115 115 xtit = ''
116 116 xtickformat='(A1)'
117 117 endif else xtickformat='(F10.2)' ;MAYBE YOU'LL CHANGE THIS FORMAT TO EXPONENTIAL NOTATION
118   - stop
  118 +
119 119 cgplot,vectw,vectx,/xlog,/ys,xs=1,pos=position,noerase=1,xtickformat=xtickformat,color='Black',xr=xr,xtit=xtit,yr=[0.0,2.0],yticks=2,ymino=2,xticklen=0.1,ytickformat='(F6.2)',charsize=1.0
120 120 xyouts,pospltxt[0],pospltxt[1],textoidl('norm'),color=0,/normal,charsize=1.1
121 121  
... ... @@ -1805,7 +1805,7 @@ if keyword_set(dataset) then begin
1805 1805 endif
1806 1806  
1807 1807 endif else begin
1808   - stop
  1808 +
1809 1809  
1810 1810 if ct_hdnpts then begin
1811 1811  
... ...