From 5e1c60f266924bfc9c941dcfe1fca8b8f01d4de0 Mon Sep 17 00:00:00 2001 From: andrew551 Date: Tue, 19 Mar 2024 01:59:02 +0000 Subject: [PATCH] fix bugs --- MEE2024util.py | 2 +- distortion_fitter.py | 5 ++++- stacker_implementation.py | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/MEE2024util.py b/MEE2024util.py index 242b99e..84d73da 100644 --- a/MEE2024util.py +++ b/MEE2024util.py @@ -12,7 +12,7 @@ import numpy as np def _version(): - return 'v0.3.1' + return 'v0.3.2' ''' if options['output_dir'] is empty, then output there diff --git a/distortion_fitter.py b/distortion_fitter.py index 62cde86..b7a32e7 100644 --- a/distortion_fitter.py +++ b/distortion_fitter.py @@ -266,10 +266,13 @@ def match_and_fit_distortion(path_data, options, debug_folder=None): 'distortion coeffs y': dict(zip(coeff_names, [reg_y.intercept_]+list( reg_y.coef_))), 'nearest-neighbour error correlation': nn_corr, 'aberration/parallax correction enabled?': options['enable_corrections'], + 'gravitational correction enabled?': options['enable_gravitational_def'], 'refraction correction enabled?': options['enable_corrections_ref'], 'source_files':str(data['source_files']) if 'source_files' in data else 'unknown', } - additional_info = { 'observation_temp (°C)':options['observation_temp'], + additional_info = { 'observation_long (degrees)':options['observation_lat'], + 'observation_lat (degrees)':options['observation_long'], + 'observation_temp (°C)':options['observation_temp'], 'observation_pressure (millibars)':options['observation_pressure'], 'observation_humidity (0.0 to 1.0)':options['observation_humidity'], 'observation_height (m)':options['observation_height'], diff --git a/stacker_implementation.py b/stacker_implementation.py index 7330476..5c6a3bb 100644 --- a/stacker_implementation.py +++ b/stacker_implementation.py @@ -588,7 +588,10 @@ def do_stack(files, darkfiles, flatfiles, options): shift = 0 if options['centroid_gaussian_subtract'] else 0.5 plt.scatter(centroids_stacked[:options["d"], 1]-shift, centroids_stacked[:options["d"], 0]-shift, marker='x') # subtract half pixel to align with image properly if flag_found_IDs: - for index, row in df_identification.iterrows(): + + for ind, (index, row) in enumerate(df_identification.iterrows()): + if ind >= options["d"]: + break plt.gca().annotate((str(int(row['ID']) if isinstance(row['ID'], float) else row['ID']) if 'ID' in row else '') + f'\nMag={row["magV"]:.1f}', (row['px'], row['py']), color='r') plt.savefig(output_dir / ('CentroidsStackGood'+starttime+'.png'), bbox_inches="tight", dpi=600) if options['flag_display']: