Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Guang
x-cigale
Commits
cdfd363f
Commit
cdfd363f
authored
Jul 20, 2019
by
Guang
Committed by
Guang
Oct 23, 2019
Browse files
keep SKIRTOR disk emission anisotropic
parent
41add92f
Changes
1
Hide whitespace changes
Inline
Side-by-side
database_builder/__init__.py
View file @
cdfd363f
...
...
@@ -765,8 +765,8 @@ def build_skirtor2016(base):
# Change the SED shape of intrinsic disk luminosity
intrin_disk_unnormed
=
disk_new_unnormed
*
np
.
trapz
(
intrin_disk_unnormed
,
x
=
wl_uncut
)
# Convert
anisotropic to the isotropic disk luminosity
intrin_disk_unnormed
*=
7
/
18
# Convert
to the value at i=30 deg
intrin_disk_unnormed
*=
np
.
cos
(
30
*
np
.
pi
/
180
)
*
(
2
*
np
.
cos
(
30
*
np
.
pi
/
180
)
+
1
)
/
3
for
params
in
iter_params
:
filename
=
skirtor2016_dir
+
\
...
...
@@ -774,6 +774,7 @@ def build_skirtor2016(base):
print
(
"Importing {}..."
.
format
(
filename
))
# Convert some useful parameters to float
i_float
,
oa_float
=
float
(
params
[
6
]),
float
(
params
[
3
])
i_rad
=
i_float
*
np
.
pi
/
180
disk
,
scatt
,
dust
=
np
.
genfromtxt
(
filename
,
unpack
=
True
,
usecols
=
(
2
,
3
,
4
))
disk
/=
wl_uncut
...
...
@@ -804,15 +805,6 @@ def build_skirtor2016(base):
dust
=
dust
[
lam_idxs
]
intrin_disk
=
intrin_disk
[
lam_idxs
]
*
norm_fac
# Modify the model so that the central source is isotropic
# Calculate the coverting factors disk emission
# (dust emission is normalized to unity, so it remains same)
disk_fac
=
7
/
(
12
*
np
.
cos
(
i_float
*
np
.
pi
/
180
)
**
2
+
6
*
np
.
cos
(
i_float
*
np
.
pi
/
180
))
dust_fac
=
7
/
(
4
*
np
.
sin
(
oa_float
*
np
.
pi
/
180
)
**
2
+
3
*
np
.
sin
(
oa_float
*
np
.
pi
/
180
))
# Only apply disk_fac to type 1 (for type 2 it is zero)
if
i_float
<=
(
90
-
oa_float
):
disk
*=
disk_fac
/
dust_fac
intrin_disk
/=
dust_fac
models
.
append
(
SKIRTOR2016
(
params
[
0
],
params
[
1
],
params
[
2
],
params
[
3
],
params
[
4
],
params
[
5
],
params
[
6
],
wl
,
disk
,
dust
,
intrin_disk
))
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment