diff -u -r1.1 -r1.2
--- GTrack.cpp	9 Aug 2011 23:37:58 -0000	1.1
+++ GTrack.cpp	10 Aug 2011 22:07:06 -0000	1.2
@@ -160,6 +160,9 @@

     nmeas +=  (hits.front())->size();
     delete pclu;
 */

+    ClusterPtr pclu = state.cluster();
+    HitList hits( pclu->predict( state.track()) );
+    nmeas +=  (hits.front())->size();

   }  
   return nmeas; 
 }

diff -u -r1.1 -r1.2
--- GTrackState.cpp	9 Aug 2011 23:37:58 -0000	1.1
+++ GTrackState.cpp	10 Aug 2011 22:07:06 -0000	1.2
@@ -46,7 +46,7 @@

   _chi_square(0.0),
   _chi_square_nohit(-1.),
   _psmooth(0),

-// cng    _pclu(),

+  _pclu(),

   _pmiss(0),
   _drop_fit(false)
 { }

@@ -63,7 +63,7 @@

   _chi_square(0.0),
   _chi_square_nohit(-1.),
   _psmooth(0),

-// cng    _pclu(),

+  _pclu(),

   _pmiss(0),
   _drop_fit(false)
 { }

@@ -81,18 +81,18 @@

   _chi_square(chi_square),
   _chi_square_nohit(-1.),
   _psmooth(0),

-// cng    _pclu(),

+  _pclu(),

   _pmiss(0),
   _drop_fit(false)
 { }
 
 //**********************************************************************

-/* cng

+

 // Constructor from s, track, chi-square and a cluster.
 
 GTrackState::
 GTrackState(double s, const ETrack& tre, FitStatus fit_status,

-            double chi_square, const ChunkClusterIndex& pclu)

+            double chi_square, const ClusterPtr& pclu)

 : _s(s), 
   _tre(tre),
   _fit_status(fit_status),

@@ -103,7 +103,7 @@

   _pmiss(0),
   _drop_fit(false)
 {}

-*/

+

 //**********************************************************************
 
 // Constructor from s, track, chi-square and a miss.

@@ -117,7 +117,7 @@

   _chi_square(chi_square),
   _chi_square_nohit(-1.),
   _psmooth(0),

-// cng    _pclu(),

+  _pclu(),

   _pmiss(pmiss),
   _drop_fit(false)
 {}

@@ -135,7 +135,7 @@

   _chi_square(state._chi_square),
   _chi_square_nohit(state._chi_square_nohit),
   _psmooth(state._psmooth),

-// cng    _pclu(state._pclu),

+  _pclu(state._pclu),

   _pmiss(state._pmiss),
   _drop_fit(false)
 {}

@@ -165,7 +165,7 @@

     if ( lhs.chi_square() != rhs.chi_square() ) return false;
   }
   if ( lhs.smoother() != rhs.smoother() ) return false;

-// cng    if ( lhs.cluster() != rhs.cluster() ) return false;

+  if ( lhs.cluster() != rhs.cluster() ) return false;

   if ( lhs.miss() == 0 && rhs.miss() == 0 ) return true;
   if ( lhs.miss() == 0 || rhs.miss() == 0 || *lhs.miss() != *rhs.miss() ) 
     return false;