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 special case ER checks #362

Merged
merged 2 commits into from
Jan 15, 2021
+0 −53
Merged

Remove special case ER checks #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa8c1b4
Remove special case ER checks
jeanconn Jan 10, 2021
8ab9997
Remove ACA-044
jeanconn Jan 14, 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
16 changes: 0 additions & 16 deletions starcheck/src/aca_load_review_cl.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,22 +208,6 @@ Checks
| | | | |configuration (2 | | | | | | |
| | | | |monitor windows) | | | | | | |
+-------+------------------+-+-+--------------------+------+-----+----+----+----+----------------+
| | |X|X|Special Case Engineering Request | | |
| | | | |(immediately follows an OR at identical | | |
| | | | |attitude, duration in NPM <= 10 min ) | | |
| | | | +--------------------+------+-----+----+----+ |AS: |
| | | | |Special Case ER | #FL | #AS |#GS |#MW | | |
| | | | | | | | | | |Possible Bright |
| | | | +--------------------+------+-----+----+----+ |Star Hold |
|ACA-044|Star catalog | | |Requirements | 0 | >=4 |>=4 |<=1 |n/a | |
| | | | +--------------------+------+-----+----+----+ |GS: |
| | | | |Standard | 0 | 5-8 |6-8 | 0 | | |
| | | | |configuration | | | | | |Reduced aspect |
| | | | +--------------------+------+-----+----+----+ |quality |
| | | | |Alternate | 0 | 4-8 |5-7 | 1 | | |
| | | | |configuration | | | | | | |
| | | | |(monitor window) | | | | | | |
+-------+------------------+-+-+--------------------+------+-----+----+----+----+----------------+
|ACA-009|Magnitude limit |X|X|AS: 5.8 - 10.3 (or fainter, if needed to |n/a |Possible Bright |
| | | | |find stars) | |Star Hold |
+-------+------------------+-+-+-------------------------------------------+----+----------------+
Expand Down
31 changes: 0 additions & 31 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 @@ -1145,37 +1145,6 @@ sub check_momentum_unload{
}
}

#############################################################################################
sub check_for_special_case_er{
#############################################################################################
my $self = shift;
# if the previous obsid is an OR and the current one is an ER
# and the obsid is < 10 minutes in duration (we've got a <10 min NPM criterion)
# and there is a star catalog to check
# and the last obsid had a star catalog
# and the pointings are the same
# it is a special case ER
$self->{special_case_er} = 0;
if ($self->{obsid} =~ /^\d+$/
and $self->{obsid} >= $ER_MIN_OBSID
and $self->find_command("MP_STARCAT")
and $self->{prev}
and $self->{prev}->{obsid} =~ /^\d+$/
and $self->{prev}->{obsid} < $ER_MIN_OBSID
and $self->{prev}->find_command("MP_STARCAT")
and abs($self->{ra} - $self->{prev}->{ra}) < 0.001
and abs($self->{dec} - $self->{prev}->{dec}) < 0.001
and abs($self->{roll} - $self->{prev}->{roll}) < 0.001){
if (($self->{obs_tstop} - $self->{obs_tstart}) < 10*60){
$self->{special_case_er} = 1;
push @{$self->{fyi}}, "Special Case ER\n";
}
else{
push @{$self->{fyi}},
sprintf("Same attitude as last obsid but too long (%.1f min) for Special Case ER\n", ($self->{obs_tstop} - $self->{obs_tstart})/60.);
}
}
}

#############################################################################################
sub check_sim_position {
Expand Down
6 changes: 0 additions & 6 deletions starcheck/src/starcheck.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,6 @@ sub json_obsids{
$obs{$obsid}->check_star_catalog($or{$obsid}, $par{vehicle});
$obs{$obsid}->check_sim_position(@sim_trans) unless $par{vehicle};
$obs{$obsid}->check_momentum_unload(\@bs);
$obs{$obsid}->check_for_special_case_er();
$obs{$obsid}->check_bright_perigee($radmon);

# Make sure there is only one star catalog per obsid
Expand Down Expand Up @@ -693,11 +692,6 @@ sub json_obsids{
# minumum requirements for fractional guide star count for ERs and ORs
my $min_num_gui = ($obs{$obsid}->{obsid} >= 38000 ) ? 6.0 : 4.0;

# use the 'special case' ER rules from ACA-044
if ($obs{$obsid}->{special_case_er}){
$min_num_gui = 4.0;
}

# Use the acq prob model values saved in figure_of_merit for the expected
# number of acq stars and a bad overall probability. figure_of_merit isn't
# defined if there is no star catalog, so use default of 0 stars and not-bad (0 status)
Expand Down