[Teem-commit] teem/src/ten ten.h,1.78,1.79 miscTen.c,1.22,1.23

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

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

Modified Files:
	ten.h miscTen.c 
Log Message:
can now optionally tell _tenFindValley to save filtered histogram

Index: ten.h
===================================================================
RCS file: /cvsroot/teem/teem/src/ten/ten.h,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** ten.h	27 Feb 2004 12:50:37 -0000	1.78
--- ten.h	7 Mar 2004 00:48:13 -0000	1.79
***************
*** 471,475 ****
  			  int aniso, int scaleByAniso);
  TEEM_API int tenBMatrixCheck(Nrrd *nbmat);
! TEEM_API int _tenFindValley(float *valP, Nrrd *nhist, float tweak);
  
  /* fiberMethods.c */
--- 471,476 ----
  			  int aniso, int scaleByAniso);
  TEEM_API int tenBMatrixCheck(Nrrd *nbmat);
! TEEM_API int _tenFindValley(float *valP, Nrrd *nhist,
! 			    float tweak, int save);
  
  /* fiberMethods.c */

Index: miscTen.c
===================================================================
RCS file: /cvsroot/teem/teem/src/ten/miscTen.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** miscTen.c	27 Feb 2004 10:23:56 -0000	1.22
--- miscTen.c	7 Mar 2004 00:48:13 -0000	1.23
***************
*** 215,219 ****
  */
  int
! _tenFindValley(float *valP, Nrrd *nhist, float tweak) {
    char me[]="_tenFindValley", err[AIR_STRLEN_MED];
    double gparm[NRRD_KERNEL_PARMS_NUM], dparm[NRRD_KERNEL_PARMS_NUM];
--- 215,219 ----
  */
  int
! _tenFindValley(float *valP, Nrrd *nhist, float tweak, int save) {
    char me[]="_tenFindValley", err[AIR_STRLEN_MED];
    double gparm[NRRD_KERNEL_PARMS_NUM], dparm[NRRD_KERNEL_PARMS_NUM];
***************
*** 238,242 ****
  
    bins = nhist->axis[0].size;
!   gparm[0] = bins/50;  /* wacky heuristic for gaussian stdev */
    gparm[1] = 3;        /* how many stdevs to cut-off at */
    dparm[0] = 1.0;      /* unit spacing */
--- 238,242 ----
  
    bins = nhist->axis[0].size;
!   gparm[0] = bins/128;  /* wacky heuristic for gaussian stdev */
    gparm[1] = 3;        /* how many stdevs to cut-off at */
    dparm[0] = 1.0;      /* unit spacing */
***************
*** 253,256 ****
--- 253,260 ----
      biffMove(TEN, err, NRRD), airMopError(mop); return 1;
    }
+   if (save) {
+     nrrdSave("tmp-histA.nrrd", ntmpA, NULL);
+     nrrdSave("tmp-histB.nrrd", ntmpB, NULL);
+   }
    hist = (float*)(ntmpB->data);
    histD = (float*)(nhistD->data);
***************
*** 281,282 ****
--- 285,287 ----
    return 0;
  }
+