Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
R
research-projects-RIT
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
1
Merge Requests
1
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Richard O'Shaughnessy
research-projects-RIT
Commits
23111a24
Commit
23111a24
authored
Jan 12, 2019
by
Richard O'Shaughnessy
Browse files
Options
Browse Files
Download
Plain Diff
Merge commit '
69edd2e6
' into temp-RIT-Tides-port_master
parents
696aea2b
69edd2e6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
0 deletions
+11
-0
MonteCarloMarginalizeCode/Code/util_ManualOverlapGrid.py
MonteCarloMarginalizeCode/Code/util_ManualOverlapGrid.py
+11
-0
No files found.
MonteCarloMarginalizeCode/Code/util_ManualOverlapGrid.py
View file @
23111a24
...
...
@@ -365,6 +365,11 @@ def evaluate_overlap_on_grid(hfbase,param_names, grid):
if
p
in
param_names
:
indx
=
param_names
.
index
(
p
)
grid_out
[:,
indx
]
/=
lal
.
MSUN_SI
# remove distance units at end
for
p
in
[
'distance'
,
'dist'
]:
if
p
in
param_names
:
indx
=
param_names
.
index
(
p
)
grid_out
[:,
indx
]
/=
lal
.
PC_SI
*
1e6
# Truncate grid so overlap with the base point is > opts.min_match. Make sure to CONSISTENTLY truncate all lists (e.g., the P_list)
grid_out_new
=
[]
P_list_out_new
=
[]
...
...
@@ -532,6 +537,12 @@ else:
indx
=
param_names
.
index
(
p
)
#print p, param_names[indx], param_ranges[indx]
param_ranges
[
indx
]
=
np
.
array
(
param_ranges
[
indx
])
*
lal
.
MSUN_SI
# Rescale hand-specified ranges to SI units
for
p
in
[
'distance'
,
'dist'
]:
if
p
in
param_names
:
indx
=
param_names
.
index
(
p
)
#print p, param_names[indx], param_ranges[indx]
param_ranges
[
indx
]
=
np
.
array
(
param_ranges
[
indx
])
*
lal
.
PC_SI
*
1e6
else
:
for
param
in
param_names
:
if
param
==
'mc'
:
...
...
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