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

Better star catalog handling #253

Merged
merged 8 commits into from
Sep 27, 2022
Merged

Better star catalog handling #253

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3609aa4
Reset star catalog after each observation
taldcroft Sep 14, 2022
b2b53c6
Copy the cached starcat dict in case a key gets re-used
taldcroft Sep 14, 2022
e4b5bda
Correct for MATLAB proper motion bug in star identification
taldcroft Sep 14, 2022
d24a196
WIP refactor starcats for performance
taldcroft Sep 15, 2022
223800f
Refactor part 2, mostly working
taldcroft Sep 15, 2022
d761c94
Refactor starcats part 3: working for simple tests
taldcroft Sep 15, 2022
dfcce86
Change the name of the starcats cache file
taldcroft Sep 26, 2022
e5d8f90
Change warning to info since it is OK for users
taldcroft Sep 26, 2022
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: 16 additions & 5 deletions kadi/commands/commands_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,8 +684,8 @@ def get_cmds_obs_final(cmds, pars_dict, rev_pars_dict, schedule_stop_time):
# use values that are not None to avoid errors. For `sim_pos`, if the SIM
# has not been commanded in a long time then it will be at -99616.
obsid = -1
starcat_idx = -1
starcat_date = "1999:001:00:00:00.000"
starcat_idx = None
starcat_date = None
sim_pos = -99616
obs_params = None
cmd_obs_extras = []
Expand Down Expand Up @@ -734,8 +734,14 @@ def get_cmds_obs_final(cmds, pars_dict, rev_pars_dict, schedule_stop_time):
obs_params["simpos"] = sim_pos # matches states 'simpos'
obs_params["obs_start"] = cmd["date"]
if obs_params["npnt_enab"]:
obs_params["starcat_idx"] = starcat_idx
obs_params["starcat_date"] = starcat_date
if starcat_idx is not None and starcat_date is not None:
obs_params["starcat_idx"] = starcat_idx
obs_params["starcat_date"] = starcat_date
else:
logger.warning(
f"WARNING: no starcat for obsid {obsid} at {cmd['date']} "
"even though npnt_enab is True"
)

elif tlmsid in ("AONMMODE", "AONSMSAF") or (
tlmsid == "AONM2NPE" and cmd["vcdu"] == -1
Expand All @@ -748,8 +754,13 @@ def get_cmds_obs_final(cmds, pars_dict, rev_pars_dict, schedule_stop_time):
# obs_params will be None at that point.
if obs_params is not None:
obs_params["obs_stop"] = cmd["date"]
# This closes out the observation
# This closes out the observation. Reset the star catalog state
# variables since a valid star catalog is always uniquely associated
# with an pointing observation.
obs_params = None
starcat_idx = None
starcat_date = None

elif cmd["type"] == "SIMTRANS":
sim_pos = cmd["params"]["pos"]

Expand Down
Loading