Bug in progressBar of getDisplacementFromNeighbours() and type in ddic

scripts/spam-ddic

@@ -238,7 +238,7 @@ if mpiRank == boss or not mpi:
                     deltaPhiNorm         = prevCorr["deltaPhiNorm"]
                     labelDilateList      = prevCorr["LabelDilate"]
                     error                = prevCorr["error"]
-                    PSCC                 = pevCorr["PSCC"]
+                    PSCC                 = prevCorr["PSCC"]
             else:
                 # Check if the correction of the input field is asked
                 if args.CF:

tools/deformation/deformationField.py

@@ -1147,6 +1147,9 @@ def getDisplacementFromNeighbours(labIm, DVC, fileName, method = 'getLabel', cen
                     PhiField[wrongLab] = previousDVC['PhiField'][wrongLab]
                     # Add the incremental displacement
                     PhiField[wrongLab][:-1,-1] += Phi[:-1,-1]
+            # Update the progressbar
+            widgets[0] = progressbar.FormatLabel("{}/{} ".format(i, numberOfLabels))
+            pbar.update(i)
         # Save
         outMatrix = numpy.array([numpy.array(range(numberOfLabels)), 
                                 centresOfMass[:, 0], centresOfMass[:, 1], centresOfMass[:, 2],