Merge pull request #14 from mwcraig/more-photometry-cleanup

More photometry cleanup
feder-observatory · Aug 17, 2020 · 00063cc · 00063cc
2 parents 056dd77 + cd09be9
commit 00063cc
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/stellarphot/differential_photometry/aij_rel_fluxes.py b/stellarphot/differential_photometry/aij_rel_fluxes.py
@@ -100,6 +100,11 @@ def calc_aij_relative_flux(star_data, comp_stars,
 
     star_data['relative_flux'] = relative_flux
     star_data['relative_flux_error'] = rel_flux_error
-    star_data['comparison counts'] = comp_total_vector + flux_offset
+    star_data['relative_flux_snr'] = relative_flux / rel_flux_error
+
+    # AIJ records the total comparison counts even though that total is used
+    # only for the targets, not the comparison.
+    star_data['comparison counts'] = comp_total_vector # + flux_offset
+    star_data['comparison error'] = comp_error_vector
 
     return star_data
diff --git a/stellarphot/io/aij.py b/stellarphot/io/aij.py
@@ -168,7 +168,7 @@ def generate_aij_table(table_name, comparison_table):
     info_columns = {
         'date-obs': 'DATE_OBS',
         'airmass': 'AIRMASS',
-        # 'BJD': 'BJD_MOBS',
+        'BJD': 'BJD_MOBS',
         'exposure': 'EXPOSURE',
         'filter': 'FILTER',
         'aperture': 'Source_Radius',
@@ -187,9 +187,11 @@ def generate_aij_table(table_name, comparison_table):
         'fwhm_x': 'X-Width',
         'fwhm_y': 'Y-Width',
         'width': 'Width',
-        #'relative flux': 'rel_flux',
-        #'flux error': 'rel_flux_err',
-        #'comparison counts': 'tot_C_cnts',
+        'relative_flux': 'rel_flux',
+        'relative_flux_error': 'rel_flux_err',
+        'rel_flux_SNR': 'rel_flux_SNR',
+        'comparison counts': 'tot_C_cnts',
+        'tot_C_err': 'tot_C_err'
     }
     by_star = table_name.group_by('star_id')
     base_table = by_star.groups[0][list(info_columns.keys())]
@@ -208,6 +210,8 @@ def generate_aij_table(table_name, comparison_table):
             new_column_name = new_col + f'_{char}{star_id[0]}'
             new_table.rename_column(old_col, new_column_name)
         base_table = hstack([base_table, new_table])
+    for old_col, new_col in info_columns.items():
+        base_table.rename_column(old_col, new_col)
 
     return base_table
 

diff --git a/stellarphot/photometry.py b/stellarphot/photometry.py
@@ -308,9 +308,15 @@ def add_to_photometry_table(phot, ccd, annulus, apertures, fname='',
     # Add width x/y:
     # Make small table with renamed columns
     fwhm_x, fwhm_y = compute_fwhm(ccd, phot)
+    # Set bad values to NaN now
+    bad_fwhm = (fwhm_x < 0) | (fwhm_y < 0)
+    fwhm_x[bad_fwhm] = np.nan
+    fwhm_y[bad_fwhm] = np.nan
+
     phot['fwhm_x'] = fwhm_x
     phot['fwhm_y'] = fwhm_y
     phot['width'] = (fwhm_x + fwhm_y) / 2
+
     phot['sky_per_pix_avg'] = avg_sky_per_pix
     phot['sky_per_pix_med'] = med_sky_per_pix
     phot['sky_per_pix_std'] = std_sky_per_pix
@@ -328,6 +334,13 @@ def add_to_photometry_table(phot, ccd, annulus, apertures, fname='',
                                  (phot['aperture_area'] *
                                   phot['sky_per_pix_avg']))
 
+    # This can happen, for example, when the object is faint
+    # and centroiding is bad.
+    bad_flux = phot['aperture_net_flux'] < 0
+    all_bads = bad_flux | bad_fwhm
+
+    phot['aperture_net_flux'][all_bads] = np.nan
+
     if camera is not None:
         phot['mag_inst_{}'.format(ccd.header['filter'])] = \
             (-2.5 * np.log10(camera.gain * phot['aperture_net_flux'].value /