Print

Print


Commit in lcdd/src on MAIN
Cartesian3DMagneticFieldMap.cc+26-251.1 -> 1.2
remove debug prints; comment out main method

lcdd/src
Cartesian3DMagneticFieldMap.cc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- Cartesian3DMagneticFieldMap.cc	3 Oct 2012 00:48:25 -0000	1.1
+++ Cartesian3DMagneticFieldMap.cc	9 Oct 2012 19:47:57 -0000	1.2
@@ -12,11 +12,11 @@
 Cartesian3DMagneticFieldMap::Cartesian3DMagneticFieldMap( const char* filename, double xOffset, double yOffset, double zOffset ) 
 	:_xOffset(xOffset),_yOffset(yOffset),_zOffset(zOffset),_invertX(false),_invertY(false),_invertZ(false)
 {    
-	cout << "\n-----------------------------------------------------------"
-		<< "\n      Magnetic field"
-		<< "\n-----------------------------------------------------------";
+	//cout << "\n-----------------------------------------------------------"
+	//	<< "\n      Magnetic field"
+	//	<< "\n-----------------------------------------------------------";
 
-	cout << "\n ---> " "Reading the field grid from " << filename << " ... " << endl; 
+	//cout << "\n ---> " "Reading the field grid from " << filename << " ... " << endl;
 	ifstream file( filename ); // Open the file for reading.
 
 	// Ignore first blank line
@@ -26,9 +26,9 @@
 	// Read table dimensions 
 	file >> _nx >> _ny >> _nz; // Note dodgy order
 
-	cout << "  [ Number of values x,y,z: " 
-		<< _nx << " " << _ny << " " << _nz << " ] "
-		<< endl;
+	//cout << "  [ Number of values x,y,z: "
+	//	<< _nx << " " << _ny << " " << _nz << " ] "
+	//	<< endl;
 
 	// Set up storage space for table
 	_xField.resize( _nx );
@@ -76,32 +76,32 @@
 	_maxy = yval;
 	_maxz = zval;
 
-	cout << "\n ---> ... done reading " << endl;
+	//cout << "\n ---> ... done reading " << endl;
 
 	// cout << " Read values of field from file " << filename << endl; 
-	cout << " ---> assumed the order:  x, y, z, Bx, By, Bz "
-		<< "\n ---> Min values x,y,z: " 
-		<< _minx << " " << _miny << " " << _minz << " cm "
-		<< "\n ---> Max values x,y,z: " 
-		<< _maxx << " " << _maxy << " " << _maxz << " cm "
-		<< "\n ---> The field will be offset by " << _xOffset << " " << _yOffset << " " << _zOffset << " cm " << endl;
+	//cout << " ---> assumed the order:  x, y, z, Bx, By, Bz "
+	//	<< "\n ---> Min values x,y,z: "
+	//	<< _minx << " " << _miny << " " << _minz << " cm "
+	//	<< "\n ---> Max values x,y,z: "
+	//	<< _maxx << " " << _maxy << " " << _maxz << " cm "
+	//	<< "\n ---> The field will be offset by " << _xOffset << " " << _yOffset << " " << _zOffset << " cm " << endl;
 
 	// Should really check that the limits are not the wrong way around.
 	if (_maxx < _minx) {swap(_maxx,_minx); _invertX = true;} 
 	if (_maxy < _miny) {swap(_maxy,_miny); _invertY = true;} 
 	if (_maxz < _minz) {swap(_maxz,_minz); _invertZ = true;} 
-	cout << "\nAfter reordering if necessary"  
-		<< "\n ---> Min values x,y,z: " 
-		<< _minx << " " << _miny << " " << _minz << " cm "
-		<< " \n ---> Max values x,y,z: " 
-		<< _maxx << " " << _maxy << " " << _maxz << " cm ";
+	//cout << "\nAfter reordering if necessary"
+	//	<< "\n ---> Min values x,y,z: "
+	//	<< _minx << " " << _miny << " " << _minz << " cm "
+	//	<< " \n ---> Max values x,y,z: "
+	//	<< _maxx << " " << _maxy << " " << _maxz << " cm ";
 
 	_dx = _maxx - _minx;
 	_dy = _maxy - _miny;
 	_dz = _maxz - _minz;
-	cout << "\n ---> Range of values x,y,z: " 
-		<< _dx << " " << _dy << " " << _dz << " cm in z "
-		<< "\n-----------------------------------------------------------" << endl;
+	//cout << "\n ---> Range of values x,y,z: "
+	//	<< _dx << " " << _dy << " " << _dz << " cm in z "
+	//	<< "\n-----------------------------------------------------------" << endl;
 }
 
 void Cartesian3DMagneticFieldMap::GetFieldValue(const double point[4],
@@ -191,6 +191,7 @@
 	}
 }
 
+/*
 int main()
 {
 	Cartesian3DMagneticFieldMap field("C:/work/magfield/magfield3DMap/ThreeDFieldMap.dat", 0.,0.,0.);
@@ -211,7 +212,7 @@
 				pos[1] =y;
 				pos[2] = z;
 				field.GetFieldValue(pos, B);
-				cout << pos[0] << " " << pos[1] << " " << pos[2] << " " << B[0] << " " << B[1] << " " << B[2] << endl;
+				//cout << pos[0] << " " << pos[1] << " " << pos[2] << " " << B[0] << " " << B[1] << " " << B[2] << endl;
 			}
 		}
 	}
@@ -220,7 +221,7 @@
 	pos[1]=0.038;
 	pos[2]=-0.02;
 	field.GetFieldValue(pos, B);
-	cout << pos[0] << " " << pos[1] << " " << pos[2] << " " << B[0] << " " << B[1] << " " << B[2] << endl;
+	//cout << pos[0] << " " << pos[1] << " " << pos[2] << " " << B[0] << " " << B[1] << " " << B[2] << endl;
 	return 0;
 }
-
+*/
CVSspam 0.2.12


Use REPLY-ALL to reply to list

To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1