Skip to content

Commit

Permalink
Merge pull request #966 from Keck-DataReductionPipelines/develop
Browse files Browse the repository at this point in the history
Version 2.8.1
  • Loading branch information
bjfultn authored Nov 18, 2024
2 parents 7ddcfaf + a754dda commit 288f1b0
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion kpfpipe/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@

import kpfpipe.cli

__version__ = '2.8.0'
__version__ = '2.8.1'
8 changes: 6 additions & 2 deletions modules/calibration_lookup/src/alg.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,15 @@ def lookup(self, subset=None):
break
else:
output_cals[cal] = self.defaults[cal]
wls_files = output_cals[cal]

if lookup == 'etalon':
new_dt = getheader(wls_files[0])['DATE-BEG']
try:
new_dt = getheader(wls_files[0])['DATE-BEG']
self.datetime = new_dt
except: # no DB available
pass
self.lookup_map['etalonmask'] = 'database'
self.datetime = new_dt
output_cals[cal] = self.lookup(subset=['etalonmask'])

return output_cals
Expand Down
3 changes: 2 additions & 1 deletion static/kpfera_definitions.csv
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ KPFERA, UT_start_date, UT_end_date, comment
0.5, 2000-01-01 00:00:00, 2022-11-09 00:00:00, Before First Light (engineering)
1.0, 2022-11-09 00:00:01, 2024-02-03 00:00:00, First science era: First Light to Service Mission #1
1.5, 2024-02-03 00:00:01, 2024-02-11 00:00:00, Service Mission #1 (engineering)
2.0, 2024-02-23 12:00:00, 3000-01-01 00:00:00, Second science era: After Service Mission #1
2.0, 2024-02-23 12:00:00, 2024-11-01 00:00:00, Second science era: After Service Mission #1
2.5, 2024-11-01 12:00:00, 3000-01-01 00:00:00, Service Mission #2 (engineering)
6 changes: 3 additions & 3 deletions static/static_green_ccf_ratio_lfc_orders.csv
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ idx F9_espresso G2_espresso G8_espresso G9_espresso K2_espresso K6_espresso M2_e
9 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
10 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
11 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
12 0.5708 0.6494 0.6384 0.6196 0.5435 0.5897 0.0781 0.4714 1.0000 1.0000 1.0000
13 0.5880 0.5813 0.6337 0.6316 0.5699 0.6170 0.0838 0.4885 1.0000 1.0000 1.0000
14 0.8477 0.9274 0.9034 0.9285 0.8011 0.8492 0.1052 0.7595 1.0000 1.0000 1.0000
12 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
13 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
14 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
15 0.8816 0.8975 0.9310 1.0000 0.9512 0.9894 0.0984 0.8062 1.0000 1.0000 1.0000
16 0.6582 0.7776 0.7660 0.8301 0.9285 0.9465 0.1029 0.6847 1.0000 1.0000 1.0000
17 0.7435 0.8580 0.8567 0.9468 1.0000 1.0000 0.0906 0.8177 1.0000 1.0000 1.0000
Expand Down

0 comments on commit 288f1b0

Please sign in to comment.