[Teem-commit] teem/src/ten enumsTen.c,1.21,1.22 ten.h,1.83,1.84 tenGage.c,1.16,1.17

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/teem/teem/src/ten
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8348

Modified Files:
	enumsTen.c ten.h tenGage.c 
Log Message:
changing variable names from ...P... to ...Theta...

Index: enumsTen.c
===================================================================
RCS file: /cvsroot/teem/teem/src/ten/enumsTen.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** enumsTen.c	22 Apr 2004 04:49:27 -0000	1.21
--- enumsTen.c	22 Apr 2004 07:14:54 -0000	1.22
***************
*** 189,193 ****
    tenGageFA,            /* "fa", fractional anisotropy: GT[1] */
    tenGageR,             /* "r", 9*A*B - 2*A^3 - 27*C: GT[1] */
!   tenGageP,             /* "p", arccos(R/sqrt(Q^3)): GT[1] */
    tenGageEval,          /* "eval", all eigenvalues of tensor : GT[3] */
    tenGageEval0,         /* "eval0", major eigenvalue of tensor : GT[1] */
--- 189,193 ----
    tenGageFA,            /* "fa", fractional anisotropy: GT[1] */
    tenGageR,             /* "r", 9*A*B - 2*A^3 - 27*C: GT[1] */
!   tenGageTheta,         /* "th", arccos(R/sqrt(Q^3))/3: GT[1] */
    tenGageEval,          /* "eval", all eigenvalues of tensor : GT[3] */
    tenGageEval0,         /* "eval0", major eigenvalue of tensor : GT[1] */
***************
*** 220,226 ****
    tenGageRGradMag,      /* "rgm", gradient magnitude of Q: GT[1] */
    tenGageRNormal,       /* "rn", normalized gradient of Q: GT[3] */
!   tenGagePGradVec,      /* "pgv", gradient vector of P: GT[3] */
!   tenGagePGradMag,      /* "pgm", gradient magnitude of P: GT[1] */
!   tenGagePNormal,       /* "pn", normalized gradient of P: GT[3] */
    tenGageAniso          /* "an", all anisotropies: GT[TEN_ANISO_MAX+1] */
  };
--- 220,226 ----
    tenGageRGradMag,      /* "rgm", gradient magnitude of Q: GT[1] */
    tenGageRNormal,       /* "rn", normalized gradient of Q: GT[3] */
!   tenGageThetaGradVec,  /* "thgv", gradient vector of P: GT[3] */
!   tenGageThetaGradMag,  /* "thgm", gradient magnitude of P: GT[1] */
!   tenGageThetaNormal,   /* "thn", normalized gradient of P: GT[3] */
    tenGageAniso          /* "an", all anisotropies: GT[TEN_ANISO_MAX+1] */
  };
***************
*** 237,241 ****
    "fa",
    "r",
!   "p",
    "eval",
    "eval0",
--- 237,241 ----
    "fa",
    "r",
!   "th", "theta",
    "eval",
    "eval0",
***************
*** 268,274 ****
    "rgm", "r grad mag",
    "rn", "r normal",
!   "pgv", "p grad vec",
!   "pgm", "p grad mag",
!   "pn", "p normal",
    "an", "aniso", "anisotropies",
    ""
--- 268,274 ----
    "rgm", "r grad mag",
    "rn", "r normal",
!   "thgv", "th grad vec",
!   "thgm", "th grad mag",
!   "thn", "th normal",
    "an", "aniso", "anisotropies",
    ""
***************
*** 286,290 ****
    tenGageFA,
    tenGageR,
!   tenGageP,
    tenGageEval,
    tenGageEval0,
--- 286,290 ----
    tenGageFA,
    tenGageR,
!   tenGageTheta, tenGageTheta,
    tenGageEval,
    tenGageEval0,
***************
*** 317,323 ****
    tenGageRGradMag, tenGageRGradMag,
    tenGageRNormal, tenGageRNormal,
!   tenGagePGradVec, tenGagePGradVec,
!   tenGagePGradMag, tenGagePGradMag,
!   tenGagePNormal, tenGagePNormal,
    tenGageAniso, tenGageAniso, tenGageAniso
  };
--- 317,323 ----
    tenGageRGradMag, tenGageRGradMag,
    tenGageRNormal, tenGageRNormal,
!   tenGageThetaGradVec, tenGageThetaGradVec,
!   tenGageThetaGradMag, tenGageThetaGradMag,
!   tenGageThetaNormal, tenGageThetaNormal,
    tenGageAniso, tenGageAniso, tenGageAniso
  };

Index: tenGage.c
===================================================================
RCS file: /cvsroot/teem/teem/src/ten/tenGage.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** tenGage.c	15 Apr 2004 14:55:07 -0000	1.16
--- tenGage.c	22 Apr 2004 07:14:54 -0000	1.17
***************
*** 35,39 ****
    {tenGageFA,                  1,  0,  {tenGageQ, tenGageS, -1, -1, -1},                                                      -1,  -1},
    {tenGageR,                   1,  0,  {tenGageTrace, tenGageB, tenGageDet, tenGageS, -1},                                    -1,  -1},
!   {tenGageP,                   1,  0,  {tenGageR, tenGageQ, -1, -1, -1},                                                      -1,  -1},
  
    {tenGageEval,                3,  0,  {tenGageTensor, -1, -1, -1, -1},                                                       -1,  -1},
--- 35,39 ----
    {tenGageFA,                  1,  0,  {tenGageQ, tenGageS, -1, -1, -1},                                                      -1,  -1},
    {tenGageR,                   1,  0,  {tenGageTrace, tenGageB, tenGageDet, tenGageS, -1},                                    -1,  -1},
!   {tenGageTheta,               1,  0,  {tenGageR, tenGageQ, -1, -1, -1},                                                      -1,  -1},
  
    {tenGageEval,                3,  0,  {tenGageTensor, -1, -1, -1, -1},                                                       -1,  -1},
***************
*** 76,82 ****
    {tenGageRNormal,             3,  1,  {tenGageRGradVec, tenGageRGradMag, -1, -1, -1},                                        -1,  -1},
  
!   {tenGagePGradVec,            3,  1,  {tenGageRGradVec, tenGageQGradVec, tenGageP, -1, -1},                                  -1,  -1},
!   {tenGagePGradMag,            1,  1,  {tenGagePGradVec, -1, -1, -1, -1},                                                     -1,  -1},
!   {tenGagePNormal,             3,  1,  {tenGagePGradVec, tenGagePGradMag, -1, -1, -1},                                        -1,  -1},
  
    {tenGageAniso, TEN_ANISO_MAX+1,  0,  {tenGageEval0, tenGageEval1, tenGageEval2, -1, -1},                                    -1,  -1}
--- 76,82 ----
    {tenGageRNormal,             3,  1,  {tenGageRGradVec, tenGageRGradMag, -1, -1, -1},                                        -1,  -1},
  
!   {tenGageThetaGradVec,        3,  1,  {tenGageRGradVec, tenGageQGradVec, tenGageTheta, -1, -1},                              -1,  -1},
!   {tenGageThetaGradMag,        1,  1,  {tenGageThetaGradVec, -1, -1, -1, -1},                                                 -1,  -1},
!   {tenGageThetaNormal,         3,  1,  {tenGageThetaGradVec, tenGageThetaGradMag, -1, -1, -1},                                -1,  -1},
  
    {tenGageAniso, TEN_ANISO_MAX+1,  0,  {tenGageEval0, tenGageEval1, tenGageEval2, -1, -1},                                    -1,  -1}
***************
*** 175,181 ****
      }
    }
    if (GAGE_QUERY_ITEM_TEST(pvl->query, tenGageConfidence)) {
-     pvl->directAnswer[tenGageConfidence][0] = tenAns[0];
    }
    if (GAGE_QUERY_ITEM_TEST(pvl->query, tenGageTrace)) {
      cbA = -(pvl->directAnswer[tenGageTrace][0] = dtA + dtD + dtF);
--- 175,182 ----
      }
    }
+   /* done if doV 
    if (GAGE_QUERY_ITEM_TEST(pvl->query, tenGageConfidence)) {
    }
+   */
    if (GAGE_QUERY_ITEM_TEST(pvl->query, tenGageTrace)) {
      cbA = -(pvl->directAnswer[tenGageTrace][0] = dtA + dtD + dtF);
***************
*** 203,211 ****
      cbR = pvl->directAnswer[tenGageR][0] = (5*cbA*cbB - 27*cbC - 2*cbA*cbS)/54;
    }
!   if (GAGE_QUERY_ITEM_TEST(pvl->query, tenGageP)) {
      cbQQQ = cbQ*cbQ*cbQ;
      tmp0 = cbR/(epsilon + sqrt(cbQQQ));
!     tmp0 = AIR_CLAMP(0.0, tmp0, 1.0);
!     pvl->directAnswer[tenGageP][0] = acos(tmp0);
    }
    if (GAGE_QUERY_ITEM_TEST(pvl->query, tenGageEvec)) {
--- 204,212 ----
      cbR = pvl->directAnswer[tenGageR][0] = (5*cbA*cbB - 27*cbC - 2*cbA*cbS)/54;
    }
!   if (GAGE_QUERY_ITEM_TEST(pvl->query, tenGageTheta)) {
      cbQQQ = cbQ*cbQ*cbQ;
      tmp0 = cbR/(epsilon + sqrt(cbQQQ));
!     tmp0 = AIR_CLAMP(-1.0, tmp0, 1.0);
!     pvl->directAnswer[tenGageTheta][0] = acos(tmp0)/3;
    }
    if (GAGE_QUERY_ITEM_TEST(pvl->query, tenGageEvec)) {
***************
*** 356,362 ****
  		 1.0/(epsilon + magTmp), vecTmp);
    }
!   /* --- P --- */
!   if (GAGE_QUERY_ITEM_TEST(pvl->query, tenGagePGradVec)) {
!     vecTmp = pvl->directAnswer[tenGagePGradVec];
      tmp1 = cbQ*cbQ*cbQ;
      tmp1 = sqrt(tmp1)*sqrt(1.0 - cbR*cbR/(epsilon + tmp1));
--- 357,363 ----
  		 1.0/(epsilon + magTmp), vecTmp);
    }
!   /* --- Theta --- */
!   if (GAGE_QUERY_ITEM_TEST(pvl->query, tenGageThetaGradVec)) {
!     vecTmp = pvl->directAnswer[tenGageThetaGradVec];
      tmp1 = cbQ*cbQ*cbQ;
      tmp1 = sqrt(tmp1)*sqrt(1.0 - cbR*cbR/(epsilon + tmp1));
***************
*** 367,375 ****
  		      -tmp1, gradCbR);
    }
!   if (GAGE_QUERY_ITEM_TEST(pvl->query, tenGagePGradMag)) {
!     magTmp = pvl->directAnswer[tenGagePGradMag][0] = ELL_3V_LEN(vecTmp);
    }
!   if (GAGE_QUERY_ITEM_TEST(pvl->query, tenGagePNormal)) {
!     ELL_3V_SCALE(pvl->directAnswer[tenGagePNormal],
  		 1.0/(epsilon + magTmp), vecTmp);
    }
--- 368,376 ----
  		      -tmp1, gradCbR);
    }
!   if (GAGE_QUERY_ITEM_TEST(pvl->query, tenGageThetaGradMag)) {
!     magTmp = pvl->directAnswer[tenGageThetaGradMag][0] = ELL_3V_LEN(vecTmp);
    }
!   if (GAGE_QUERY_ITEM_TEST(pvl->query, tenGageThetaNormal)) {
!     ELL_3V_SCALE(pvl->directAnswer[tenGageThetaNormal],
  		 1.0/(epsilon + magTmp), vecTmp);
    }

Index: ten.h
===================================================================
RCS file: /cvsroot/teem/teem/src/ten/ten.h,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** ten.h	22 Apr 2004 04:54:33 -0000	1.83
--- ten.h	22 Apr 2004 07:14:54 -0000	1.84
***************
*** 153,157 ****
  ** R = (9*A*B - 2*A^3 - 27*C)/54 
       = (5*A*B - 2*A*S - 27*C)/54 = thirdmoment({v1,v2,v3})/2
! ** P = arccos(R/sqrt(Q)^3) = phase angle of cubic solution
  **
  ** !!! Changes to this list need to be propogated to tenGage.c's
--- 153,157 ----
  ** R = (9*A*B - 2*A^3 - 27*C)/54 
       = (5*A*B - 2*A*S - 27*C)/54 = thirdmoment({v1,v2,v3})/2
! ** P = arccos(R/sqrt(Q)^3)/3 = phase angle of cubic solution
  **
  ** !!! Changes to this list need to be propogated to tenGage.c's
***************
*** 171,175 ****
    tenGageFA,            /*  7: "fa", fractional anisotropy: GT[1] */
    tenGageR,             /*  8: "r", 9*A*B - 2*A^3 - 27*C: GT[1] */
!   tenGageP,             /*  9: "p", arccos(R/sqrt(Q^3)): GT[1] */
  
    tenGageEval,          /* 10: "eval", all eigenvalues of tensor : GT[3] */
--- 171,175 ----
    tenGageFA,            /*  7: "fa", fractional anisotropy: GT[1] */
    tenGageR,             /*  8: "r", 9*A*B - 2*A^3 - 27*C: GT[1] */
!   tenGageTheta,         /*  9: "th", arccos(R/sqrt(Q^3))/3: GT[1] */
  
    tenGageEval,          /* 10: "eval", all eigenvalues of tensor : GT[3] */
***************
*** 213,219 ****
    tenGageRNormal,       /* 39: "rn", normalized gradient of Q: GT[3] */
  
!   tenGagePGradVec,      /* 40: "pgv", gradient vector of P: GT[3] */
!   tenGagePGradMag,      /* 41: "pgm", gradient magnitude of P: GT[1] */
!   tenGagePNormal,       /* 42: "pn", normalized gradient of P: GT[3] */
  
    tenGageAniso,         /* 43: "an", all anisotropies: GT[TEN_ANISO_MAX+1] */
--- 213,219 ----
    tenGageRNormal,       /* 39: "rn", normalized gradient of Q: GT[3] */
  
!   tenGageThetaGradVec,  /* 40: "thgv", gradient vector of Th: GT[3] */
!   tenGageThetaGradMag,  /* 41: "thgm", gradient magnitude of Th: GT[1] */
!   tenGageThetaNormal,   /* 42: "thn", normalized gradient of Th: GT[3] */
  
    tenGageAniso,         /* 43: "an", all anisotropies: GT[TEN_ANISO_MAX+1] */

[Teem-commit] teem/src/ten enumsTen.c,1.21,1.22 ten.h,1.83,1.84 tenGage.c,1.16,1.17

Tools to process and visualize scientific data and images

[Teem-commit] teem/src/ten enumsTen.c,1.21,1.22 ten.h,1.83,1.84 tenGage.c,1.16,1.17