Skip to content

Commit

Permalink
Merge pull request #124 from sfinkens/patmosx-2023
Browse files Browse the repository at this point in the history
Update calibration coefficients to PATMOS-X version 2023
  • Loading branch information
mraspaud authored Sep 6, 2023
2 parents a8b68a3 + cbf2d7c commit be5f731
Show file tree
Hide file tree
Showing 5 changed files with 126 additions and 123 deletions.
8 changes: 4 additions & 4 deletions bin/pygac-convert-patmosx-coefficients
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ class PatmosxReader:
r'\s*(?P<ch1_gain_switches_count>[eE0-9\.-]+)[^\n]*\n'
r'\s*(?P<ch2_gain_switches_count>[eE0-9\.-]+)[^\n]*\n'
r'\s*(?P<ch3a_gain_switches_count>[eE0-9\.-]+)[^\n]*\n'
r'\s*(?P<PRT1_0>[eE0-9\.-]+)\s*(?P<PRT1_1>[eE0-9\.-]+)\s*(?P<PRT1_2>[eE0-9\.-]+)\s*(?P<PRT1_3>[eE0-9\.-]+)\s*(?P<PRT1_4>[eE0-9\.-]+)[^\n]*\n'
r'\s*(?P<PRT2_0>[eE0-9\.-]+)\s*(?P<PRT2_1>[eE0-9\.-]+)\s*(?P<PRT2_2>[eE0-9\.-]+)\s*(?P<PRT2_3>[eE0-9\.-]+)\s*(?P<PRT2_4>[eE0-9\.-]+)[^\n]*\n'
r'\s*(?P<PRT3_0>[eE0-9\.-]+)\s*(?P<PRT3_1>[eE0-9\.-]+)\s*(?P<PRT3_2>[eE0-9\.-]+)\s*(?P<PRT3_3>[eE0-9\.-]+)\s*(?P<PRT3_4>[eE0-9\.-]+)[^\n]*\n'
r'\s*(?P<PRT4_0>[eE0-9\.-]+)\s*(?P<PRT4_1>[eE0-9\.-]+)\s*(?P<PRT4_2>[eE0-9\.-]+)\s*(?P<PRT4_3>[eE0-9\.-]+)\s*(?P<PRT4_4>[eE0-9\.-]+)[^\n]*\n'
r'\s*(?P<PRT1_0>[eE0-9\.-]+)\,*\s*(?P<PRT1_1>[eE0-9\.-]+)\,*\s*(?P<PRT1_2>[eE0-9\.-]+)\,*\s*(?P<PRT1_3>[eE0-9\.-]+)\,*\s*(?P<PRT1_4>[eE0-9\.-]+)[^\n]*\n'
r'\s*(?P<PRT2_0>[eE0-9\.-]+)\,*\s*(?P<PRT2_1>[eE0-9\.-]+)\,*\s*(?P<PRT2_2>[eE0-9\.-]+)\,*\s*(?P<PRT2_3>[eE0-9\.-]+)\,*\s*(?P<PRT2_4>[eE0-9\.-]+)[^\n]*\n'
r'\s*(?P<PRT3_0>[eE0-9\.-]+)\,*\s*(?P<PRT3_1>[eE0-9\.-]+)\,*\s*(?P<PRT3_2>[eE0-9\.-]+)\,*\s*(?P<PRT3_3>[eE0-9\.-]+)\,*\s*(?P<PRT3_4>[eE0-9\.-]+)[^\n]*\n'
r'\s*(?P<PRT4_0>[eE0-9\.-]+)\,*\s*(?P<PRT4_1>[eE0-9\.-]+)\,*\s*(?P<PRT4_2>[eE0-9\.-]+)\,*\s*(?P<PRT4_3>[eE0-9\.-]+)\,*\s*(?P<PRT4_4>[eE0-9\.-]+)[^\n]*\n'
r'\s*(?P<PRT_weight_1>[eE0-9\.-]+)\s*(?P<PRT_weight_2>[eE0-9\.-]+)\s*(?P<PRT_weight_3>[eE0-9\.-]+)\s*(?P<PRT_weight_4>[eE0-9\.-]+)[^\n]*\n'
r'(?:\s*(?P<sst_mask_day_0>[eE0-9\.-]+),\s*(?P<sst_mask_day_1>[eE0-9\.-]+),\s*(?P<sst_mask_day_2>[eE0-9\.-]+),\s*(?P<sst_mask_day_3>[eE0-9\.-]+)[^\n]*\n)?'
r'(?:\s*(?P<sst_mask_night_0>[eE0-9\.-]+),\s*(?P<sst_mask_night_1>[eE0-9\.-]+),\s*(?P<sst_mask_night_2>[eE0-9\.-]+),\s*(?P<sst_mask_night_3>[eE0-9\.-]+)[^\n]*\n)?'
Expand Down
6 changes: 5 additions & 1 deletion pygac/calibration.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,11 @@ class Calibrator(object):
'689386c822de18a07194ac7fd71652ea': {
'name': 'PATMOS-x, v2017r1, with provisional coefficients for MetOp-C',
'status': CoeffStatus.PROVISIONAL
}
},
'e8735ec394ecdb87b7edcd261e72d2eb': {
'name': 'PATMOS-x, v2023',
'status': CoeffStatus.PROVISIONAL
},
}
fields = [
"dark_count", "gain_switch", "s0", "s1", "s2", "b", # "b0", "b1", "b2",
Expand Down
Loading

0 comments on commit be5f731

Please sign in to comment.