[MINC-development] minc-patch: fixing check for gunzip

Steve ROBBINS minc-development@bic.mni.mcgill.ca
Mon, 24 Nov 2003 17:15:11 -0500


On Mon, Nov 24, 2003 at 04:18:59PM -0500, Vicka Corey wrote:
> ...and having gotten past that, we bring you the next in error messages:
> 
> nu_correct -clobber nu/nu0.mnc nu/nu1.mnc
> [vicka@ocelot.nmr.mgh.harvard.edu:/private/space/birn/2/users/vicka/subjects/bert/mri/] [2003-11-24 16:16:04] running:
>   /usr/local/mni/bin/nu_estimate_np_and_em -parzen -log -sharpen 0.15 0.01 -iterations 50 -stop 0.001 -shrink 4 -auto_mask -nonotify -b_spline 1 -distance 200 -quiet -execute -clobber -nokeeptmp -tmpdir /var/tmp/nu_correct_2481/ nu/nu0.mnc nu/nu1.imp
> 
> expected floating-point argument for "-const" but got"DEBUG: state of _s: 0
> DEBUG: state of _s: 0
> DEBUG: state of path: /tmp/test
> DEBUG: state of _s: 0
> 0"

This is a goof on our part.  Apply the following diff to EBTKS, rebuild and install it,
then rebuild N3.

-Steve

Index: ChangeLog
===================================================================
RCS file: /software/source/libraries/EBTKS/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -B -r1.4 -r1.5
--- ChangeLog	17 Nov 2003 04:07:51 -0000	1.4
+++ ChangeLog	21 Nov 2003 20:38:44 -0000	1.5
@@ -1,3 +1,8 @@
+2003-11-21  Steve ROBBINS  <stever@bic.mni.mcgill.ca>
+
+	* templates/CachedArray.cc: Remove debugging statements
+	erroneously left in code.
+
 2003-11-14  Steve ROBBINS  <stever@bic.mni.mcgill.ca>
 
 	* configure.ac: Set version to 1.0.
Index: templates/CachedArray.cc
===================================================================
RCS file: /software/source/libraries/EBTKS/templates/CachedArray.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -B -r1.5 -r1.6
--- templates/CachedArray.cc	17 Nov 2003 04:07:52 -0000	1.5
+++ templates/CachedArray.cc	21 Nov 2003 20:38:44 -0000	1.6
@@ -12,9 +12,9 @@
               express or implied warranty.
 ---------------------------------------------------------------------------- 
 $RCSfile: CachedArray.cc,v $
-$Revision: 1.5 $
+$Revision: 1.6 $
 $Author: stever $
-$Date: 2003/11/17 04:07:52 $
+$Date: 2003/11/21 20:38:44 $
 $State: Exp $
 --------------------------------------------------------------------------*/
 #include <config.h>
@@ -478,9 +480,6 @@
 {
   assert(_size);
 
-  cout << "DEBUG: in median of CachedArray" << endl;
-  cout << "DEBUG: _size = " << _size << endl;
-
   if (_size <= _blockSize) {
     if (!_blocks[0])
       _read(0);
@@ -503,7 +502,6 @@
       _read(0);
     return (*_blocks[0])(_size).medianVolatile();
   }
-  cout << "DEBUG: histMedian = " << _histMedian() << endl;
   return _histMedian();
 }
 
@@ -723,7 +721,6 @@
 void
 CachedArray<Type>::_openStream()
 {
-  cout << "DEBUG: state of _s: " << _s.is_open() << endl;
   if (_s.is_open())
     _self->_s.close();
 
@@ -734,10 +731,7 @@
     _s.open(path, ios::in|ios::out);
     //    _s.open(path, ios::in);
 
-    cout << "DEBUG: state of path: " << path << endl;
     unlink(path);
-
-    cout << "DEBUG: state of _s: " << _s.is_open() << endl;
     //assert(_s.is_open());
 
     // Create file at requested size