slicPandora/src

diff -u -r1.2 -r1.3
--- SimpleBFieldCalculator.cpp	5 Nov 2010 14:16:06 -0000	1.2
+++ SimpleBFieldCalculator.cpp	16 Feb 2011 09:33:51 -0000	1.3
@@ -2,22 +2,40 @@

 
 #include "SimpleBFieldCalculator.h"
 

+#include "Helpers/GeometryHelper.h"
+

 #include <cmath>
 

+using pandora::GeometryHelper;
+

 // default values
 float SimpleBFieldCalculator::m_innerBField = 5.f;               
 float SimpleBFieldCalculator::m_muonBarrelBField = -1.5f;  // FIXME: get from the compact.xml to the pandora geometry file
 float SimpleBFieldCalculator::m_muonEndCapBField = 0.01f; // FIXME: add me to compact.xml
 
 //------------------------------------------------------------------------------------------------------------------------------------------

-

+/*

 void SimpleBFieldCalculator::Initialize(const pandora::GeometryHelper *const pGeometryHelper)
 {
     m_muonEndCapInnerZ = pGeometryHelper->GetMuonEndCapParameters().GetInnerZCoordinate();
     m_coilMidPointR = (0.5f * (pGeometryHelper->GetCoilInnerRadius() + pGeometryHelper->GetCoilOuterRadius()));

+    
+    std::cout << "muonEndCapInnerZ = " << m_muonEndCapInnerZ << std::endl;
+    std::cout << "coilMidPointR = " << m_coilMidPointR << std::endl;

 };

+*/

 
 //------------------------------------------------------------------------------------------------------------------------------------------

+void SimpleBFieldCalculator::InitializeGeometry()
+{
+    m_muonEndCapInnerZ = GeometryHelper::GetMuonEndCapParameters().GetInnerZCoordinate();
+    m_coilMidPointR = (0.5f * (GeometryHelper::GetCoilInnerRadius() + GeometryHelper::GetCoilOuterRadius()));
+
+    std::cout << std::endl;
+    std::cout << "SimpleBFieldCalculator: " << std::endl;
+    std::cout << "    muonEndCapInnerZ = " << m_muonEndCapInnerZ << std::endl;
+    std::cout << "    coilMidPointR = " << m_coilMidPointR << std::endl;
+}

 
 float SimpleBFieldCalculator::GetBField(const pandora::CartesianVector &positionVector) const
 {