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

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

Revision: 4183
          http://teem.svn.sourceforge.net/teem/?rev=4183&view=rev
Author:   kindlmann
Date:     2009-03-12 20:15:15 +0000 (Thu, 12 Mar 2009)

Log Message:
-----------
still tweaking gageOptimSigCalculate

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

Modified: teem/trunk/src/gage/optimsig.c
===================================================================
--- teem/trunk/src/gage/optimsig.c	2009-03-12 19:51:29 UTC (rev 4182)
+++ teem/trunk/src/gage/optimsig.c	2009-03-12 20:15:15 UTC (rev 4183)
@@ -368,7 +368,7 @@
                      unsigned int measrSampleNum) {
   char me[]="gageOptimSigTruthSet", err[BIFF_STRLEN],
     doneStr[AIR_STRLEN_SMALL];
-  double kparm[NRRD_KERNEL_PARMS_NUM];
+  double kparm[NRRD_KERNEL_PARMS_NUM], tauMax;
   unsigned int support, ii;
 
   if (!parm) {
@@ -448,15 +448,16 @@
                        1.0, 1.0, 1.0);
   }
   printf("%s: computing reference blurrings ...       ", me);
+  tauMax =  gageTauOfSig(parm->sigmaMax);
   for (ii=0; ii<parm->measrSampleNum; ii++) {
-    double sigma;
-    if (!(ii%10)) {
+    double sigma, tau;
+    if (!(ii % 10)) {
       printf("%s", airDoneStr(0, ii, parm->measrSampleNum, doneStr));
       fflush(stdout);
     }
     parm->ntruline->data = parm->truth + ii*parm->sx*parm->sy*parm->sz;
-    sigma = parm->sigmatru[ii] = AIR_AFFINE(0, ii, parm->measrSampleNum-1,
-                                            0.0, parm->sigmaMax);
+    tau = AIR_AFFINE(0, ii, parm->measrSampleNum-1, 0.0, tauMax);
+    sigma = parm->sigmatru[ii] = gageSigOfTau(tau);
     _volTrueBlur(parm->ntruline, sigma, parm);
   }
   printf("%s\n", airDoneStr(0, ii, parm->measrSampleNum, doneStr));
@@ -622,8 +623,8 @@
   /* meaningful discrete difference for looking at error gradient is
      bounded by the resolution of the sampling we're doing along scale */
   sigeps = parm->sigmatru[1]/10;
-  oppor = 2;
-  backoff = 0.1;
+  oppor = 1.3333;
+  backoff = 0.25;
   for (pnt=1; pnt<parm->sampleNum-1; pnt++) {
     parm->step[pnt] = 10;
   }


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