Unverified Commit 3217c38b authored by Lauren Adoram-Kershner's avatar Lauren Adoram-Kershner Committed by GitHub
Browse files

minor bug fixes and weight value changes with Jays PR (#434) 



Co-authored-by: default avatarLauren Adoram-Kershner <ladoramkershner@astrovm4.wr.usgs.gov>
parent 76a91a76

autocnet/io/db/model.py

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ class Measures(BaseMixin, Base): 
    apriorisample = Column(Float)

    samplesigma = Column(Float)

    linesigma = Column(Float)

    weight = Column(Float, default=1)

    weight = Column(Float, default=None)

    rms = Column(Float)



    @hybrid_property

autocnet/matcher/subpixel.py

+11 −9
Original line number Diff line number Diff line
@@ -424,6 +424,8 @@ def subpixel_register_measure(measureid, iterative_phase_kwargs={}, subpixel_tem 
    # Get the point id and set up the reference measure

    pointid = destination.pointid

    source = session.query(Measures).filter(Measures.pointid==pointid).order_by(Measures.id).first()

    source.weight = 1



    sourceid = source.imageid

    res = session.query(Images).filter(Images.id == sourceid).one()

    source_node = NetworkNode(node_id=sourceid, image_path=res.path)
@@ -458,9 +460,9 @@ def subpixel_register_measure(measureid, iterative_phase_kwargs={}, subpixel_tem 
        return



    # Update the measure

    if new_template_x:

        destination.sample = new_template_x

        destination.line = new_template_y

    if new_phase_x:

        destination.sample = new_phase_x

        destination.line = new_phase_y

        destination.weight = cost



    # In case this is a second run, set the ignore to False if this
@@ -667,7 +669,7 @@ def cluster_subpixel_register_points(iterative_phase_kwargs={'size': 251}, 
                 time=walltime,

                 partition=config['cluster']['queue'],

                 output=config['cluster']['cluster_log_dir']+f'/autocnet.subpixel_register-%j')

    submitter.submit(array='1-{}'.format(job_counter), chunksize=chunksize, exclude=exclude)

    submitter.submit(array='1-{}%24'.format(job_counter), chunksize=chunksize, exclude=exclude)

    return job_counter



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

autocnet/spatial/overlap.py

+2 −2
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ def cluster_place_points_in_overlaps(size_threshold=0.0007, 
                 partition=config['cluster']['queue'],

                 output=config['cluster']['cluster_log_dir']+'/autocnet.place_points-%j')

    job_counter = i+1

    submitter.submit(array='1-{}'.format(job_counter), chunksize=chunksize, exclude=exclude)

    submitter.submit(array='1-{}%24'.format(job_counter), chunksize=chunksize, exclude=exclude)

    return job_counter



def place_points_in_overlap(nodes, geom, cam_type="csm",