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

Set starcheck to use agasc module default agasc file #444

Merged
merged 6 commits into from
Jul 1, 2024
Merged

Set starcheck to use agasc module default agasc file #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8cd2ed9
Set starcheck to use agasc default file
jeanconn Jun 23, 2024
69fd88b
Fix ASPQ1 warning text (missing content)
jeanconn Jun 23, 2024
4297c1d
Remove agasc_file cmdline option
jeanconn Jun 23, 2024
023303f
Update docs
jeanconn Jun 23, 2024
7544d8a
Set perturbation warning to show agasc id
jeanconn Jun 29, 2024
f141eab
Remove text about default SKA
jeanconn Jun 29, 2024
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: 2 additions & 1 deletion starcheck/src/lib/Ska/Starcheck/Obsid.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1264,7 +1264,8 @@ sub check_star_catalog {
or (($type =~ /BOT|ACQ/) && ($c->{"GS_ASPQ$i"} > 40)))
{
push @orange_warn,
sprintf "[%2d] Centroid Perturbation Warning. %s: ASPQ1 = %2d\n",;
sprintf("[%2d] Centroid Perturbation Warning. %s: ASPQ1 = %2d\n",
$i, $sid, $c->{"GS_ASPQ$i"});
}
}

Expand Down
12 changes: 3 additions & 9 deletions starcheck/src/starcheck.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
html => 1,
text => 1,
yaml => 1,
agasc_file => "${SKA}/data/agasc/proseco_agasc_1p7.h5",
config_file => "characteristics.yaml",
fid_char => "fid_CHARACTERISTICS",
verbose => 1,
Expand All @@ -64,7 +63,6 @@
'yaml!',
'vehicle!',
'verbose=s',
'agasc_file=s',
'sc_data=s',
'fid_char=s',
'config_file=s',
Expand Down Expand Up @@ -189,7 +187,7 @@

my $odb_file = get_file("$Starcheck_Data/$par{fid_char}*", 'odb', 'required');

my $agasc_file = get_file("$par{agasc_file}", "agasc_file");
my $agasc_file = get_file(call_python("utils.get_agasc_file"), "agasc_file");

my $ps_file = get_file("$par{dir}/mps/ms*.sum", 'processing summary');
my $tlr_file = get_file("$par{dir}/${sosa_dir_slash}*.tlr", 'TLR', 'required');
Expand Down Expand Up @@ -1293,10 +1291,6 @@ =head1 OPTIONS

Limit starcheck review to first N obsids (for testing).

=item B<-agasc_file <agasc>>

Specify location of agasc h5 file. Default is SKA/data/agasc/agasc1p7.h5 .

=item B<-fid_char <fid characteristics file>>

Specify file name of the fid characteristics file to use. This must be in the SKA/data/starcheck/ directory.
Expand Down Expand Up @@ -1338,8 +1332,8 @@ =head1 DESCRIPTION
results in a fatal error, however.

Starcheck uses the SKA environment variable to locate the default agasc file
"${SKA}/data/agasc/proseco_agasc_1p7.h5". If SKA is not set this defaults to
'/proj/sot/ska'.
"${SKA}/data/agasc/proseco_agasc_*.h5". The agasc file location can be controlled
with the agasc module environment variables AGASC_DIR and AGASC_HDF5_FILE.

Starcheck uses the PROSECO_OR_IMAGE_SIZE environment variable if available to
set up the check for the appropriate readout image size in pixels for science
Expand Down
5 changes: 5 additions & 0 deletions starcheck/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@
message=r"\nModel .* computed between .* clipping input mag\(s\) outside that range\.",
)


def get_agasc_file():
return agasc.get_agasc_filename()


def prehtml2text(html_text):
"""Convert the starcheck report html to plain text."""

Expand Down