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

Use proseco for P_ACQ #272

Merged
merged 23 commits into from
Jan 17, 2019
Merged

Use proseco for P_ACQ #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
27a6d50
Add ccd_temp_acq to values calculated in calc_ccd_temps
jeanconn Jan 5, 2019
46c8943
Use proseco for P_ACQ calculations
jeanconn Jan 5, 2019
003cdc6
Remove FigureOfMerit from Makefile
jeanconn Jan 7, 2019
4be5b72
Use maneuver summary maneuver angle instead of calculating it
jeanconn Jan 7, 2019
911d4a3
Handle missing data (ReOpen schedule beginning) for proseco probs
jeanconn Jan 7, 2019
a1e2276
Use the 'last' maneuver for maneuver angle (for segmented manvrs for …
jeanconn Jan 7, 2019
0e75f3f
Skip trying for proseco args for NONE obsids
jeanconn Jan 7, 2019
887e7bf
Recharacterize big box warning as yellow_warn
jeanconn Jan 7, 2019
98dc5bd
Add comment for empty hover-over acq prob and simplify a bit
jeanconn Jan 14, 2019
2082c6d
Remove big box check and set proseco probs earlier in loop in starche…
jeanconn Jan 14, 2019
998ff46
Assume the best
jeanconn Jan 14, 2019
a01658b
Update comments/docstrings (and fiddle with whitespace)
jeanconn Jan 14, 2019
c8a4bc0
Set P2 to 2.0 and use more local variable
jeanconn Jan 14, 2019
cb88ae6
Use acq phase temperature for mag limits
jeanconn Jan 14, 2019
788a673
Remove if statement setting acq temperature
jeanconn Jan 14, 2019
44fc15e
Remove halfwidth clipping and update comments and warning
jeanconn Jan 15, 2019
b4656b1
Add newline at end of acq ccd clip warn.
jeanconn Jan 15, 2019
cc897a1
Set to be the right value for P2 and use P2 consistently
jeanconn Jan 15, 2019
33bd6e4
Use less ambiguous keys in the proseco arg hash
jeanconn Jan 15, 2019
473a313
Add comment to temperature clipping
jeanconn Jan 15, 2019
78e19bd
Use ternary to set SI and SIM_OFFSET_Z for proseco
jeanconn Jan 15, 2019
945fa19
Set more conservative P2 of 3.0 for ERs and to use as yellow-warn for…
jeanconn Jan 17, 2019
4e289bf
Make a consistent P2_yellow which is P2_red + 1.0
taldcroft Jan 17, 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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SRC = starcheck/src

RELATED_LIB = $(SRC)/StarcheckParser.pm
BIN = $(SRC)/starcheck.pl $(SRC)/starcheck
LIB = $(SRC)/lib/Ska/Starcheck/Obsid.pm $(SRC)/lib/Ska/Starcheck/FigureOfMerit.pm \
LIB = $(SRC)/lib/Ska/Starcheck/Obsid.pm \
$(SRC)/lib/Ska/Starcheck/Dark_Cal_Checker.pm $(SRC)/lib/Ska/Parse_CM_File.pm
PYTHON_LIB = starcheck/calc_ccd_temps.py starcheck/pcad_att_check.py starcheck/plot.py \
starcheck/version.py starcheck/__init__.py
Expand Down
1 change: 1 addition & 0 deletions starcheck/calc_ccd_temps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ def get_interval_data(intervals, times, ccd_temp, obsreqs=None):
obstemps[str(interval['obsid'])] = obs
continue
obs['ccd_temp'] = np.max(ok_temps)
obs['ccd_temp_acq'] = np.max(ok_temps[:2])
obs['n100_warm_frac'] = dark_model.get_warm_fracs(
100, interval['tstart'], np.max(ok_temps))
# If we have an OR list, the obsid is in that list, and the OR list has zero-offset keys
Expand Down
101 changes: 0 additions & 101 deletions starcheck/src/lib/Ska/Starcheck/FigureOfMerit.pm
View file
Open in desktop

This file was deleted.

Loading