lcdd/src
diff -u -r1.8 -r1.9
--- LCDDParser.cc 19 Jun 2007 23:55:05 -0000 1.8
+++ LCDDParser.cc 25 Jan 2008 23:16:56 -0000 1.9
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/LCDDParser.cc,v 1.8 2007/06/19 23:55:05 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/LCDDParser.cc,v 1.9 2008/01/25 23:16:56 jeremy Exp $
#include "LCDDParser.hh"
// lcdd
@@ -16,163 +16,163 @@
LCDDParser* LCDDParser::m_instance = 0;
LCDDParser::LCDDParser()
- : m_URI(""),
- m_setupName(""),
- m_version(""),
- m_initialized(false),
- m_constructed(false),
- m_setURI(false)
+ : m_URI(""),
+ m_setupName(""),
+ m_version(""),
+ m_initialized(false),
+ m_constructed(false),
+ m_setURI(false)
{}
LCDDParser* LCDDParser::instance()
{
- if (m_instance == 0) {
- m_instance = new LCDDParser();
- }
+ if (m_instance == 0) {
+ m_instance = new LCDDParser();
+ }
- return m_instance;
+ return m_instance;
}
LCDDParser::~LCDDParser()
{
- finalize();
+ finalize();
}
void LCDDParser::setupParserConfig()
{
- setupParserConfig(m_URI,
- m_setupName,
- m_version);
+ setupParserConfig(m_URI,
+ m_setupName,
+ m_version);
}
void LCDDParser::setupParserConfig(const std::string& URI,
- const std::string& setupName,
- const std::string& version)
+ const std::string& setupName,
+ const std::string& version)
{
- static const G4String DefaultSetupName("Default");
+ //static const G4String DefaultSetupName("Default");
- if (setupName == std::string("") ) {
- G4cout << "Using default SetupName <" << DefaultSetupName << ">" << G4endl;
- m_setupName = DefaultSetupName;
- }
-
- // settings from messenger commands
- std::cout << "LCDD URI <" << m_URI << ">" << std::endl;
- std::cout << "SetupName <" << m_setupName << ">" << std::endl;
- std::cout << "Version <" << m_version << ">" << std::endl;
-
- // set configuration vals
- m_config.SetURI(URI);
- m_config.SetSetupName(setupName);
- m_config.SetSetupVersion(version);
+ //if (setupName == std::string("") ) {
+ // G4cout << "Using default SetupName <" << DefaultSetupName << ">" << G4endl;
+ // m_setupName = DefaultSetupName;
+ //}
+
+ // settings from messenger commands
+ std::cout << "LCDD URI <" << m_URI << ">" << std::endl;
+ //std::cout << "SetupName <" << m_setupName << ">" << std::endl;
+ std::cout << "Version <" << m_version << ">" << std::endl;
+
+ // set configuration vals
+ m_config.SetURI(URI);
+ //m_config.SetSetupName(setupName);
+ m_config.SetSetupVersion(version);
- // set config in parser
- m_sxp.Configure(&m_config);
+ // set config in parser
+ m_sxp.Configure(&m_config);
}
void LCDDParser::initializeParser()
{
- // standard SAX parser init
- m_sxp.Initialize();
+ // standard SAX parser init
+ m_sxp.Initialize();
- // load custom LCDD tag handlers
- LCDDLibLoad();
+ // load custom LCDD tag handlers
+ LCDDLibLoad();
- addVolumeExtendedSubscriber();
+ addVolumeExtendedSubscriber();
}
void LCDDParser::initialize()
{
- if (!m_initialized) {
- initializeParser();
- m_initialized = true;
- }
+ if (!m_initialized) {
+ initializeParser();
+ m_initialized = true;
+ }
}
G4VPhysicalVolume* LCDDParser::construct()
{
- if (!m_constructed) {
+ if (!m_constructed) {
- // initialize
- initialize();
+ // initialize
+ initialize();
- // set GDML parser params from inst vars
- setupParserConfig();
+ // set GDML parser params from inst vars
+ setupParserConfig();
- // run the parser
- m_sxp.Run();
+ // run the parser
+ m_sxp.Run();
- // get world volume from GDML
- m_world = (G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume();
+ // get world volume from GDML
+ m_world = (G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume();
- // die immediately if no world volume
- if (m_world == 0) {
- G4Exception("GDML failed to construct the world volume.");
- }
+ // die immediately if no world volume
+ if (m_world == 0) {
+ G4Exception("GDML failed to construct the world volume.");
+ }
- // Setup magnetic field.
- LCDDFieldManager::instance()->setup();
+ // Setup magnetic field.
+ LCDDFieldManager::instance()->setup();
- // should only happen once
- m_constructed = true;
- }
- else {
- std::cerr << "LCDD geometry was already constructed." << std::endl;
- }
+ // should only happen once
+ m_constructed = true;
+ }
+ else {
+ std::cerr << "LCDD geometry was already constructed." << std::endl;
+ }
- return m_world;
+ return m_world;
}
void LCDDParser::finalize()
{
- m_sxp.Finalize();
+ m_sxp.Finalize();
}
void LCDDParser::setURI(std::string URI)
{
- m_URI = URI;
- m_setURI = true;
+ m_URI = URI;
+ m_setURI = true;
}
void LCDDParser::setSetupName(std::string setupName)
{
- m_setupName = setupName;
+ m_setupName = setupName;
}
void LCDDParser::setVersion(std::string version)
{
- m_version = version;
+ m_version = version;
}
const std::string& LCDDParser::URI()
{
- return m_URI;
+ return m_URI;
}
const std::string& LCDDParser::setupName()
{
- return m_setupName;
+ return m_setupName;
}
const std::string& LCDDParser::version()
{
- return m_version;
+ return m_version;
}
void LCDDParser::setWorld(G4VPhysicalVolume *world)
{
- m_world = world;
+ m_world = world;
}
bool LCDDParser::isValidSetup()
{
- bool valid = true;
+ bool valid = true;
- if ( !m_setURI ) {
- valid = false;
- }
+ if ( !m_setURI ) {
+ valid = false;
+ }
- return valid;
+ return valid;
}
#include "Saxana/RCObjectHandle.h"
@@ -183,9 +183,9 @@
void LCDDParser::addVolumeExtendedSubscriber()
{
- RCObjectHandle<SAXSubscriber> obj;
- obj = new volumeExtendedSubscriber();
- SAXSubscriberPool* pool = const_cast<SAXSubscriberPool*> ( m_sxp.GetSubscriberPool() );
- pool->AddSubscriber("volume",obj);
+ RCObjectHandle<SAXSubscriber> obj;
+ obj = new volumeExtendedSubscriber();
+ SAXSubscriberPool* pool = const_cast<SAXSubscriberPool*> ( m_sxp.GetSubscriberPool() );
+ pool->AddSubscriber("volume",obj);
}
