Print

Print


Commit in lcdd/src/lcdd/bfield on MAIN
Cartesian3DMagneticFieldMap.cc+25-231.2 -> 1.3
turn on debug print outs for now

lcdd/src/lcdd/bfield
Cartesian3DMagneticFieldMap.cc 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- Cartesian3DMagneticFieldMap.cc	3 Jul 2013 23:00:46 -0000	1.2
+++ Cartesian3DMagneticFieldMap.cc	29 Aug 2013 21:33:17 -0000	1.3
@@ -16,11 +16,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
@@ -30,9 +30,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 );
@@ -80,32 +80,34 @@
 	_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 << " 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;
 
 	// 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;
+	cout << "done loading field map" << endl;
 }
 
 void Cartesian3DMagneticFieldMap::GetFieldValue(const double point[4],
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