+// $Header: /cvs/lcd/lcdd/include/RZBData.hh,v 1.1 2005/08/31 18:30:00 jeremy Exp $ +#ifndef RZBData_hh +#define RZBData_hh 1 + +/** + * @class RZBData + * @brief Represents a single row of a magnetic field defined by radius, z dimension, radial B-field strength, and z dimension B-field strength. + * @note Double values are multiplied by the field unit from the rz_field_map before they are inserted using this class. + */ +class RZBData +{ +public: + + /* + * @param r Radius + * @param z Z dimension + * @param Br Radial field strength + * @param Bz Z dimension field strength + */ + RZBData(double r, double z, double Br, double Bz) + : _r(r), + _z(z), + _Br(Br), + _Bz(Bz) + {} + + virtual ~RZBData() + {} + +public: + + double r() const + { + return _r; + } + + double z() const + { + return _z; + } + + double Br() const + { + return _Br; + } + + double Bz() const + { + return _Bz; + } + +private: + double _r; + double _z; + double _Br; + double _Bz; +}; + +#endif

- /* - * Call once all RZB rows are added to make two arrays of [r][z] containg values for Br or Bz. - * This should be much more performant than the vector of G4RZB objects. - * @param clearRows Set to true in order to clear the G4RZB object vector. (Default is true.) - */ - void makeArray(bool clearRows = true);

-// $Header: /cvs/lcd/lcdd/include/Attic/G4RZB.hh,v 1.2 2005/08/30 21:22:07 jeremy Exp $ -#ifndef G4RZB_hh -#define G4RZB_hh 1 - -/** - * @class G4RZB - * @brief Represents a single row of a magnetic field defined by radius, z dimension, radial B-field strength, and z dimension B-field strength. - * @note Double values are multiplied by the field unit from the rz_field_map before they are inserted using this class. - */ -class G4RZB -{ -public: - - /* - * @param r Radius - * @param z Z dimension - * @param Br Radial field strength - * @param Bz Z dimension field strength - */ - G4RZB(double r, double z, double Br, double Bz) - : _r(r), - _z(z), - _Br(Br), - _Bz(Bz) - {} - - virtual ~G4RZB() - {} - -public: - - double r() const - { - return _r; - } - - double z() const - { - return _z; - } - - double Br() const - { - return _Br; - } - - double Bz() const - { - return _Bz; - } - -private: - double _r; - double _z; - double _Br; - double _Bz; -}; - -#endif

lcdd/src

G4RZFieldMap.cc 1.4 -> 1.5

diff -u -r1.4 -r1.5
--- G4RZFieldMap.cc	31 Aug 2005 01:31:53 -0000	1.4
+++ G4RZFieldMap.cc	31 Aug 2005 18:30:01 -0000	1.5
@@ -1,64 +1,56 @@

-// $Header: /cvs/lcd/lcdd/src/G4RZFieldMap.cc,v 1.4 2005/08/31 01:31:53 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/src/G4RZFieldMap.cc,v 1.5 2005/08/31 18:30:01 jeremy Exp $

 #include "G4RZFieldMap.hh"
 
 #include "globals.hh"
 
 #include <cmath>

-G4RZFieldMap::G4RZFieldMap(double spanR, double gridSizeR, double spanZ, double gridSizeZ)
-  : m_numBinsR(0),
-    m_numBinsZ(0),
-    m_spanR(spanR),

+G4RZFieldMap::G4RZFieldMap(int numBinsR,
+			   int numBinsZ,
+			   double gridSizeR,
+			   double gridSizeZ,
+			   std::vector<RZBData> fieldData)
+  : m_numBinsR(numBinsR),
+    m_numBinsZ(numBinsZ),

     m_gridSizeR(gridSizeR),

-    m_spanZ(spanZ),

     m_gridSizeZ(gridSizeZ),
     m_BrArray(0),

-    m_BzArray(0),
-    m_madeArray(false)

+    m_BzArray(0)

-  computeNumBins();

+  initializeArrays();
+  fillArrays(fieldData);

-G4RZFieldMap::~G4RZFieldMap()
-{
-  /* delete the array */
-  if ( m_madeArray ) {
-    for (size_t i=0; i<m_numBinsR; i++) {
-      delete[] m_BrArray[i];
-      delete[] m_BzArray[i];
-    }
-    delete[] m_BrArray;
-    delete[] m_BzArray;
-  }
-}
-
-void G4RZFieldMap::computeNumBins()

+void G4RZFieldMap::fillArrays(std::vector<RZBData> fieldData)

-  /* r bins */
-  double rem = fmod( (float)m_spanR, (float)m_gridSizeR);

+  for ( std::vector<RZBData>::iterator iter = fieldData.begin();
+	iter != fieldData.end();
+	iter++ ) {
+    RZBData rzb = *iter;

-  if ( rem != 0 ) {
-    G4Exception("spanR is not evenly divisible by gridSizeR.");
-  }
-
-  m_numBinsR = (size_t)(m_spanR / m_gridSizeR);
-
-  if ( m_numBinsR == 0 ) {
-    G4Exception("numBinsR == 0");
-  }
-
-  /* z bins */
-  rem = fmod( (float)m_spanZ, (float)m_gridSizeZ);

+    int iz= (int) ((rzb.z() + 0.0001)/m_gridSizeZ);
+    iz = iz;
+    int ir=(int) ((rzb.r() + 0.0001)/m_gridSizeR);
+    ir = ir;

-  if ( rem != 0 ) {
-    G4Exception("spanZ is not evenly disible by gridSizeZ.");

+    m_BzArray[iz][ir] = rzb.Br();
+    m_BrArray[iz][ir] = rzb.Bz();

+}

-  m_numBinsZ = (size_t)(m_spanZ / m_gridSizeZ);

+G4RZFieldMap::~G4RZFieldMap()
+{
+  deleteArrays();
+}

-  if ( m_numBinsZ == 0 ) {
-    G4Exception("numBinsZ == 0");

+void G4RZFieldMap::deleteArrays()
+{
+  for (int i=0; i<m_numBinsR; i++) {
+    delete[] m_BrArray[i];
+    delete[] m_BzArray[i];

+  delete[] m_BrArray;
+  delete[] m_BzArray;

 }
 
 /*

@@ -68,175 +60,116 @@

  *
  * /afs/slac/www/accel/nlc/local/systems/beamdelivery/geant/SDNEW/solenoid.f
  *

+ * via RZBFieldProvider.cpp test code provided by Norman.
+ *

  */
 void G4RZFieldMap::GetFieldValue( const double Point[3], double *Bfield ) const
 {

-  std::cout << std::endl << "G4RZFieldMap::GetFieldValue" << std::endl;
-  std::cout << "Point = " << Point[0] << ", " << Point[1] << ", " << Point[2] << std::endl;
-
-  double rcyl = sqrt( ( Point[0] * Point[0] ) + ( Point[1] * Point[1] ) );

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

   double z = Point[2];

-  size_t binR = (int)floor( rcyl / m_gridSizeR );
-  binR += 1;

+  double hz = 0;
+  double hr = 0;

-  std::cout << "binR = " << binR << std::endl;
-
-  if ( binR >= m_numBinsR ) {
-    std::cerr << "OVERFLOW: binR > m_numBinsR - 1 ... RETURNING" << std::endl;

+  /* hard-coded max values??? */
+  if(fabs(z)>630.0 || r>660.0) {
+    hz = 0.0;
+    hr = 0.0;

     return;
   }

-  size_t binZ = (size_t) floor( ( fabs(z) / m_gridSizeZ ) );
-  binZ += 1;
-
-  std::cout << "binZ = " << binZ << std::endl;

+  int iz = (int) ((fabs(z)+0.001)/m_gridSizeZ);
+  int ir = (int) ((r+0.001)/m_gridSizeR);

-  if ( binZ >= m_numBinsZ ) {
-    std::cerr << "OVERFLOW: binZ > m_numBinsZ - 1 ... SETTING binZ = m_numBinZ" << std::endl;
-    binZ = m_numBinsZ;

+  std::cout << "dz " << m_gridSizeZ << " dr " << m_gridSizeR << std::endl;
+  std::cout << "z " << z << " r " << r << std::endl;
+  std::cout << "iz " << iz << " ir " << ir << std::endl;
+  iz = iz;
+  ir = ir;
+
+  // outside
+  if(iz<0 || ir>m_numBinsR) {
+    hz = 0.0;
+    hr = 0.0;
+    return;

-  double brmin = m_BrArray[binR][binZ];
-  double bzmin = m_BzArray[binR][binZ];
-
-  double remR = (double) ( rcyl - ( (binR - 1) * m_gridSizeR ) );
-  double brdz = (m_BrArray[binZ+1][binR] - brmin) / m_gridSizeZ;
-  double brdr = (m_BrArray[binZ][binR+1] - brmin) / m_gridSizeR;

+  int izfar = 0;
+  if(iz>=m_numBinsZ) {
+    izfar = 1;
+    iz = m_numBinsZ;
+  }

-  double remZ = (double) fabs(z) - ( (binZ - 1) * m_gridSizeZ );
-  double bzdz = (m_BzArray[binZ+1][binR] - bzmin) / m_gridSizeZ;
-  double bzdr = (m_BzArray[binZ][binR+1] - bzmin) / m_gridSizeR;

+  double bz0 = m_BzArray[iz][ir];
+  double br0 = m_BrArray[iz][ir];

-  double bz = bzmin + bzdz * remZ + bzdr * remR;
-  double br = brmin + brdz * remZ + brdr * remR;

+  //cout << "bz0 " << bz0 << " br0 " << br0 << endl;

-  double theta = atan2(Point[1], Point[0]);
-  double bx = br * cos(theta);
-  double by = br * sin(theta);

+  double delz = 0.;
+  double delr = 0.;

-  Bfield[0] = bx;
-  Bfield[1] = by;
-  Bfield[2] = bz;

+  double brdz = 0.;
+  double brdr = 0.;

-  /* flip sign for negative z */
-  if ( Point[2] < 0. ) {
-    Bfield[2] = -Bfield[2];

+  if(r>0.0) {
+    delr = r - float(ir) * m_gridSizeR;
+    brdz = (m_BrArray[iz+1][ir]-br0)/m_gridSizeZ;
+    brdr = (m_BrArray[iz][ir+1]-br0)/m_gridSizeR;
+    std::cout << "br= " << m_BrArray[iz+1][ir] << " " << m_BrArray[iz][ir+1] << std::endl;

-  // DEBUG: prints
-  std::cout << "brmin = " << brmin << std::endl;
-  std::cout << "bzmin = " << bzmin << std::endl;
-  std::cout << "remR = " << remR << std::endl;
-  std::cout << "brdz = " << brdz << std::endl;
-  std::cout << "brdr = " << brdr << std::endl;
-  std::cout << "bzdz = " << bzdz << std::endl;
-  std::cout << "bzdr = " << bzdr << std::endl;
-  std::cout << "bz = " << bz << std::endl;
-  std::cout << "br = " << br << std::endl;
-  std::cout << "Bfield = " << Bfield[0] << ", " << Bfield[1] << ", " << Bfield[2] << std::endl;
-}
-
-void G4RZFieldMap::addRZB(double r, double z, double Br, double Bz)
-{
-  //  std::cout << "adding --> r z Br Bz = " << r << " " << z << " " << Br << " " << Bz << std::endl;
-  if ( !m_madeArray ) {
-    m_rows.push_back(G4RZB(r, z, Br, Bz));
-  }
-  else {
-    std::cerr << "ERROR: Additional m_rows not allowed once G4RZFieldMap::makeArray() has been called." << std::endl;
-  }
-}

+  delz = fabs(z) - float(iz) * m_gridSizeZ;

-void G4RZFieldMap::makeArray(bool clearM_Rows)
-{
-  if ( !m_madeArray ) {

+  //cout << " z " << z << " abs(z) " << abs(z) << " iz " << iz << endl;
+  //cout << " float(iz-1) " << float(iz-1) << " dz " << dz << endl;
+  //cout << " delz " << delz << endl;

-    /* Make two 2D arrays of numBinsR x numBinsZ */
-    m_BrArray = new double*[m_numBinsR];
-    m_BzArray = new double*[m_numBinsR];

+  double bzdz = (m_BzArray[iz+1][ir]-bz0)/m_gridSizeZ;
+  double bzdr = (m_BzArray[iz][ir+1]-bz0)/m_gridSizeR;

-    for (size_t i=0; i<m_numBinsR; i++) {
-      m_BrArray[i] = new double[m_numBinsZ];
-      m_BzArray[i] = new double[m_numBinsZ];
-    }

+  //cout << "bz= " << bz[iz+1][ir] << " " << bz[iz][ir+1] << endl;

-    /* Init arrays to all 0's */
-    for ( size_t i=0; i<m_numBinsR; i++) {
-      for ( size_t j=0; j<m_numBinsZ; j++) {
-	m_BrArray[i][j]=0;
-	m_BzArray[i][j]=0;
-      }
-    }

+  if(izfar==1) {
+    hz = bz0+bzdr*delr;
+    hr = br0+brdr*delr;
+  }
+  else {
+    hz = bz0+bzdz*delz+bzdr*delr;
+    hr = br0+brdz*delz+brdr*delr;
+  }

-    /* Fill arrays with values from object vector. */
-    size_t binR = 0;
-    size_t binZ = 0;
-    for ( RowsType::const_iterator iter = m_rows.begin();
-	  iter != m_rows.end();
-	  iter++ ) {
-
-      /* Compute the r bin. */
-      binR = (size_t) floor( (*iter).r() / m_gridSizeR );
-
-      double r = (*iter).r();
-      if ( r == m_spanR ) {
-	binR -= 1;
-      }
-      else if ( r > m_spanR ) {
-	G4Exception("r value is > spanR");
-      }
-
-      std::cout << std::endl;
-      std::cout << "r = " << (*iter).r() << std::endl;
-      std::cout << "binR = " << binR << std::endl;
-
-      /* r overflow? */
-      if ( binR > ( m_numBinsR - 1 ) ) {
-	G4Exception("OVERFLOW: R bin > numBinsR - 1");
-      }
-
-      /*
-       * Compute z bin, normalized to positive value.
-       * Forces z symmetry w.r.t. the +/- z halves.
-      */
-      double z = fabs((*iter).z());
-      binZ = (size_t) floor( z / m_gridSizeZ );
-
-      /* If Z value is equal to spanZ, set to last z bin. */
-      if (z == m_spanZ) {
-	binZ -= 1;
-      }
-      else if ( z > m_spanZ ) {
-	G4Exception("z value is > spanZ");
-      }
-
-      std::cout << "z = " << z << std::endl;
-      std::cout << "binZ = " << binZ << std::endl;
-
-      /* z overflow? */
-      if ( binZ > ( m_numBinsZ - 1) ) {
-	G4Exception("OVERFLOW: Z bin > numBinsZ - 1");
-      }

+  if(z<0.0) hr = -hr;

-      /* Assign Bz and Br array values. */
-      std::cout << "setting r,z bins = " << binR << ", " << binZ << std::endl;

+  double theta = atan2(Point[1], Point[0]);
+  double hx = hr * cos(theta);
+  double hy = hr * sin(theta);

-      m_BrArray[binR][binZ] = (*iter).Bz();
-      m_BzArray[binR][binZ] = (*iter).Br();

+  Bfield[0] = hx;
+  Bfield[1] = hy;
+  Bfield[2] = hz;

-      std::cout << "br[r][z] = " << m_BrArray[binR][binZ] << std::endl;
-      std::cout << "br[r][z] = " << m_BzArray[binR][binZ] << std::endl;
-    }

+  /* flip sign for negative z */
+  if ( Point[2] < 0. ) {
+    Bfield[2] = -Bfield[2];
+  }
+}

-    /* clear object vector m_rows */
-    if ( clearM_Rows ) {
-      m_rows.clear();

+void G4RZFieldMap::initializeArrays()
+{
+  /* Make two 2D arrays of numBinsR x numBinsZ */
+  m_BrArray = new double*[m_numBinsR];
+  m_BzArray = new double*[m_numBinsR];
+
+  for (int i=0; i<m_numBinsR; i++) {
+    m_BrArray[i] = new double[m_numBinsZ];
+    m_BzArray[i] = new double[m_numBinsZ];
+  }
+
+  /* Init arrays to all 0's */
+  for ( int i=0; i<m_numBinsR; i++) {
+    for ( int j=0; j<m_numBinsZ; j++) {
+      m_BrArray[i][j]=0;
+      m_BzArray[i][j]=0;

-
-    m_madeArray = true;
-  }
-    else {
-    std::cerr << "WARNING: Ignoring additional call to G4RZFieldMap::makeArray()." << std::endl;

   }
 }

Commit in `lcdd` on MAIN
`include/RZBData.hh`	+59		added 1.1
`/G4RZFieldMap.hh`	+13	-22	1.3 -> 1.4
`/RZFieldMapType.hh`	+11	-11	1.2 -> 1.3
`/G4RZB.hh`		-59	1.2 removed
`schemas/lcdd/1.0/lcdd_fields.xsd`	+2	-2	1.3 -> 1.4
`src/G4RZFieldMap.cc`	+116	-183	1.4 -> 1.5
`/rz_field_mapProcess.cc`	+3	-3	1.2 -> 1.3
`/rz_field_mapSubscriber.cc`	+13	-20	1.3 -> 1.4
	+217	-300