lcdd/include

diff -u -r1.2 -r1.3
--- FieldMap3DType.hh	3 Oct 2012 17:23:40 -0000	1.2
+++ FieldMap3DType.hh	3 Oct 2012 17:53:00 -0000	1.3
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/include/FieldMap3DType.hh,v 1.2 2012/10/03 17:23:40 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/include/FieldMap3DType.hh,v 1.3 2012/10/03 17:53:00 jeremy Exp $

 #ifndef LCDD_FIELDMAP3DTYPE_HH
 #define LCDD_FIELDMAP3DTYPE_HH 1
 

@@ -24,6 +24,10 @@

     	_filename = filename;
     }
 

+    const std::string& get_filename() const {
+    	return _filename;
+    }
+

 private:
 
     std::string _filename;

lcdd/src

diff -u -r1.2 -r1.3
--- field_map_3dProcess.cc	3 Oct 2012 17:23:40 -0000	1.2
+++ field_map_3dProcess.cc	3 Oct 2012 17:53:01 -0000	1.3
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/src/field_map_3dProcess.cc,v 1.2 2012/10/03 17:23:40 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/src/field_map_3dProcess.cc,v 1.3 2012/10/03 17:53:01 jeremy Exp $

 
 #include "FieldMapTypeProcess.hh"
 #include <iostream>

@@ -43,7 +43,7 @@

     }
 
     virtual void StackPopNotify(const std::string& name) {

-        std::cout << "field_map_3d::StackPopNotify" << std::endl;

+        //std::cout << "field_map_3d::StackPopNotify" << std::endl;

         FieldMapTypeProcess::StackPopNotify(name);
     }
 

lcdd/src

diff -u -r1.1 -r1.2
--- field_map_3dSubscriber.cc	3 Oct 2012 00:48:25 -0000	1.1
+++ field_map_3dSubscriber.cc	3 Oct 2012 17:53:01 -0000	1.2
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/src/field_map_3dSubscriber.cc,v 1.1 2012/10/03 00:48:25 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/src/field_map_3dSubscriber.cc,v 1.2 2012/10/03 17:53:01 jeremy Exp $

 
 // gdml
 #include "Saxana/SAXSubscriber.h"

@@ -35,7 +35,7 @@

 
 	virtual void Activate(const SAXObject* object) {
 

-		std::cout << "field_map_3d::Subscriber" << std::endl;

+		//std::cout << "field_map_3d::Subscriber" << std::endl;

 
 		const field_map_3d* obj = dynamic_cast<const field_map_3d*>(object);
 

@@ -46,12 +46,13 @@

 				if (obj) {
 
 					//GDMLExpressionEvaluator* calc = GDMLProcessor::GetInstance()->GetEvaluator();

-

 					//std::string lunit = obj->get_lunit();
 					//std::string funit = obj->get_funit();

+

 					std::string name = obj->get_name();

+					std::string field_name = obj->get_filename();

-					Cartesian3DMagneticFieldMap* fmap = new Cartesian3DMagneticFieldMap("ThreeDFieldMap.dat", 0, 0, 0);

+					Cartesian3DMagneticFieldMap* fmap = new Cartesian3DMagneticFieldMap(field_name.c_str(), 0, 0, 0);

 					LCDDProcessor::instance()->addMagneticField(name, fmap);
 				}
 			}