Vous avez reçu un message "Your GitLab account has been locked ..." ? Pas d'inquiétude : lisez cet article https://docs.gricad-pages.univ-grenoble-alpes.fr/help/unlock/

Commit 5cdc8913 authored by Edward Andò's avatar Edward Andò
Browse files

[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
parent 22c35a60
Pipeline #64227 skipped
......@@ -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
......
......@@ -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,
......
Markdown is supported
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