|
From: Gordon K. <kin...@us...> - 2004-04-22 08:10:51
|
Update of /cvsroot/teem/teem/src/ten In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12978 Modified Files: aniso.c tendPoint.c Log Message: better error message for failure in tendAnisoVolume Index: tendPoint.c =================================================================== RCS file: /cvsroot/teem/teem/src/ten/tendPoint.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tendPoint.c 30 Mar 2004 03:32:30 -0000 1.9 --- tendPoint.c 22 Apr 2004 07:46:52 -0000 1.10 *************** *** 33,37 **** airArray *mop; ! int loc[3], sx, sy, sz, i; Nrrd *nin; float *tdata, eval[3], evec[9], c[TEN_ANISO_MAX+1], --- 33,37 ---- airArray *mop; ! int loc[3], idx, sx, sy, sz, i; Nrrd *nin; float *tdata, eval[3], evec[9], c[TEN_ANISO_MAX+1], *************** *** 67,72 **** } ! tdata = (float*)(nin->data) + 7*(loc[0] + sx*(loc[1] + sy*loc[2])); ! fprintf(stderr, "location = (%d,%d,%d)\n", loc[0], loc[1], loc[2]); fprintf(stderr, "confidence = %g\n", tdata[0]); fprintf(stderr, "tensor =\n"); --- 67,73 ---- } ! idx = loc[0] + sx*(loc[1] + sy*loc[2]); ! tdata = (float*)(nin->data) + 7*idx; ! fprintf(stderr, "location = (%d,%d,%d) = %d\n", loc[0], loc[1], loc[2], idx); fprintf(stderr, "confidence = %g\n", tdata[0]); fprintf(stderr, "tensor =\n"); Index: aniso.c =================================================================== RCS file: /cvsroot/teem/teem/src/ten/aniso.c,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** aniso.c 22 Apr 2004 07:13:01 -0000 1.30 --- aniso.c 22 Apr 2004 07:46:52 -0000 1.31 *************** *** 172,178 **** tenAnisoVolume(Nrrd *nout, Nrrd *nin, int aniso, float thresh) { char me[]="tenAnisoVolume", err[AIR_STRLEN_MED]; ! size_t N, I; float *out, *in, *tensor, eval[3], evec[9], c[TEN_ANISO_MAX+1]; ! int sx, sy, sz, map[NRRD_DIM_MAX]; if (tenTensorCheck(nin, nrrdTypeFloat, AIR_TRUE, AIR_TRUE)) { --- 172,178 ---- tenAnisoVolume(Nrrd *nout, Nrrd *nin, int aniso, float thresh) { char me[]="tenAnisoVolume", err[AIR_STRLEN_MED]; ! size_t N, I, _I; float *out, *in, *tensor, eval[3], evec[9], c[TEN_ANISO_MAX+1]; ! int sx, sy, sz, size[3], coord[3], map[NRRD_DIM_MAX]; if (tenTensorCheck(nin, nrrdTypeFloat, AIR_TRUE, AIR_TRUE)) { *************** *** 186,192 **** thresh = AIR_CLAMP(0.0, thresh, 1.0); ! sx = nin->axis[1].size; ! sy = nin->axis[2].size; ! sz = nin->axis[3].size; N = sx*sy*sz; if (nrrdMaybeAlloc(nout, nrrdTypeFloat, 3, sx, sy, sz)) { --- 186,192 ---- thresh = AIR_CLAMP(0.0, thresh, 1.0); ! size[0] = sx = nin->axis[1].size; ! size[1] = sy = nin->axis[2].size; ! size[2] = sz = nin->axis[3].size; N = sx*sy*sz; if (nrrdMaybeAlloc(nout, nrrdTypeFloat, 3, sx, sy, sz)) { *************** *** 205,210 **** tenEigensolve(eval, evec, tensor); if (!(AIR_EXISTS(eval[0]) && AIR_EXISTS(eval[1]) && AIR_EXISTS(eval[2]))) { ! sprintf(err, "%s: not all eigenvalues exist (%g,%g,%g) at sample %d", ! me, eval[0], eval[1], eval[2], (int)I); biffAdd(TEN, err); return 1; } --- 205,214 ---- tenEigensolve(eval, evec, tensor); if (!(AIR_EXISTS(eval[0]) && AIR_EXISTS(eval[1]) && AIR_EXISTS(eval[2]))) { ! _I = I; ! NRRD_COORD_GEN(coord, size, 3, _I); ! sprintf(err, "%s: not all eigenvalues exist (%g,%g,%g) at sample " ! "%d = (%d,%d,%d)", ! me, eval[0], eval[1], eval[2], (int)I, ! coord[0], coord[1], coord[2]); biffAdd(TEN, err); return 1; } |