Commit 5642be87 authored by Lauren Adoram-Kershner's avatar Lauren Adoram-Kershner
Browse files

add ability to pass custom cost function to cluster_subpixel_register

parent 509cf19d

autocnet/matcher/subpixel.py

+6 −5
Original line number Diff line number Diff line
@@ -341,8 +341,8 @@ def iterative_phase(sx, sy, dx, dy, s_img, d_img, size=251, reduction=11, conver 
        if s_template.shape != d_search.shape:

            s_size = s_template.shape

            d_size = d_search.shape

            updated_size_x = int(min(s_size[1] + d_size[1]))  # Why is this /2?

            updated_size_y = int(min(s_size[0] + d_size[0]))

            updated_size_x = int(min(s_size[1], d_size[1]))  # Why is this /2?

            updated_size_y = int(min(s_size[0], d_size[0]))

            # Since the image is smaller than the requested size, set the size to

            # the current maximum image size and reduce from there on potential

            # future iterations.
@@ -463,7 +463,7 @@ def subpixel_register_point(pointid, iterative_phase_kwargs={}, subpixel_templat 


def subpixel_register_points(iterative_phase_kwargs={'size': 251},

                             subpixel_template_kwargs={'image_size':(251,251)},

                             cost_func=lambda x,y: 1/x**2 * y,

                             cost_kwargs={},

                             threshold=0.005):

    """

    Serial subpixel registration of all of the points in a given DB table.
@@ -496,11 +496,11 @@ def subpixel_register_points(iterative_phase_kwargs={'size': 251}, 
        subpixel_register_point(pointid,

                                iterative_phase_kwargs=iterative_phase_kwargs,

                                subpixel_template_kwargs=subpixel_template_kwargs,

                                cost_func=cost_func)

                                **cost_kwargs)



def cluster_subpixel_register_points(iterative_phase_kwargs={'size': 251},

                                     subpixel_template_kwargs={'image_size':(251,251)},

                                     cost_func=lambda x,y: 1/x**2 * y,

                                     cost_kwargs={},

                                     threshold=0.005,

                                     filters={},

                                     walltime='00:10:00',
@@ -555,6 +555,7 @@ def cluster_subpixel_register_points(iterative_phase_kwargs={'size': 251}, 
               'iterative_phase_kwargs' : iterative_phase_kwargs,

               'subpixel_template_kwargs' : subpixel_template_kwargs,

               'threshold':threshold,

               'cost_kwargs': cost_kwargs,

               'walltime' : walltime}

        rqueue.rpush(queuename, json.dumps(msg, cls=JsonEncoder))

    session.close()

bin/acn_subpixel

+2 −1
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ def main(msg, config): 
    subpixel_register_point(pointid,

                            iterative_phase_kwargs=msg['iterative_phase_kwargs'],

                            subpixel_template_kwargs=msg['subpixel_template_kwargs'],

                            threshold=msg['threshold'])

                            threshold=msg['threshold'],

                            **msg['cost_kwargs'])

    print('Subpixel registration complete.')



if __name__ == '__main__':