diff -u -r1.1 -r1.2
--- GTrackState.hpp	9 Aug 2011 23:37:57 -0000	1.1
+++ GTrackState.hpp	10 Aug 2011 22:06:30 -0000	1.2
@@ -26,6 +26,7 @@

 #include <string>
 #include "trfbase/ETrack.h"
 // cng #include "d0cluster/ChunkClusterIndex.hpp"

+#include "trfbase/ClusterPtr.h"

 #include "trfbase/MissPtr.h"
 #include "gtrbase/SmoothPtr.hpp"
 

@@ -77,6 +78,7 @@

 
   // Optional cluster.
 // cng  ChunkClusterIndex _pclu;

+  trf::ClusterPtr _pclu;

 
   // Optional miss.
   trf::MissPtr _pmiss;

@@ -107,6 +109,10 @@

   GTrackState(double s, const trf::ETrack& tre, FitStatus fit_status,
               double chi_square, const ChunkClusterIndex& pclu);
 */

+    // Constructor from s, track fit and a cluster.
+  GTrackState(double s, const trf::ETrack& tre, FitStatus fit_status,
+              double chi_square, const trf::ClusterPtr& pclu);
+

   // Constructor from s, track fit, chi-square and a miss.
   GTrackState(double s, const trf::ETrack& tre, FitStatus fit_status,
               double chi_square, trf::MissPtr pmiss);

@@ -170,10 +176,10 @@

 
   // Set smoothing data.
   void set_smoother(const SmoothPtr& p) { _psmooth = p; }

-/* cng

+

   // Return the cluster.

-  const ChunkClusterIndex& cluster() const { return _pclu; }
-*/

+  const trf::ClusterPtr& cluster() const { return _pclu; }
+

   // Return the miss.
   const trf::MissPtr& miss() const { return _pmiss; }