exovetter 0.0.7__py3-none-any.whl → 0.0.8__py3-none-any.whl

exovetter/centroid/centroid.py

@@ -14,6 +14,7 @@ def compute_diff_image_centroids(
         duration_days,
         remove_transits, 
         max_oot_shift_pix=1.5,
+        starloc_pix = None,
         plot=False
 ):
     """Compute difference image centroid shifts for every transit in a dataset.
@@ -42,6 +43,9 @@ def compute_diff_image_centroids(
         (float) Duration of transit. 
     remove_transits
         (list) List of 0 indexed transit integers to not calculate on.
+    starloc_pix
+        (2d array) catalog location of target star for plotting.
+        Default is None.
     max_oot_shift_pix
         (float) Passed to `fastpsffit.fastGaussianPrfFit()
 
@@ -74,29 +78,30 @@ def compute_diff_image_centroids(
     transits = getIngressEgressCadences(
         time, period_days, epoch, duration_days)
 
-    figs = []
+    axs = []
     centroids = []
 
     for i in range(len(transits)):
         if i not in remove_transits:
             cin = transits[i]
-            cents, fig = measure_centroids(
+            cents, ax = measure_centroids(
                 cube, 
                 cin, 
                 max_oot_shift_pix=max_oot_shift_pix,
+                starloc_pix = starloc_pix,
                 plot=plot
             )
 
             if plot == True:
-                fig.suptitle('Transit '+str(i))
+                plt.gcf().suptitle('Transit '+str(i))
 
             centroids.append(cents)
-            figs.append(fig)
+            axs.append(ax)
             
     centroids = np.array(centroids)
     all_transits = list(np.arange(len(transits)))
     kept_transits = [x for x in all_transits if x not in remove_transits]
-    return centroids, figs, kept_transits
+    return centroids, axs, kept_transits
 
 
 def measure_centroid_shift(centroids, kept_transits, plot=False):
@@ -140,6 +145,51 @@ def measure_centroid_shift(centroids, kept_transits, plot=False):
         fig = covar.diagnostic_plot(dcol, drow, kept_transits, flags)
     return offset_pix, signif, fig
 
+def measure_centroid_shift_cat(centroids, kept_transits, starloc_pix, plot=False):
+    """Measure the average offset of the DIC centroids from the catalog position.
+
+    Inputs
+    ----------
+    centroids
+        (2d np array) Output of :func:`compute_diff_image_centroids`
+
+    kept_transits
+        (list) List of 0 indexed transit integers to calculate on.
+    
+    starloc_pix
+        (2d np array) col,row expected location of target star
+
+    Returns
+    -----------
+    offset
+        (float) Size of offset in pixels (or whatever unit `centroids`
+        is in)
+    signif
+        (float) The statistical significance of the transit. Values
+        close to 1 mean the transit is likely on the target star.
+        Values less than ~1e-3 suggest the target is not the
+        source of the transit.
+    fig
+        A figure handle. Is **None** if plot is **False**
+    """
+
+    # DIC - catalog
+    # dcol = centroids[:, 5] - centroids[:, 0]
+    # drow = centroids[:, 4] - centroids[:, 1]
+    dcol = centroids[:, 4] - starloc_pix[0]
+    drow = centroids[:, 5] - starloc_pix[1]
+
+    flags = centroids[:, -1].astype(bool)
+
+    offset_pix, signif = covar.compute_offset_and_signif(
+        dcol[~flags], drow[~flags])
+
+    fig = None
+    if plot:
+        fig = covar.diagnostic_plot(dcol, drow, kept_transits, flags)
+        
+    return offset_pix, signif, fig
+
 
 def getIngressEgressCadences(time, period_days, epoch_btjd, duration_days):
     assert np.all(np.isfinite(time))
@@ -151,7 +201,7 @@ def getIngressEgressCadences(time, period_days, epoch_btjd, duration_days):
     return transits
 
 
-def measure_centroids(cube, cin, max_oot_shift_pix=0.5, plot=False):
+def measure_centroids(cube, cin, max_oot_shift_pix=0.5, starloc_pix = None, plot=False):
     """Private function of :func:`compute_diff_image_centroids`
 
     Computes OOT, ITR and diff images for a single transit event,
@@ -209,17 +259,31 @@ def measure_centroids(cube, cin, max_oot_shift_pix=0.5, plot=False):
         if diffSoln.success:
             clr = "green"
 
+        fig = plt.gcf()
+        axlist = fig.axes 
+        #assert len(axlist) == 3, axlist
+
         res = diffSoln.x
-        disp.plotCentroidLocation(res[0], res[1], marker="^", color=clr,
-                                  label="diff")
+        for ax in axlist:
+            if ax.get_label() == '<colorbar>':
+                continue
+
+            plt.sca(ax)
+            disp.plotCentroidLocation(res[0], res[1], marker="^", color=clr,
+                                    label="diff")
 
-        res = ootSoln.x
-        disp.plotCentroidLocation(res[0], res[1], marker="o", color=clr,
-                                  label="OOT")
+            res1 = ootSoln.x
+            disp.plotCentroidLocation(res1[0], res1[1], marker="o", color=clr,
+                                    label="OOT")
 
-        res = intransSoln.x
-        disp.plotCentroidLocation(res[0], res[1], marker="+", color=clr,
-                                  label="InT")
+            res2 = intransSoln.x
+            disp.plotCentroidLocation(res2[0], res2[1], marker="+", color=clr,
+                                    label="InT")
+            
+            if starloc_pix is not None:
+                disp.plotCentroidLocation(starloc_pix[0], starloc_pix[1], marker="*",
+                                        color='red', label="Cat", ms=10)
+            
         plt.legend(fontsize=12, framealpha=0.7, facecolor='silver')
 
     out = []
@@ -236,7 +300,7 @@ def measure_centroids(cube, cin, max_oot_shift_pix=0.5, plot=False):
     return out, ax
 
 
-def generateDiffImg(cube, transits, plot=False):
+def generateDiffImg(cube, transits, starloc_pix = None, plot=False):
     """Generate a difference image.
 
     Also generates an image for each the $n$ cadedences before
@@ -249,6 +313,8 @@ def generateDiffImg(cube, transits, plot=False):
         (np 3 array) Datacube of postage stamps
     transits
         (2-tuples) Indices of the first and last cadence
+    starloc_pix
+        (np 2 element array) col, row position of star
 
     Optional Inputs
     -----------------
@@ -286,6 +352,7 @@ def generateDiffImg(cube, transits, plot=False):
         fig = plt.figure()
         fig.set_size_inches(16, 4)
         disp.plotTransit(fig, oot, during, diff)
+
     else:
         fig = None
 

exovetter/centroid/disp.py

@@ -8,15 +8,15 @@ import numpy as np
 
 def plotTransit(fig, oot, during, diff, **kwargs):
 
-    fig.add_subplot(131)
+    ax1 = fig.add_subplot(131)
     plotImage(oot, **kwargs)
     plt.title("OOT")
 
-    fig.add_subplot(132)
+    ax2 = fig.add_subplot(132)
     plotImage(during, **kwargs)
     plt.title("In-transit")
 
-    fig.add_subplot(133)
+    ax3 = fig.add_subplot(133)
     plotDiffImage(diff, **kwargs)
     plt.title("Difference")
 

exovetter/version.py

@@ -5,4 +5,4 @@ try:
     from setuptools_scm import get_version
     version = get_version(root='..', relative_to=__file__)
 except Exception:
-    version = '0.0.7'
+    version = '0.0.8'

exovetter/vetters.py

@@ -585,7 +585,7 @@ class Sweet(BaseVetter):
 class Centroid(BaseVetter):
     """Class to handle centroid vetting"""
 
-    def __init__(self, lc_name="flux", diff_plots=False, centroid_plots=False):
+    def __init__(self, lc_name="flux", diff_plots=False, centroid_plots=False, starloc_pix=None):
         """
         Parameters
         ----------
@@ -616,6 +616,7 @@ class Centroid(BaseVetter):
         self.metrics = None
         self.diff_plots = diff_plots
         self.centroid_plots = centroid_plots
+        self.starloc_pix = starloc_pix
 
     def run(self, tce, lk_tpf, plot=False, remove_transits=None):
         """Runs cent.compute_diff_image_centroids and cent.measure_centroid_shift
@@ -665,12 +666,16 @@ class Centroid(BaseVetter):
 
         if remove_transits is None: # reformat to be a blank list
             remove_transits = []
-        
+    
         centroids, figs, kept_transits = cent.compute_diff_image_centroids(
             time, cube, period_days, epoch, duration_days, 
-            remove_transits, plot=self.diff_plots)
+            remove_transits, starloc_pix=self.starloc_pix, plot=self.diff_plots)
         
-        offset, signif, fig = cent.measure_centroid_shift(centroids, kept_transits, self.centroid_plots)
+        if (self.starloc_pix is not None) and (len(self.starloc_pix) == 2):
+            offset, signif, fig = cent.measure_centroid_shift_cat(centroids, kept_transits, self.starloc_pix, self.centroid_plots)
+        else:
+            offset, signif, fig = cent.measure_centroid_shift(centroids, kept_transits, self.centroid_plots)
+
         figs.append(fig)
 
         # TODO: If plot=True, figs is a list of figure handles.

{exovetter-0.0.7.dist-info → exovetter-0.0.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: exovetter
-Version: 0.0.7
+Version: 0.0.8
 Summary: Exoplanet vetting package
 Home-page: https://github.com/spacetelescope/exovetter
 Author: Susan Mullally et al.

{exovetter-0.0.7.dist-info → exovetter-0.0.8.dist-info}/RECORD

@@ -10,19 +10,19 @@ exovetter/tce.py,sha256=5JFKkbKoKCtdhm5EuW6FMAvp0LiaHLuqpFUbY0joyLI,7302
 exovetter/transit_coverage.py,sha256=Wix6TaQmEgRxlEZKB6WF3OFQVXqtJN1tBkltFaMDrHM,2194
 exovetter/trapezoid_fit.py,sha256=Dok-H0zRsfigh4zfVO4R6Wi2TgK6hQXh4EIIYGouxiQ,31097
 exovetter/utils.py,sha256=1K34N6sQ7iomf4oFHyqGubcDhNwTa2lF_uKEOGJGrCk,24909
-exovetter/version.py,sha256=Es0ObF1J9qSSraJcBVdj4CHe2laI8JXK6MYDVl2LypM,337
-exovetter/vetters.py,sha256=ONNZM3qhVRd_s6By-wR7VBuas8tyo_TwtrpiS2x4_XE,37423
+exovetter/version.py,sha256=CNeb6A0ENE0jLt2wd0GA-qc99gr3KYBjtMQVwKtJGN0,337
+exovetter/vetters.py,sha256=muqjSzFRs5gCrOV1OAjnTd2y7y_dU9hWJfKpqUK_9RY,37732
 exovetter/viz_transits.py,sha256=FUc8DEedaQQ8YDoeVvR1QyGPmh2oPGmVg27W3WrVguQ,5648
 exovetter/centroid/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-exovetter/centroid/centroid.py,sha256=LWqjn-Oerdw5j2wDCFYqB6omE4K9gckIwAA0-WZvgkY,8655
+exovetter/centroid/centroid.py,sha256=tNT1ZEQqN1t1Sijn9hJYjGQYCnguVE9iJp2MlL-vWN8,10785
 exovetter/centroid/covar.py,sha256=suSgPjOVVEOclIi7rnhqc7wBbcSVsPOrdad91NXjX3Y,8973
-exovetter/centroid/disp.py,sha256=scVCRj16mNSqugHY28_uLt5bOkcdumIlJeFG3BXfldU,3674
+exovetter/centroid/disp.py,sha256=Y7UeecpHuhzEyNb6F6_FoureXdIttongS_L4jbdNYgE,3692
 exovetter/centroid/fastpsffit.py,sha256=eRMxYUJ_4hsCxso4u1d1zQvFSJQlJ_gRzhNa2PXkKuE,4532
 exovetter/modshift/__init__.py,sha256=j5665q0RHVzbzdPBXv_jUozGB4sex8ANXtzB41EYzRQ,68
 exovetter/modshift/modshift.py,sha256=VEnj7ITvYRfqICyRiNeCZ9tqQ4d4fPOw8avB6TTbhIU,14773
 exovetter/modshift/plotmodshift.py,sha256=MMLkvxkOqBGIYGPN97_WtrHgTZsDzY_XRRNswhz5YQI,2452
-exovetter-0.0.7.dist-info/LICENSE.rst,sha256=uhiFz7eEG8WszLtRtYIT89FNMI3ijy1aACnvl5BOz2Y,1492
-exovetter-0.0.7.dist-info/METADATA,sha256=nXJOHqH5ayjdJ7idVePETqwxsiD8RKpI0JQBUoZ0Epc,3706
-exovetter-0.0.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-exovetter-0.0.7.dist-info/top_level.txt,sha256=wh0_U5IPEspONX8zhGRaFUqfuovCGkgYjAmWuQe0w6Q,10
-exovetter-0.0.7.dist-info/RECORD,,
+exovetter-0.0.8.dist-info/LICENSE.rst,sha256=uhiFz7eEG8WszLtRtYIT89FNMI3ijy1aACnvl5BOz2Y,1492
+exovetter-0.0.8.dist-info/METADATA,sha256=rz9jh06oK8QeTWjgvsHYteiZRucjVbEsGnnQ7AUds7s,3706
+exovetter-0.0.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+exovetter-0.0.8.dist-info/top_level.txt,sha256=wh0_U5IPEspONX8zhGRaFUqfuovCGkgYjAmWuQe0w6Q,10
+exovetter-0.0.8.dist-info/RECORD,,