[skip-ci] return status -5 in case of failed volume threshold in...

[skip-ci] return status -5 in case of failed volume threshold in getImagettesLabelled, VTK nans replaced with 0.0 in spam-ddic

scripts/spam-ddic

@@ -311,8 +311,15 @@ numpy.savetxt(args.OUT_DIR + "/" + args.PREFIX + "-ddic.tsv",
                 "Fxz\tFxy\tFxx\t" +
                 "PSCC\terror\titerations\treturnStatus\tdeltaPhiNorm\tLabelDilate")
 
-VTKglyphDict = {'displacements': PhiField[:, 0:3, -1],
-                'mag(displacements)': magDisp,
+# Prepare VTK outputs with no nans
+dispField = PhiField[:, 0:3, -1]
+dispFieldNoNans = dispField.copy()
+dispFieldNoNans[numpy.isnan(dispFieldNoNans)] = 0.0
+magDispNoNans = magDisp.copy()
+magDispNoNans[numpy.isnan(magDispNoNans)] = 0.0
+
+VTKglyphDict = {'displacements': dispFieldNoNans,
+                'mag(displacements)': magDispNoNans,
                 'returnStatus': returnStatus}
 
 # if regsub add a line to VTK output and also save separate TSV file

tools/label/label.py

@@ -740,6 +740,9 @@ def getImagettesLabelled(lab1, label, Phi, im1, im2, searchRange, boundingBoxes,
             # If all of imagette2 is nans it fell outside im2 (or in any case it's going to be difficult to correlate)
             if numpy.all(numpy.isnan(imagette2)):
                 returnStatus = -5
+        else:
+            # Failed volume condition
+            returnStatus = -5
 
     return {'imagette1':            imagette1,
             'imagette1mask':        imagette1mask,