lcdd/src

diff -u -r1.6 -r1.7
--- G4Solenoid.cc	4 May 2006 22:22:18 -0000	1.6
+++ G4Solenoid.cc	9 May 2006 01:56:35 -0000	1.7
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/src/G4Solenoid.cc,v 1.6 2006/05/04 22:22:18 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/src/G4Solenoid.cc,v 1.7 2006/05/09 01:56:35 jeremy Exp $

 
 #include "G4Solenoid.hh"
 

@@ -24,7 +24,9 @@

 // TODO: use inner/outer Z
 void G4Solenoid::GetFieldValue( const double Point[3], double* Bfield ) const
 {

-  //std::cout << "G4Solenoid::GetFieldValue" << std::endl;

+  //   std::cout << "G4Solenoid::GetFieldValue" << std::endl;
+  //   std::cout << "x y z: " << Point[0] << " " << Point[1] << " " << Point[2] << std::endl;
+  //   std::cout << "BEFORE: bx, by, bz: " << Bfield[0] << " " << Bfield[1] << " " << Bfield[2] << std::endl;

 
   double this_radius = sqrt( Point[0] * Point[0] + Point[1] * Point[1] );
 

@@ -34,6 +36,9 @@

   else if ( this_radius < _outerR ) {
     Bfield[2] += _outerField;
   }

+
+  //   std::cout << "AFTER: bx, by, bz: " << Bfield[0] << " " << Bfield[1] << " " << Bfield[2] << std::endl << std::endl;
+

   return;
 }
 

lcdd/src

diff -u -r1.11 -r1.12
--- LCDDDetectorConstruction.cc	4 May 2006 20:48:45 -0000	1.11
+++ LCDDDetectorConstruction.cc	9 May 2006 01:56:35 -0000	1.12
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/src/LCDDDetectorConstruction.cc,v 1.11 2006/05/04 20:48:45 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/src/LCDDDetectorConstruction.cc,v 1.12 2006/05/09 01:56:35 jeremy Exp $

 
 // LCDD
 #include "LCDDDetectorConstruction.hh"

@@ -52,11 +52,6 @@

   // set world ptr
   setWorldVolume(pv);
 

-  // Setup the global magnetic field.
-  // TODO: Probably this call belongs someplace else.  It is the only
-  //       direct coupling to LCDDProcessor.
-  //LCDDProcessor::instance()->setupGlobalMagneticField();
-

   // stop build timer and print
   geoTimer.Stop();
   G4cout << "Geometry construction time: " << geoTimer << G4endl;

lcdd/src

diff -u -r1.2 -r1.3
--- LCDDFieldManager.cc	4 May 2006 22:22:18 -0000	1.2
+++ LCDDFieldManager.cc	9 May 2006 01:56:35 -0000	1.3
@@ -58,15 +58,15 @@

 G4MagneticField* LCDDFieldManager::setup(std::vector<G4MagneticField*> fields)
 {
   G4MagneticField* field = 0;

-  if (fields.size() == 0) {
-    G4cerr << "LCDDFieldManager - No magnetic fields to setup." << G4endl;
-  }
-  else if (fields.size() == 1) {
-    field = fields[0];
-  }
-  else {
-    field = makeOverlay(fields);
-  }

+  //if (fields.size() == 0) {
+  //  G4cerr << "LCDDFieldManager - No magnetic fields to setup." << G4endl;
+  //}
+  //else if (fields.size() == 1) {
+  //  field = fields[0];
+  //}
+  //else {
+  field = makeOverlay(fields);
+  //}

   return field;
 }
 

lcdd/src

diff -u -r1.6 -r1.7
--- LCDDParser.cc	4 May 2006 20:48:45 -0000	1.6
+++ LCDDParser.cc	9 May 2006 01:56:35 -0000	1.7
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/src/LCDDParser.cc,v 1.6 2006/05/04 20:48:45 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/src/LCDDParser.cc,v 1.7 2006/05/09 01:56:35 jeremy Exp $

 #include "LCDDParser.hh"
 
 // lcdd

@@ -111,8 +111,6 @@

     // Setup magnetic field.
     LCDDFieldManager::instance()->setup();
 

-    //LCDDProcessor::instance()->setupGlobalMagneticField();
-

     // should only happen once
     m_constructed = true;
   }