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

round guide count and P2 #378

Merged
merged 8 commits into from
Dec 2, 2021
Merged

round guide count and P2 #378

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fb53f78
round guide count and P2
javierggt Nov 12, 2021
caa0981
modify P2 format string accordingly
javierggt Nov 12, 2021
67acb1b
Remove unnecessary substr()
jeanconn Nov 20, 2021
b4c6e57
Add an in-the-obsid check for guide count
jeanconn Nov 20, 2021
8fad789
Add guide count in per-obsid text
jeanconn Nov 23, 2021
b462418
Add bright count / count 9th to ER report
jeanconn Nov 26, 2021
eb6168b
Demote agasc mag diff warn to yellow
jeanconn Nov 26, 2021
8d9e865
Explicitly use ER guide count limit for ERs
jeanconn Dec 2, 2021
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
21 changes: 18 additions & 3 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 @@ -1115,7 +1115,7 @@ sub check_bright_perigee{
}

# Pass 1 to _guide_count as third arg to use the count_9th mode
my $bright_count = _guide_count(\@mags, $self->{ccd_temp}, 1);
my $bright_count = sprintf("%.1f", _guide_count(\@mags, $self->{ccd_temp}, 1));
if ($bright_count < $min_n_stars){
push @{$self->{warn}}, "$bright_count star(s) brighter than scaled 9th mag. "
. "Perigee requires at least $min_n_stars\n";
Expand Down Expand Up @@ -2269,7 +2269,7 @@ sub print_report {
my $bad_FOM = $self->{figure_of_merit}->{cum_prob_bad};
$o .= "$red_font_start" if $bad_FOM;
$o .= "Probability of acquiring 2 or fewer stars (10^-x):\t";
$o .= substr(sprintf("%.4f", $self->{figure_of_merit}->{P2}), 0, 6) . "\t";
$o .= sprintf("%.1f", $self->{figure_of_merit}->{P2}) . "\t";
$o .= "$font_stop" if $bad_FOM;
$o .= "\n";
$o .= sprintf("Acquisition Stars Expected : %.2f\n",
Expand Down Expand Up @@ -2619,6 +2619,19 @@ sub quat2radecroll {
return ($ra, $dec, $roll);
}

###################################################################################
sub check_guide_count{
###################################################################################
my $self = shift;
my $guide_count = $self->count_guide_stars();

if ($guide_count < 4.0){
push @{$self->{warn}}, "Guide count of $guide_count < 4.0.";
}

# Also save the guide count in the figure_of_merit
$self->{figure_of_merit}->{guide_count} = $guide_count;
taldcroft marked this conversation as resolved.
Show resolved Hide resolved
}

###################################################################################
sub count_guide_stars{
Expand All @@ -2634,7 +2647,7 @@ sub count_guide_stars{
push @mags, $mag;
}
}
return _guide_count(\@mags, $self->{ccd_temp});
return sprintf("%.1f", _guide_count(\@mags, $self->{ccd_temp}));
}


Expand Down Expand Up @@ -2850,6 +2863,8 @@ sub set_proseco_probs_and_check_P2{
}
my ($p_acqs, $P2, $expected) = proseco_probs($args);

$P2 = sprintf("%.1f", $P2);

my @acq_indexes = @{$args->{acq_indexes}};

# Assign those p_acqs to a slot hash and the catalog P_ACQ by index
Expand Down
3 changes: 2 additions & 1 deletion starcheck/src/starcheck.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,7 @@ sub json_obsids{
$obs{$obsid}->check_sim_position(@sim_trans) unless $par{vehicle};
$obs{$obsid}->check_momentum_unload(\@bs);
$obs{$obsid}->check_bright_perigee($radmon);
$obs{$obsid}->check_guide_count();

# Make sure there is only one star catalog per obsid
warning ("More than one star catalog assigned to Obsid $obsid\n")
Expand Down Expand Up @@ -674,7 +675,7 @@ sub json_obsids{
$out .= sprintf "<A HREF=\"#obsid$obs{$obsid}->{obsid}\">OBSID = %5s</A>", $obs{$obsid}->{obsid};
$out .= sprintf " at $obs{$obsid}->{date} ";

my $guide_count = $obs{$obsid}->count_guide_stars();
my $guide_count = $obs{$obsid}->{figure_of_merit}->{guide_count};
taldcroft marked this conversation as resolved.
Show resolved Hide resolved

# if Obsid is numeric, print tally info
if ($obs{$obsid}->{obsid} =~ /^\d+$/ ){
Expand Down