diff --git a/mica/report/report.py b/mica/report/report.py index 426898b2..3a459c4d 100644 --- a/mica/report/report.py +++ b/mica/report/report.py @@ -521,14 +521,6 @@ def star_info(id): } -def get_aiprops(obsid): - ACA_DB = Sqsh(dbi="sybase", server="sybase", database="aca", user="aca_read") - aiprops = ACA_DB.fetchall( - "select * from aiprops where obsid = {} order by tstart".format(obsid) - ) - return aiprops - - def main(obsid): report_root = REPORT_ROOT strobs = "%05d" % obsid @@ -747,15 +739,6 @@ def main(obsid): f.close() interval["loglink"] = newlogname - aiprops = get_aiprops(obsid) - aiprops_template = jinja_env.get_template("aiprops.html") - aiprops_page = aiprops_template.render(obsid=obsid, aiprops=aiprops) - aiprops_page_file = os.path.join(outdir, "aiprops.html") - logger.debug("AIPROPS report to {}".format(aiprops_page_file)) - f = open(aiprops_page_file, "w") - f.write(aiprops_page) - f.close() - props_template = jinja_env.get_template("props.html") props_page = props_template.render(obsid=obsid, vv=vv) props_page_file = os.path.join(outdir, "props.html") diff --git a/mica/report/templates/aiprops.html b/mica/report/templates/aiprops.html deleted file mode 100644 index 5b394105..00000000 --- a/mica/report/templates/aiprops.html +++ /dev/null @@ -1,42 +0,0 @@ - - -V&V obsid {{ obsid }} - - - -
-

V&V obsid {{ obsid }}

- -

AIPROPS - - -{% for field in ['datestart', 'datestop', 'obsid', 'pcad_mode', -'aspect_mode', 'sim_mode'] %} - -{% for row in aiprops %} - -{% for field in ['datestart', 'datestop', 'obsid', 'pcad_mode', -'aspect_mode', 'sim_mode'] %} - -{% endfor %} - -{% endfor %} -
{{ field }} -{% endfor %} -
{{ row[field] }}
-

- - diff --git a/mica/report/templates/report.html b/mica/report/templates/report.html index e32964a4..64ccb8ee 100644 --- a/mica/report/templates/report.html +++ b/mica/report/templates/report.html @@ -167,8 +167,8 @@

Starcheck

manvr['target_Q2'], manvr['target_Q3'], manvr['target_Q4']) }} -{{ " MANVR: Angle= %.2f deg Duration= %d sec Slew err= %.1f arcsec"|format( -manvr['angle_deg'], manvr['duration_sec'], manvr['slew_err_arcsec']) -}} +{{ " MANVR: Angle= %.2f deg Duration= %d sec"|format( +manvr['angle_deg'], manvr['duration_sec']) -}} {% endfor %} diff --git a/mica/report/templates/vv.html b/mica/report/templates/vv.html index ab9d2741..b7ac4825 100644 --- a/mica/report/templates/vv.html +++ b/mica/report/templates/vv.html @@ -93,7 +93,6 @@

Aspect Intervals

-AIPROPS and Guide/Fid Props