diff --git a/MagneticField/MagFieldElements/MagFieldElements/BFieldMesh.icc b/MagneticField/MagFieldElements/MagFieldElements/BFieldMesh.icc index 2a59bd862ce6c30c7c9aa2675da4747c85cec5f5..114bffa4fdcebe9052d81b1141c4203aea1d765b 100644 --- a/MagneticField/MagFieldElements/MagFieldElements/BFieldMesh.icc +++ b/MagneticField/MagFieldElements/MagFieldElements/BFieldMesh.icc @@ -76,25 +76,23 @@ BFieldMesh<T>::getCache(double z, // store the B field at the 8 corners const int im0 = iz * m_zoff + ir * m_roff + iphi; // index of the first corner - if (!m_doNew) { - - std::array<BFieldVector<T>, 8> field = { - m_field[im0], - m_field[im0 + 1], - m_field[im0 + m_roff], - m_field[im0 + m_roff + 1], - m_field[im0 + m_zoff], - m_field[im0 + m_zoff + 1], - m_field[im0 + m_zoff + m_roff], - m_field[im0 + m_zoff + m_roff + 1] - }; + + // ** The following field initialization is commented out, and replaced by subsequent matrix + // ** initialization as optimization test + - cache.setField(field, scaleFactor); + // std::array<BFieldVector<T>, 8> field = { + // m_field[im0], + // m_field[im0 + 1], + // m_field[im0 + m_roff], + // m_field[im0 + m_roff + 1], + // m_field[im0 + m_zoff], + // m_field[im0 + m_zoff + 1], + // m_field[im0 + m_zoff + m_roff], + // m_field[im0 + m_zoff + m_roff + 1] + // }; - } - else { - - // cache.printField(); + // cache.setField(field, scaleFactor); const double sf = scaleFactor; @@ -126,12 +124,6 @@ BFieldMesh<T>::getCache(double z, }; cache.setField(field1); - // cache.printField(); - - } - - - // store the B scale cache.setBscale(m_scale); }