trf++/test/gtrbase

diff -u -r1.1 -r1.2
--- GTrackState_t.cpp	10 Aug 2011 18:09:53 -0000	1.1
+++ GTrackState_t.cpp	10 Aug 2011 22:30:19 -0000	1.2
@@ -8,6 +8,7 @@

 #include <iostream>
 #include <cassert>
 #include "trfbase/SurfTest.h"

+#include "trfbase/HitTest.h"

 // cng  #include "d0cluster/ChunkClusterIndex.hpp"
 #include "trfbase/MissTest.h"
 #include "gtrbase/FitStatus.hpp"

@@ -80,7 +81,7 @@

   assert( state1.track() == tre );
   assert( state1.fit_status() == stat );
   assert( state1.chi_square() == chsq );

-// cng    assert( ! state1.cluster().is_valid() );

+  assert( ! state1.cluster() );

   assert( ! state1.miss() );
   assert( ! state1.smoother() );
   assert( state1.is_valid() );

@@ -96,7 +97,7 @@

     assert( state2.s() == s );
     assert( ! state2.track().is_valid() );
     assert( state2.fit_status() == INVALID );

-// cng      assert( ! state2.cluster().is_valid() );

+    assert( ! state2.cluster() );

     assert( ! state2.miss() );
     assert( ! state2.smoother() );
     assert( state2.is_valid() );

@@ -104,13 +105,16 @@

   }
 
   //********************************************************************

-/* cng

+

   cout << ok_prefix << "Check constructor with cluster." << endl;
   {

+    /* cng

     EventPtr pevt( new Event(CollisionID(123,45)) );
     ChunkID chkid(78);
     D0ClusterIndex iclu(246);
     ChunkClusterIndex pclu(pevt,chkid,iclu);

+    */
+    ClusterPtr pclu = new ClusterTest(s, 2);

     GTrackState state2(s,tre,stat,chsq,pclu);
     cout << state2 << endl;
     assert( state2 != state1 );

@@ -124,7 +128,7 @@

     assert( state2.is_valid() );
     assert( state2.has_valid_fit() );
   }

-*/

+

   //********************************************************************
 
   cout << ok_prefix << "Check constructor with miss." << endl;

@@ -137,7 +141,7 @@

     assert( state2.track() == tre );
     assert( state1.fit_status() == stat );
     assert( state2.chi_square() == chsq );

-// cng      assert( ! state2.cluster().is_valid() );

+    assert( ! state2.cluster() );

     assert( state2.miss() != 0 );
     assert( state2.miss() == pmiss );
     assert( ! state2.smoother() );