Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
L
lalsuite
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
109
Issues
109
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
29
Merge Requests
29
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lscsoft
lalsuite
Commits
8e2d85e9
Commit
8e2d85e9
authored
Jun 06, 2018
by
John Douglas Veitch
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix_eos' into 'fix_eos'
Fix eos See merge request
john-veitch/lalsuite!3
parents
bb6bb351
25ed5f00
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
lalinference/src/LALInferenceTemplate.c
lalinference/src/LALInferenceTemplate.c
+3
-3
No files found.
lalinference/src/LALInferenceTemplate.c
View file @
8e2d85e9
...
...
@@ -808,7 +808,7 @@ void LALInferenceTemplateXLALSimInspiralChooseWaveform(LALInferenceModel *model)
if
(
model
->
eos_fam
)
{
LALSimNeutronStarFamily
*
eos_fam
=
model
->
eos_fam
;
REAL8
r1
=
0
,
r2
=
0
,
k2_1
=
0
,
k2_2
=
0
,
lambda1
=
0
,
lambda2
=
0
;
REAL8
r1
=
0
,
r2
=
0
,
k2_1
=
0
,
k2_2
=
0
;
REAL8
mass_max
=
XLALSimNeutronStarMaximumMass
(
eos_fam
)
/
LAL_MSUN_SI
;
REAL8
mass_min
=
XLALSimNeutronStarFamMinimumMass
(
eos_fam
)
/
LAL_MSUN_SI
;
...
...
@@ -826,8 +826,8 @@ void LALInferenceTemplateXLALSimInspiralChooseWaveform(LALInferenceModel *model)
lambda2
=
(
2
.
/
3
.)
*
k2_2
*
pow
(
r2
/
(
m2
*
LAL_MRSUN_SI
),
5
.
0
);
}
/* Set waveform params */
XLALSimInspiralWaveformParamsInsertTidalLambda1
(
model
->
LALpars
,
lambda1
);
XLALSimInspiralWaveformParamsInsertTidalLambda2
(
model
->
LALpars
,
lambda2
);
/*
XLALSimInspiralWaveformParamsInsertTidalLambda1(model->LALpars, lambda1);
XLALSimInspiralWaveformParamsInsertTidalLambda2(model->LALpars, lambda2);
*/
/* Add derived quantities for output */
LALInferenceAddVariable
(
model
->
params
,
"radius1"
,
&
r1
,
LALINFERENCE_REAL8_t
,
LALINFERENCE_PARAM_OUTPUT
);
...
...
Write
Preview
Markdown
is supported
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