trf++/test/trfcyl

diff -u -r1.1 -r1.2
--- PropCylRK_t.cpp	8 Aug 2011 19:05:50 -0000	1.1
+++ PropCylRK_t.cpp	8 Aug 2011 21:37:11 -0000	1.2
@@ -2,13 +2,14 @@

 
 // Test PropCylRK.
 

-#include "PropCylRK.h"
-#include "PropCyl.h"

+#include "trfcyl/PropCylRK.h"
+#include "trfcyl/PropCyl.h"

 #include <iostream>
 #include <string>
 #include <cassert>
 #include <sstream>
 #include <cmath>

+#include <cstdlib>

 #include "objstream/StdObjStream.hpp"
 #include "trfutil/trfstream.h"
 #include "trfutil/TRFMath.h"

@@ -16,8 +17,8 @@

 #include "trfbase/TrackVector.h"
 #include "trfbase/VTrack.h"
 #include "trfbase/ETrack.h"

-#include "SurfCylinder.h"
-#include "PropCylFieldConst.h"

+#include "trfcyl/SurfCylinder.h"
+#include "trfcyl/PropCylFieldConst.h"

 
 using std::cout;
 using std::cerr;

@@ -26,6 +27,7 @@

 using std::ostringstream;
 using std::istringstream;
 using std::abs;

+using std::max;

 
 using namespace trf;
 

@@ -373,7 +375,7 @@

 
   cout << ok_prefix << "Test the field." << endl;
   assert( prop.get_bfield() != 0 );

-  assert( &*prop.get_bfield_map() != 0 );

+  //  assert( &*prop.get_bfield_map() != 0 );

 
   //********************************************************************