[Teem-commit] SF.net SVN: teem:[5076] teem/trunk/src/gage/stack.c

[<kin...@us...>]

Revision: 5076
          http://teem.svn.sourceforge.net/teem/?rev=5076&view=rev
Author:   kindlmann
Date:     2011-08-26 09:18:18 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
tweaking implementation of conversions between Sig, Tee, and Tau

Modified Paths:
--------------
    teem/trunk/src/gage/stack.c

Modified: teem/trunk/src/gage/stack.c
===================================================================
--- teem/trunk/src/gage/stack.c	2011-08-26 08:43:04 UTC (rev 5075)
+++ teem/trunk/src/gage/stack.c	2011-08-26 09:18:18 UTC (rev 5076)
@@ -30,11 +30,15 @@
 #define BT 2.526917043979558
 #define AA 0.629078014852877
 
+#define TAU_OF_TEE(tee) (tee < BT ? AA*sqrt(tee) : 0.5365 + log(tee)/2)
+/* is it surprising that the transition is at tau = 1 ? */
+#define TEE_OF_TAU(tau) (tau < 1 ? tau*tau/(AA*AA) : exp(2*(tau - 0.5365)))
+
 double
 gageTauOfTee(double tee) {
   double tau;
 
-  tau = (tee < BT ? AA*sqrt(tee) : 0.5365 + log(tee)/2);
+  tau = TAU_OF_TEE(tee);
   return tau;
 }
 
@@ -42,26 +46,27 @@
 gageTeeOfTau(double tau) {
   double tee;
 
-  /* is it surprising that the transition is at tau = 1 ? */
-  tee = (tau < 1 ? tau*tau/(AA*AA) : exp(2*(tau - 0.5365)));
+  tee = TEE_OF_TAU(tau);
   return tee;
 }
 
-#undef BT
-#undef AA
-
 double
 gageSigOfTau(double tau) {
   
-  return sqrt(gageTeeOfTau(tau));
+  return sqrt(TEE_OF_TAU(tau));
 }
 
 double
 gageTauOfSig(double sig) {
 
-  return gageTauOfTee(sig*sig);
+  return TAU_OF_TEE(sig*sig);
 }
 
+#undef BT
+#undef AA
+#undef TAU_OF_TEE
+#undef TEE_OF_TAU
+
 double
 gageStackWtoI(gageContext *ctx, double swrl, int *outside) {
   double si;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.