Commit 890f27c7 authored by Gustavo Pinzon's avatar Gustavo Pinzon
Browse files

Bug in progressBar of getDisplacementFromNeighbours() and type in ddic

parent 507be1d0
Pipeline #53116 passed with stages
in 13 minutes and 32 seconds
...@@ -238,7 +238,7 @@ if mpiRank == boss or not mpi: ...@@ -238,7 +238,7 @@ if mpiRank == boss or not mpi:
deltaPhiNorm = prevCorr["deltaPhiNorm"] deltaPhiNorm = prevCorr["deltaPhiNorm"]
labelDilateList = prevCorr["LabelDilate"] labelDilateList = prevCorr["LabelDilate"]
error = prevCorr["error"] error = prevCorr["error"]
PSCC = pevCorr["PSCC"] PSCC = prevCorr["PSCC"]
else: else:
# Check if the correction of the input field is asked # Check if the correction of the input field is asked
if args.CF: if args.CF:
......
...@@ -1147,6 +1147,9 @@ def getDisplacementFromNeighbours(labIm, DVC, fileName, method = 'getLabel', cen ...@@ -1147,6 +1147,9 @@ def getDisplacementFromNeighbours(labIm, DVC, fileName, method = 'getLabel', cen
PhiField[wrongLab] = previousDVC['PhiField'][wrongLab] PhiField[wrongLab] = previousDVC['PhiField'][wrongLab]
# Add the incremental displacement # Add the incremental displacement
PhiField[wrongLab][:-1,-1] += Phi[:-1,-1] PhiField[wrongLab][:-1,-1] += Phi[:-1,-1]
# Update the progressbar
widgets[0] = progressbar.FormatLabel("{}/{} ".format(i, numberOfLabels))
pbar.update(i)
# Save # Save
outMatrix = numpy.array([numpy.array(range(numberOfLabels)), outMatrix = numpy.array([numpy.array(range(numberOfLabels)),
centresOfMass[:, 0], centresOfMass[:, 1], centresOfMass[:, 2], centresOfMass[:, 0], centresOfMass[:, 1], centresOfMass[:, 2],
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment