Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Guide reporting #197

Merged
merged 14 commits into from
Dec 23, 2018
Merged

Guide reporting #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c712334
First draft of guide reporting
jeanconn Dec 17, 2018
99d2b2b
Lower vmax for spoiler stars to allow seeing them
taldcroft Dec 22, 2018
10b9e38
Fix PEP8
taldcroft Dec 22, 2018
805c2be
Add coding and license
taldcroft Dec 22, 2018
71d6fa4
Get rid of the Tom coordinate labels hack
taldcroft Dec 22, 2018
56dfd7c
Add spoiler mag labels and other tidying
taldcroft Dec 23, 2018
17b0fbf
Refactor plotting into two separate functions
taldcroft Dec 23, 2018
3d56b9e
Consistent naming (guide is guide cand, star is field star)
taldcroft Dec 23, 2018
b94e73c
Auto-format COLOR1 to 2 decimal places
taldcroft Dec 23, 2018
f7543db
Remove MAG_ACA and MAG_ACA_ERR from table
taldcroft Dec 23, 2018
dede057
Include guide_index_template.html in package data
taldcroft Dec 23, 2018
1809a71
Add guide star catalog to report
taldcroft Dec 23, 2018
f09e3a2
Put back MAG_ACA_ERR
taldcroft Dec 23, 2018
15a0138
Add ASPQ1 to guide & guide candidates table
taldcroft Dec 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion proseco/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ def __init__(self, data=None, **kwargs):
# Make printed table look nicer. This is defined in advance
# and will be applied the first time the table is represented.
self._default_formats = {'p_acq': '.3f'}
for name in ('yang', 'zang', 'row', 'col', 'mag', 'maxmag', 'mag_err', 'color'):
for name in ('yang', 'zang', 'row', 'col', 'mag', 'maxmag', 'mag_err', 'color', 'COLOR1'):
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I want ASPQ1 too

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in 15a0138.

self._default_formats[name] = '.2f'
for name in ('ra', 'dec', 'RA_PMCORR', 'DEC_PMCORR'):
self._default_formats[name] = '.6f'
Expand Down
103 changes: 103 additions & 0 deletions proseco/guide_index_template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
<title>Proseco guide star selection summary</title>
<link href="/mta/ASPECT/aspect.css" rel="stylesheet" type="text/css" media="all" />
<style>
h1,h2,h3,h4 {
color: #990000;
}

table.table-striped {
border-width: thin thin thin thin;
border-spacing: 1px;
border-style: outset outset outset outset;
border-color: gray gray gray gray;
border-collapse: separate;
background-color: white;
}

table.table-striped th {
border-width: 1px 1px 1px 1px;
padding: 1px 3px 1px 3px;
border-color: gray;
border-style: inset;
}
table.table-striped td {
border-width: 1px 1px 1px 1px;
padding: 1px 3px 1px 3px;
border-style: inset;
border-color: gray;
text-align: right;
}
</style>
</head>

<body>

<!--#include virtual="/mta/ASPECT/header.html"-->

<h1> Obsid {{obsid}} at {{date}}</h1>

<table class="table-striped">
<tr> <td> <b>RA</b> </td> <td> {{ att[0] }} </td> </tr>
<tr> <td> <b>Dec</b> </td> <td> {{ att[1] }} </td> </tr>
<tr> <td> <b>Roll</b> </td> <td> {{ att[2] }} </td> </tr>
<tr> <td> <b>t_ccd</b> </td> <td> {{ t_ccd_guide }} </td> </tr>
<tr> <td> <b>dither_y</b> </td> <td> {{ dither_guide.y }} </td> </tr>
<tr> <td> <b>dither_z</b> </td> <td> {{ dither_guide.z }} </td> </tr>
<tr> <td> <b>n_guide</b> </td> <td> {{ n_guide }} </td> </tr>
<tr> <td> <b>include_ids</b> </td> <td> {{ str_include_ids }} </td> </tr>
<tr> <td> <b>exclude_ids</b> </td> <td> {{ str_exclude_ids }} </td> </tr>
</table>



<h2> Guide star catalog </h2>

<table>
<tr>
<td> {{ guides_table | safe }} </td>
</tr>
</table>


<h2> Candidates stars summary </h2>

<table>
<tr>
<td> {{ cand_guides_table | safe }} </td>
</tr>
</table>


<h2> Star details </h2>
<table>
{% for star in cand_guides %}
<hr></hr>
<h3 id="{{star['id']}}"> AGASC ID {{ star['id'] }} ({{star['selected']}})</h3>

<table>

<tr><td>{{ star['guide_table'] | safe }}</td></tr>
<tr><td><img src="{{star['candidate_plot'] | safe}}"></td></tr>
</table>


<h4>Progress through star selection stages<h4>
<table>
{% for line in star['log'] %}
<tr>
<td><tt> {{line}} </tt></td>
</tr>
{% endfor %}
</table>
{% endfor %}
</table>


<!--#include virtual="/mta/ASPECT/footer.html"-->
<!--footer end-->

</body>
</html>
Loading