Menu
▾
▴
[Teem-commit] teem/src/ten enumsTen.c, 1.46, 1.47 ten.h, 1.158, 1.159 tenGage.c, 1.54, 1.55
|
From: Gordon K. <kin...@us...> - 2006-10-26 00:27:17
|
Update of /cvsroot/teem/teem/src/ten In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11795 Modified Files: enumsTen.c ten.h tenGage.c Log Message: more tenGage items Index: enumsTen.c =================================================================== RCS file: /cvsroot/teem/teem/src/ten/enumsTen.c,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** enumsTen.c 18 Mar 2006 07:56:24 -0000 1.46 --- enumsTen.c 26 Oct 2006 00:27:12 -0000 1.47 *************** *** 201,204 **** --- 201,211 ---- "omega hessian evec 2", + "trace gradvec dot evec0", + "trace normal dot evec0", + "FA gradvec dot evec0", + "FA normal dot evec0", + "omega gradvec dot evec0", + "omega normal dot evec0", + "anisotropies" }; *************** *** 310,313 **** --- 317,326 ---- "omega hessian evec 1", "omega hessian evec 2", + "trace gradvec dot evec0", + "trace normal dot evec0", + "FA gradvec dot evec0", + "FA normal dot evec0", + "omega gradvec dot evec0", + "omega normal dot evec0", "anisotropies" }; *************** *** 419,422 **** --- 432,441 ---- tenGageOmegaHessianEvec1, tenGageOmegaHessianEvec2, + tenGageTraceGradVecDotEvec0, + tenGageTraceNormalDotEvec0, + tenGageFAGradVecDotEvec0, + tenGageFANormalDotEvec0, + tenGageOmegaGradVecDotEvec0, + tenGageOmegaNormalDotEvec0, tenGageAniso }; *************** *** 527,530 **** --- 546,555 ---- "omhessevec1", "omhessevec2", + "trgvdotevec0", + "trndotevec0", + "fagvdotevec0", + "fandotevec0", + "omgvdotevec0", + "omndotevec0", "an", "aniso", "anisotropies", "" *************** *** 636,639 **** --- 661,670 ---- tenGageOmegaHessianEvec1, tenGageOmegaHessianEvec2, + tenGageTraceGradVecDotEvec0, + tenGageTraceNormalDotEvec0, + tenGageFAGradVecDotEvec0, + tenGageFANormalDotEvec0, + tenGageOmegaGradVecDotEvec0, + tenGageOmegaNormalDotEvec0, tenGageAniso, tenGageAniso, tenGageAniso }; Index: tenGage.c =================================================================== RCS file: /cvsroot/teem/teem/src/ten/tenGage.c,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** tenGage.c 18 Mar 2006 07:56:24 -0000 1.54 --- tenGage.c 26 Oct 2006 00:27:12 -0000 1.55 *************** *** 145,159 **** {tenGageOmegaHessian, 9, 2, {tenGageFA, tenGageMode, tenGageFAGradVec, tenGageModeGradVec, ! tenGageFAHessian, tenGageModeHessian}, -1, -1, 0}, ! {tenGageOmegaHessianEval, 3, 2, {tenGageOmegaHessian, -1, -1, -1, -1, -1}, -1, -1, 0}, ! {tenGageOmegaHessianEval0, 1, 2, {tenGageOmegaHessianEval, -1, -1, -1, -1, -1}, tenGageOmegaHessianEval, 0, 0}, ! {tenGageOmegaHessianEval1, 1, 2, {tenGageOmegaHessianEval, -1, -1, -1, -1, -1}, tenGageOmegaHessianEval, 1, 0}, ! {tenGageOmegaHessianEval2, 1, 2, {tenGageOmegaHessianEval, -1, -1, -1, -1, -1}, tenGageOmegaHessianEval, 2, 0}, ! {tenGageOmegaHessianEvec, 9, 2, {tenGageOmegaHessian, -1, -1, -1, -1, -1}, -1, -1, 0}, ! {tenGageOmegaHessianEvec0, 3, 2, {tenGageOmegaHessianEvec, -1, -1, -1, -1, -1}, tenGageOmegaHessianEvec, 0, 0}, ! {tenGageOmegaHessianEvec1, 3, 2, {tenGageOmegaHessianEvec, -1, -1, -1, -1, -1}, tenGageOmegaHessianEvec, 3, 0}, ! {tenGageOmegaHessianEvec2, 3, 2, {tenGageOmegaHessianEvec, -1, -1, -1, -1, -1}, tenGageOmegaHessianEvec, 6, 0}, ! {tenGageAniso, TEN_ANISO_MAX+1, 0, {tenGageEval0, tenGageEval1, tenGageEval2, -1, -1, -1}, -1, -1, 0} }; --- 145,166 ---- {tenGageOmegaHessian, 9, 2, {tenGageFA, tenGageMode, tenGageFAGradVec, tenGageModeGradVec, ! tenGageFAHessian, tenGageModeHessian}, -1, -1, 0}, ! {tenGageOmegaHessianEval, 3, 2, {tenGageOmegaHessian, -1, -1, -1, -1, -1}, -1, -1, 0}, ! {tenGageOmegaHessianEval0, 1, 2, {tenGageOmegaHessianEval, -1, -1, -1, -1, -1}, tenGageOmegaHessianEval, 0, 0}, ! {tenGageOmegaHessianEval1, 1, 2, {tenGageOmegaHessianEval, -1, -1, -1, -1, -1}, tenGageOmegaHessianEval, 1, 0}, ! {tenGageOmegaHessianEval2, 1, 2, {tenGageOmegaHessianEval, -1, -1, -1, -1, -1}, tenGageOmegaHessianEval, 2, 0}, ! {tenGageOmegaHessianEvec, 9, 2, {tenGageOmegaHessian, -1, -1, -1, -1, -1}, -1, -1, 0}, ! {tenGageOmegaHessianEvec0, 3, 2, {tenGageOmegaHessianEvec, -1, -1, -1, -1, -1}, tenGageOmegaHessianEvec, 0, 0}, ! {tenGageOmegaHessianEvec1, 3, 2, {tenGageOmegaHessianEvec, -1, -1, -1, -1, -1}, tenGageOmegaHessianEvec, 3, 0}, ! {tenGageOmegaHessianEvec2, 3, 2, {tenGageOmegaHessianEvec, -1, -1, -1, -1, -1}, tenGageOmegaHessianEvec, 6, 0}, ! {tenGageTraceGradVecDotEvec0,1, 1, {tenGageTraceGradVec, tenGageEvec0, -1, -1, -1, -1}, -1, -1, 0}, ! {tenGageTraceNormalDotEvec0, 1, 1, {tenGageTraceNormal, tenGageEvec0, -1, -1, -1, -1}, -1, -1, 0}, ! {tenGageFAGradVecDotEvec0, 1, 1, {tenGageFAGradVec, tenGageEvec0, -1, -1, -1, -1}, -1, -1, 0}, ! {tenGageFANormalDotEvec0, 1, 1, {tenGageFANormal, tenGageEvec0, -1, -1, -1, -1}, -1, -1, 0}, ! {tenGageOmegaGradVecDotEvec0,1, 1, {tenGageOmegaGradVec, tenGageEvec0, -1, -1, -1, -1}, -1, -1, 0}, ! {tenGageOmegaNormalDotEvec0, 1, 1, {tenGageOmegaNormal, tenGageEvec0, -1, -1, -1, -1}, -1, -1, 0}, ! ! {tenGageAniso, TEN_ANISO_MAX+1, 0, {tenGageEval0, tenGageEval1, tenGageEval2, -1, -1, -1}, -1, -1, 0} }; *************** *** 299,303 **** --- 306,315 ---- if (GAGE_QUERY_ITEM_TEST(pvl->query, tenGageTensor)) { /* done if doV */ + /* HEY: this was prohibiting a Deft-related hack tenAns[0] = AIR_CLAMP(0, tenAns[0], 1); + */ + /* HEY: and this was botching using 1-conf as potential energy for push + tenAns[0] = AIR_MAX(0, tenAns[0]); + */ dtA = tenAns[1]; dtB = tenAns[2]; *************** *** 905,908 **** --- 917,946 ---- } + /* --- evec0 dot products */ + if (GAGE_QUERY_ITEM_TEST(pvl->query, tenGageTraceGradVecDotEvec0)) { + tmp0 = ELL_3V_DOT(evecAns + 0*3, pvl->directAnswer[tenGageTraceGradVec]); + pvl->directAnswer[tenGageTraceGradVecDotEvec0][0] = AIR_ABS(tmp0); + } + if (GAGE_QUERY_ITEM_TEST(pvl->query, tenGageTraceNormalDotEvec0)) { + tmp0 = ELL_3V_DOT(evecAns + 0*3, pvl->directAnswer[tenGageTraceNormal]); + pvl->directAnswer[tenGageTraceNormalDotEvec0][0] = AIR_ABS(tmp0); + } + if (GAGE_QUERY_ITEM_TEST(pvl->query, tenGageFAGradVecDotEvec0)) { + tmp0 = ELL_3V_DOT(evecAns + 0*3, pvl->directAnswer[tenGageFAGradVec]); + pvl->directAnswer[tenGageFAGradVecDotEvec0][0] = AIR_ABS(tmp0); + } + if (GAGE_QUERY_ITEM_TEST(pvl->query, tenGageFANormalDotEvec0)) { + tmp0 = ELL_3V_DOT(evecAns + 0*3, pvl->directAnswer[tenGageFANormal]); + pvl->directAnswer[tenGageFANormalDotEvec0][0] = AIR_ABS(tmp0); + } + if (GAGE_QUERY_ITEM_TEST(pvl->query, tenGageOmegaGradVecDotEvec0)) { + tmp0 = ELL_3V_DOT(evecAns + 0*3, pvl->directAnswer[tenGageOmegaGradVec]); + pvl->directAnswer[tenGageOmegaGradVecDotEvec0][0] = AIR_ABS(tmp0); + } + if (GAGE_QUERY_ITEM_TEST(pvl->query, tenGageOmegaNormalDotEvec0)) { + tmp0 = ELL_3V_DOT(evecAns + 0*3, pvl->directAnswer[tenGageOmegaNormal]); + pvl->directAnswer[tenGageOmegaNormalDotEvec0][0] = AIR_ABS(tmp0); + } + /* --- Aniso --- */ if (GAGE_QUERY_ITEM_TEST(pvl->query, tenGageAniso)) { Index: ten.h =================================================================== RCS file: /cvsroot/teem/teem/src/ten/ten.h,v retrieving revision 1.158 retrieving revision 1.159 diff -C2 -d -r1.158 -r1.159 *** ten.h 1 Sep 2006 06:33:24 -0000 1.158 --- ten.h 26 Oct 2006 00:27:12 -0000 1.159 *************** *** 341,348 **** tenGageOmegaHessianEvec2,/* 102: "omhessevec2": [3] */ ! tenGageAniso, /* 103: "an", all anisos: [TEN_ANISO_MAX+1] */ tenGageLast }; ! #define TEN_GAGE_ITEM_MAX 103 /* --- 341,355 ---- tenGageOmegaHessianEvec2,/* 102: "omhessevec2": [3] */ ! tenGageTraceGradVecDotEvec0, /* 103: "trgvdotevec0": [1] */ ! tenGageTraceNormalDotEvec0, /* 104: "trndotevec0": [1] */ ! tenGageFAGradVecDotEvec0, /* 105: "fagvdotevec0": [1] */ ! tenGageFANormalDotEvec0, /* 106: "fandotevec0": [1] */ ! tenGageOmegaGradVecDotEvec0, /* 107: "omgvdotevec0": [1] */ ! tenGageOmegaNormalDotEvec0, /* 108: "omndotevec0": [1] */ ! ! tenGageAniso, /* 109: "an", all anisos: [TEN_ANISO_MAX+1] */ tenGageLast }; ! #define TEN_GAGE_ITEM_MAX 109 /* |