diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 2002f58..fed0e3e 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "tarts" %} -{% set version = "4.2" %} +{% set version = "4.3" %} {% set python_min = "3.10" %} package: diff --git a/python/tarts/focus_offset.yaml b/python/tarts/focus_offset.yaml index f718758..5225dc3 100644 --- a/python/tarts/focus_offset.yaml +++ b/python/tarts/focus_offset.yaml @@ -1,89 +1,92 @@ z4_peak_pattern: - description: "Detector-polarity branch model for Z4 signed error (pred - truth)." + description: "Per-band/per-detector Z4 focus corrections from PSF-weighted medians on u/peterma2/tarts_raw_offsets_best300. Applied as Z4 += offset so corrected distributions are centered about zero." source: by_band_peaks: - u: [0.028133] - g: [0.013092] - r: [-0.04707, 0.048187] - i: [-0.12729, 0.13342] - z: [-0.36794, 0.37407] - y: [-0.9934645787151222, -0.9602425377593652, 0.8337476738515093, 0.8171366533736306] - # Peaks keyed by raft half (intra/extra pairs share the same branch: 191/192, 195/196, …). + u: [-1.16057932377, -1.15042459965, -1.03539264202, -1.03411114216, -0.304909616709, -0.269676864147, -0.177019536495, -0.152511104941] + g: [-0.932408869267, -0.931607365608, -0.621783077717, -0.529829442501, -0.377807885408, -0.362120598555, -0.3154694736, -0.247712776065] + r: [-0.849172592163, -0.732081770897, -0.639848053455, -0.585861623287, -0.463141173124, -0.441696047783, -0.430432707071, -0.268543213606] + i: [-0.621502220631, -0.592349529266, -0.469701886177, -0.463191926479, -0.418011665344, -0.353004902601, -0.285573452711, -0.209188058972] + z: [-0.570211350918, -0.523105680943, -0.505804657936, -0.468138933182, -0.406461596489, -0.0359441414475, -0.0258075613528, 0.0723320841789] + y: [-0.949390411377, -0.936058461666, -0.592729449272, -0.578970313072, -0.157845556736, -0.0218827556819, 0.154898881912, 0.243356779218] + # Observed PSF-weighted median Z4 [um] per detector in band order u,g,r,i,z,y. by_detector_peaks: - "191": [0.8337476738515093, 0.37407, 0.13342, 0.043173] - "192": [0.8337476738515093, 0.37407, 0.13342, 0.043173] - "195": [-0.9934645787151222, -0.37295, -0.12729, -0.042057] - "196": [-0.9934645787151222, -0.37295, -0.12729, -0.042057] - "199": [-0.9602425377593652, -0.36794, -0.12227, -0.016989] - "200": [-0.9602425377593652, -0.36794, -0.12227, -0.016989] - "203": [0.8171366533736306, 0.36905, 0.1284, 0.048187] - "204": [0.8171366533736306, 0.36905, 0.1284, 0.048187] + "191": [-1.03411114216, -0.529829442501, -0.639848053455, -0.621502220631, -0.468138933182, -0.592729449272] + "192": [-0.269676864147, -0.377807885408, -0.441696047783, -0.463191926479, -0.505804657936, -0.936058461666] + "195": [-1.03539264202, -0.621783077717, -0.849172592163, -0.353004902601, -0.0258075613528, 0.243356779218] + "196": [-0.152511104941, -0.247712776065, -0.268543213606, -0.209188058972, 0.0723320841789, -0.0218827556819] + "199": [-1.15042459965, -0.932408869267, -0.585861623287, -0.418011665344, -0.406461596489, 0.154898881912] + "200": [-0.304909616709, -0.362120598555, -0.430432707071, -0.285573452711, -0.0359441414475, -0.157845556736] + "203": [-1.16057932377, -0.931607365608, -0.732081770897, -0.592349529266, -0.570211350918, -0.578970313072] + "204": [-0.177019536495, -0.3154694736, -0.463141173124, -0.469701886177, -0.523105680943, -0.949390411377] + median_collection: "u/peterma2/tarts_raw_offsets_best300" + derived_from: "target_offsets_z4_medians.yaml weighted_median_z4; offset = -median" detector_polarity_groups: positive_branch: [191, 192, 203, 204] negative_branch: [195, 196, 199, 200] branch_amplitude_by_band: - u: 0.028133 - g: 0.013092 - r: 0.048187 - i: 0.13342 - z: 0.37407 - y: 0.8969951058054373 + u: 0.660578103736 + g: 0.53984243609 + r: 0.551347147673 + i: 0.426565455273 + z: 0.325975750806 + y: 0.454391576117 - # Applied in NeuralActiveOpticsSys: same offset for intra/extra chip of each half (191↔192, etc.). + # Applied in NeuralActiveOpticsSys as Z4 += offset (index 0). + # offset = -weighted_median so corrected Z4 is centered near zero. branch_prediction_by_band_detector: u: - "191": 0.028133 - "192": 0.028133 - "195": -0.028133 - "196": -0.028133 - "199": -0.028133 - "200": -0.028133 - "203": 0.028133 - "204": 0.028133 + "191": 1.03411114216 + "192": 0.269676864147 + "195": 1.03539264202 + "196": 0.152511104941 + "199": 1.15042459965 + "200": 0.304909616709 + "203": 1.16057932377 + "204": 0.177019536495 g: - "191": 0.013092 - "192": 0.013092 - "195": -0.013092 - "196": -0.013092 - "199": -0.013092 - "200": -0.013092 - "203": 0.013092 - "204": 0.013092 + "191": 0.529829442501 + "192": 0.377807885408 + "195": 0.621783077717 + "196": 0.247712776065 + "199": 0.932408869267 + "200": 0.362120598555 + "203": 0.931607365608 + "204": 0.3154694736 r: - "191": 0.048187 - "192": 0.048187 - "195": -0.048187 - "196": -0.048187 - "199": -0.048187 - "200": -0.048187 - "203": 0.048187 - "204": 0.048187 + "191": 0.639848053455 + "192": 0.441696047783 + "195": 0.849172592163 + "196": 0.268543213606 + "199": 0.585861623287 + "200": 0.430432707071 + "203": 0.732081770897 + "204": 0.463141173124 i: - "191": 0.13342 - "192": 0.13342 - "195": -0.13342 - "196": -0.13342 - "199": -0.13342 - "200": -0.13342 - "203": 0.13342 - "204": 0.13342 + "191": 0.621502220631 + "192": 0.463191926479 + "195": 0.353004902601 + "196": 0.209188058972 + "199": 0.418011665344 + "200": 0.285573452711 + "203": 0.592349529266 + "204": 0.469701886177 z: - "191": 0.37407 - "192": 0.37407 - "195": -0.37407 - "196": -0.37407 - "199": -0.37407 - "200": -0.37407 - "203": 0.37407 - "204": 0.37407 + "191": 0.468138933182 + "192": 0.505804657936 + "195": 0.0258075613528 + "196": -0.0723320841789 + "199": 0.406461596489 + "200": 0.0359441414475 + "203": 0.570211350918 + "204": 0.523105680943 y: - "191": 0.8337476738515093 - "192": 0.8337476738515093 - "195": -0.9934645787151222 - "196": -0.9934645787151222 - "199": -0.9602425377593652 - "200": -0.9602425377593652 - "203": 0.8171366533736306 - "204": 0.8171366533736306 + "191": 0.592729449272 + "192": 0.936058461666 + "195": -0.243356779218 + "196": 0.0218827556819 + "199": -0.154898881912 + "200": 0.157845556736 + "203": 0.578970313072 + "204": 0.949390411377 diff --git a/python/tarts/intrinsics_corners.parquet b/python/tarts/intrinsics_corners.parquet deleted file mode 100644 index 333c8b9..0000000 Binary files a/python/tarts/intrinsics_corners.parquet and /dev/null differ diff --git a/setup.py b/setup.py index f247bf3..2534d08 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setup( name="tarts", - version="4.2", + version="4.3", packages=find_packages(), install_requires=[], author="Peter Xiangyuan Ma",