diff -u -r1.1 -r1.2
--- GTrackTest.hpp	10 Aug 2011 18:13:18 -0000	1.1
+++ GTrackTest.hpp	10 Aug 2011 22:58:13 -0000	1.2
@@ -8,6 +8,7 @@

 // cng #include "GTrackPropagator.hpp"
 // cng #include "identifiers/ChunkID.hpp"
 #include "trfbase/MissTest.h"

+#include "trfcyl/HitCylPhi.h"

 #include "trfcyl/SurfCylinder.h"
 // cng #include "d0cluster/TestCluster.hpp"
 #include "FitStatus.hpp"

@@ -38,6 +39,7 @@

   std::vector<FitStatus> statii;
   GTrack::StateList stateset;
   std::vector<GTrackState> states;

+  std::vector<trf::ClusterPtr> clusters;

   int nmiss;
   std::vector<trf::MissPtr> misses;
   std::vector<trf::SurfacePtr> miss_surfs;

@@ -52,23 +54,28 @@

              const edm::ChunkID& chkid =edm::ChunkID(), */ double vec0 =1.1 )
    /* cng : _pevt(pevt), _chkid(chkid) */ {
     //******************************************************************

-/* cng
-    std::cout << ok_prefix << "Build clusters." << std::endl;
-    clusters.push_back( ChunkClusterIndex(_pevt,_chkid,0) );
-    clusters.push_back( ChunkClusterIndex(_pevt,_chkid,2) );
-    clusters.push_back( ChunkClusterIndex(_pevt,_chkid,4) );
-    clusters.push_back( ChunkClusterIndex(_pevt,_chkid,6) );
-    clusters.push_back( ChunkClusterIndex(_pevt,_chkid,8) );
-    nclus = clusters.size();
-*/
-	  nclus = 5; // cng
-    //******************************************************************
-    std::cout << ok_prefix << "Build tracks." << std::endl;

+
+    std::cout << ok_prefix << "Build surfaces." << std::endl;

     surfs.push_back( trf::SurfacePtr( new trf::SurfCylinder(10.0) ) );
     surfs.push_back( trf::SurfacePtr( new trf::SurfCylinder(20.0) ) );
     surfs.push_back( trf::SurfacePtr( new trf::SurfCylinder(30.0) ) );
     surfs.push_back( trf::SurfacePtr( new trf::SurfCylinder(40.0) ) );
     surfs.push_back( trf::SurfacePtr( new trf::SurfCylinder(50.0) ) );

+
+
+
+    std::cout << ok_prefix << "Build clusters." << std::endl;
+    double phi1 = 1.0;
+    double dphi1 = 0.1;
+    clusters.push_back( new ClusCylPhi(10.0, phi1, dphi1) );
+    clusters.push_back( new ClusCylPhi(20.0, phi1, dphi1) );
+    clusters.push_back( new ClusCylPhi(30.0, phi1, dphi1) );
+    clusters.push_back( new ClusCylPhi(40.0, phi1, dphi1) );
+    clusters.push_back( new ClusCylPhi(50.0, phi1, dphi1) );
+    nclus = clusters.size();
+
+    //******************************************************************
+    std::cout << ok_prefix << "Build tracks." << std::endl;

     miss_surfs.push_back( trf::SurfacePtr( new trf::SurfCylinder(15.0) ) );
     miss_surfs.push_back( trf::SurfacePtr( new trf::SurfCylinder(25.0) ) );
     miss_surfs.push_back( trf::SurfacePtr( new trf::SurfCylinder(35.0) ) );

@@ -144,19 +151,18 @@

     nmiss = misses.size();
     //******************************************************************
     std::cout << ok_prefix << "Build global track cluster states." << std::endl;

-// cng     assert( nclus == clusters.size() );

+    assert( nclus == clusters.size() );

     assert( nclus == ss.size() );
     assert( nclus == etracks.size() );
     assert( nclus == chsqs.size() );
     assert( nclus == statii.size() );
     for ( int i=0; i<nclus; ++i ) {
       GTrackState

-        state(ss[i], etracks[i], statii[i], chsqs[i] /* cng, clusters[i] */ );
-/* cng
-      if ( ! state.cluster().is_valid() ) {

+        state(ss[i], etracks[i], statii[i], chsqs[i], clusters[i] );
+      if ( ! state.cluster() ) {

         std::cout << state.cluster() << std::endl;
       }

-*/

+

       stateset.insert(state);
     }
     //******************************************************************