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

Remove sybase use for star stats #337

Merged
merged 5 commits into from
Nov 20, 2019
Merged

Remove sybase use for star stats #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
08fbfab
Add first draft of using mica stats instead of sybase
jeanconn Aug 23, 2019
ff863b1
Use kadi star lookup instead of stats cgi for links
jeanconn Aug 23, 2019
c32b433
Set path to standard test data for 'make test'
jeanconn Aug 23, 2019
8c5b121
Move imports and add docstring for get_mica_star_stats
jeanconn Aug 23, 2019
98e8b98
Remove database Perl imports
jeanconn Aug 23, 2019
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
3 changes: 1 addition & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ FLIGHT_ENV = SKA

SRC = starcheck/src

#include $(SKA)/include/Makefile.FLIGHT

RELATED_LIB = $(SRC)/StarcheckParser.pm
BIN = $(SRC)/starcheck.pl $(SRC)/starcheck
Expand All @@ -15,7 +14,7 @@ DOC_RST = $(SRC)/aca_load_review_cl.rst
DOC_HTML = aca_load_review_cl.html


TEST_DATA_TGZ = $(ROOT_FLIGHT)/data/starcheck/JUL0918A_test_data.tar.gz
TEST_DATA_TGZ = ${SKA}/data/starcheck/JUL0918A_test_data.tar.gz
# starcheck_characteristics tarball should be installed from
# separate starcheck_characteristics project
# with "make install_dist" from that project
Expand Down
1 change: 0 additions & 1 deletion starcheck/data/characteristics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
paths:
acq_stat_query: https://icxc.harvard.edu/cgi-bin/aspect/get_stats/get_stats.cgi
week_lookup: https://icxc.harvard.edu/cgi-bin/aspect/starcheck/find_shortterm.cgi

# string match on oflsids that may not have a maneuver or starcat, and its OK!
Expand Down
151 changes: 49 additions & 102 deletions starcheck/src/lib/Ska/Starcheck/Obsid.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@ from proseco.core import ACABox
from proseco.catalog import get_effective_t_ccd
from proseco.guide import get_imposter_mags

import mica.stats.acq_stats
import mica.stats.guide_stats

ACQS = mica.stats.acq_stats.get_stats()
GUIDES = mica.stats.guide_stats.get_stats()


def _yagzag_to_pixels(yag, zag):
"""
Call chandra_aca.transform.yagzag_to_pixels.
Expand Down Expand Up @@ -162,6 +169,44 @@ def _get_agasc_stars(ra, dec, roll, radius, date, agasc_file):

return stars_dict


def get_mica_star_stats(agasc_id, time):
"""
Get the acq and guide star statistics for a star before a given time.
The time filter is just there to make this play well when run in regression.
The mica acq and guide stats are fetched into globals ACQS and GUIDES
and this method just filters for the relevant ones for a star and returns
a dictionary of summarized statistics.

:param agasc_id: agasc id of star
:param time: time used as end of range to retrieve statistics.

:return: dictionary of stats for the observed history of the star
"""

# Cast the inputs
time = float(time)
agasc_id = int(agasc_id)

acqs = Table(ACQS[(ACQS['agasc_id'] == agasc_id)
& (ACQS['guide_tstart'] < time)])
ok = acqs['img_func'] == 'star'
guides = Table(GUIDES[(GUIDES['agasc_id'] == agasc_id)
& (GUIDES['kalman_tstart'] < time)])
mags = np.concatenate(
[acqs['mag_obs'][acqs['mag_obs'] != 0],
guides['aoacmag_mean'][guides['aoacmag_mean'] != 0]])

avg_mag = float(np.mean(mags)) if (len(mags) > 0) else float(13.94)
stats = {'acq': len(acqs),
'acq_noid': int(np.count_nonzero(~ok)),
'gui' : len(guides),
'gui_bad': int(np.count_nonzero(guides['f_track'] < .95)),
'gui_fail': int(np.count_nonzero(guides['f_track'] < .01)),
'gui_obc_bad': int(np.count_nonzero(guides['f_obc_bad'] > .05)),
'avg_mag': avg_mag}
return stats

};


Expand All @@ -176,8 +221,6 @@ use Ska::Convert qw(date2time time2date);

use RDB;

use SQL::Abstract;
use Ska::DatabaseUtil qw( sql_fetchall_array_of_hashref );
use Carp;

# Constants
Expand Down Expand Up @@ -2109,7 +2152,7 @@ sub print_report {
}
}

my $acq_stat_lookup = "$config{paths}->{acq_stat_query}?id=";
my $star_stat_lookup = "http://kadi.cfa.harvard.edu/star_hist/?agasc_id=";


my $table;
Expand Down Expand Up @@ -2173,8 +2216,8 @@ sub print_report {
# Make the id a URL if there is star history or if star history could
# not be checked (no db_handle)
my $star_link;
if ((not defined $db_handle) or (($db_stats->{acq} or $db_stats->{gui}))){
$star_link = sprintf("HREF=\"%s%s\"",$acq_stat_lookup, $c->{"GS_ID${i}"});
if ($db_stats->{acq} or $db_stats->{gui}){
$star_link = sprintf("HREF=\"%s%s\"",$star_stat_lookup, $c->{"GS_ID${i}"});
}
else{
$star_link = sprintf("A=\"star\"");
Expand Down Expand Up @@ -2572,103 +2615,7 @@ sub star_dbhist {

my $obs_tstart_minus_day = $obs_tstart - 86400;

return undef if (not defined $db_handle);

my %stats = (
'agasc_id' => $star_id,
'acq' => 0,
'acq_noid' => 0,
'gui' => 0,
'gui_bad' => 0,
'gui_fail' => 0,
'gui_obc_bad' => 0,
'avg_mag' => 13.9375,
);



eval{
# acq_stats_data
my $sql = SQL::Abstract->new();
my %acq_where = ( 'agasc_id' => $star_id,
'type' => { '!=' => 'FID'},
'tstart' => { '<' => $obs_tstart_minus_day }
);

my ($acq_all_stmt, @acq_all_bind ) = $sql->select('acq_stats_data',
'*',
\%acq_where );

my @acq_all = sql_fetchall_array_of_hashref( $db_handle, $acq_all_stmt, @acq_all_bind );
my @mags;

if (scalar(@acq_all)){
my $noid = 0;
for my $attempt (@acq_all){
if ($attempt->{'obc_id'} =~ 'NOID'){
$noid++;
}
else{
push @mags, $attempt->{'mag_obs'};
}
}
$stats{'acq'} = scalar(@acq_all);
$stats{'acq_noid'} = $noid;
}

# guide_stats_view
$sql = SQL::Abstract->new();
my %gui_where = ( 'id' => $star_id,
'type' => { '!=' => 'FID' },
'kalman_tstart' => { '<' => $obs_tstart_minus_day });

my ($gui_all_stmt, @gui_all_bind ) = $sql->select('guide_stats_view',
'*',
\%gui_where );

my @gui_all = sql_fetchall_array_of_hashref( $db_handle, $gui_all_stmt, @gui_all_bind );


if (scalar(@gui_all)){
my $bad = 0;
my $fail = 0;
my $obc_bad = 0;
for my $attempt (@gui_all){
if ($attempt->{'percent_not_tracking'} >= 5){
$bad++;
}
if ($attempt->{'percent_not_tracking'} == 100){
$fail++;
}
else{
if ((defined $attempt->{'mag_obs_mean'}) and ($attempt->{'mag_obs_mean'} < 13.9 )){
push @mags, $attempt->{'mag_obs_mean'};
}
}
if ($attempt->{'percent_obc_bad_status'} >= 5){
$obc_bad++;
}
}
$stats{'gui'} = scalar(@gui_all);
$stats{'gui_bad'} = $bad;
$stats{'gui_fail'} = $fail;
$stats{'gui_obc_bad'} = $obc_bad;
}

my $mag_sum = 0;
if (scalar(@mags)){
map { $mag_sum += $_ } @mags;
$stats{'avg_mag'} = $mag_sum / scalar(@mags);
}
};
if ($@){
# if we get db errors, just print and move on
print STDERR $@;

}

return \%stats;

return get_mica_star_stats($star_id, $obs_tstart_minus_day);

}

Expand Down
14 changes: 0 additions & 14 deletions starcheck/src/starcheck.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,20 +347,6 @@
}


# See if we have database access
my $db_handle;
eval{
eval 'use Ska::DatabaseUtil';
$db_handle = Ska::DatabaseUtil::sql_connect( 'sybase-aca-aca_read' );

};
if (($@) or (not defined $db_handle)){
warning("Unable to connect to Sybase server; links generated for all AGASC ids by default \n");
}
else{
Ska::Starcheck::Obsid::set_db_handle($db_handle);
}

# Dark Cal Checker Section
use Ska::Starcheck::Dark_Cal_Checker;
my $dark_cal_checker;
Expand Down