slicPandora/include
diff -u -r1.5 -r1.6
--- PfoConstructionAlgorithm.h 31 Jan 2011 22:26:42 -0000 1.5
+++ PfoConstructionAlgorithm.h 9 Jul 2012 16:57:02 -0000 1.6
@@ -1,10 +1,13 @@
-// $Id: PfoConstructionAlgorithm.h,v 1.5 2011/01/31 22:26:42 stanitzk Exp $
+// $Id: PfoConstructionAlgorithm.h,v 1.6 2012/07/09 16:57:02 grefe Exp $
/**
* @file PandoraPFANew/include/Algorithms/PfoConstructionAlgorithm.h
*
* @brief Header file for the pfo construction algorithm class.
*
* $Log: PfoConstructionAlgorithm.h,v $
+ * Revision 1.6 2012/07/09 16:57:02 grefe
+ * fixed name space for tiny xml classes which changed in pandoraPFA
+ *
* Revision 1.5 2011/01/31 22:26:42 stanitzk
*
*
@@ -49,7 +52,7 @@
private:
pandora::StatusCode Run();
- pandora::StatusCode ReadSettings(const TiXmlHandle xmlHandle);
+ pandora::StatusCode ReadSettings(const pandora::TiXmlHandle xmlHandle);
// Member variables here
};
slicPandora/src
diff -u -r1.3 -r1.4
--- LcioInputCollectionSettings.cpp 19 Sep 2011 20:33:42 -0000 1.3
+++ LcioInputCollectionSettings.cpp 9 Jul 2012 16:57:02 -0000 1.4
@@ -1,4 +1,4 @@
-// $Id: LcioInputCollectionSettings.cpp,v 1.3 2011/09/19 20:33:42 jeremy Exp $
+// $Id: LcioInputCollectionSettings.cpp,v 1.4 2012/07/09 16:57:02 grefe Exp $
#include "LcioInputCollectionSettings.h"
std::string LcioInputCollectionSettings::emBarrel = "EM_BARREL";
@@ -42,7 +42,7 @@
try
{
- TiXmlDocument xmlDoc(xmlFileName);
+ pandora::TiXmlDocument xmlDoc(xmlFileName);
if (!xmlDoc.LoadFile())
{
@@ -50,12 +50,12 @@
throw pandora::StatusCodeException(pandora::STATUS_CODE_FAILURE);
}
- const TiXmlHandle pXmlDocHandle(&xmlDoc);
- const TiXmlHandle pXmlHandle = TiXmlHandle(pXmlDocHandle.FirstChildElement().Element());
+ const pandora::TiXmlHandle pXmlDocHandle(&xmlDoc);
+ const pandora::TiXmlHandle pXmlHandle = pandora::TiXmlHandle(pXmlDocHandle.FirstChildElement().Element());
// Loop over CaloCollection elements.
std::cout << "Using these CalorimeterHit collections ..." << std::endl;
- for (TiXmlElement* pXmlElement = pXmlHandle.FirstChild("CaloCollection").Element(); NULL != pXmlElement;
+ for (pandora::TiXmlElement* pXmlElement = pXmlHandle.FirstChild("CaloCollection").Element(); NULL != pXmlElement;
pXmlElement = pXmlElement->NextSiblingElement("CaloCollection"))
{
std::cout << pXmlElement->Attribute("name") << " with type " << pXmlElement->Attribute("caloType") << std::endl;
@@ -75,7 +75,7 @@
std::cout << std::endl;
// Track collection.
- TiXmlElement* pTrackCollElement = pXmlHandle.FirstChild("TrackCollection").Element();
+ pandora::TiXmlElement* pTrackCollElement = pXmlHandle.FirstChild("TrackCollection").Element();
if (pTrackCollElement != NULL)
{
std::cout << "Using this TrackCollection ..." << std::endl;
@@ -94,7 +94,7 @@
// TrackState setup.
std::cout << "Checking for custom TrackState collection settings ..." << std::endl;
- for (TiXmlElement* pXmlElement = pXmlHandle.FirstChild("TrackStateCollection").Element(); NULL != pXmlElement;
+ for (pandora::TiXmlElement* pXmlElement = pXmlHandle.FirstChild("TrackStateCollection").Element(); NULL != pXmlElement;
pXmlElement = pXmlElement->NextSiblingElement("TrackStateCollection"))
{
if (pXmlElement->Attribute("name") == NULL)
slicPandora/src
diff -u -r1.28 -r1.29
--- DetectorGeometry.cpp 13 Dec 2011 22:18:54 -0000 1.28
+++ DetectorGeometry.cpp 9 Jul 2012 16:57:02 -0000 1.29
@@ -27,7 +27,7 @@
void DetectorGeometry::loadFromFile(std::string filename)
{
// Load doc and check if valid.
- TiXmlDocument doc(filename.c_str());
+ pandora::TiXmlDocument doc(filename.c_str());
if (!doc.LoadFile())
{
printf("line %i:::%s\n", doc.ErrorRow(), doc.ErrorDesc());
@@ -35,10 +35,10 @@
}
// Get the root element.
- TiXmlElement* root = doc.RootElement();
+ pandora::TiXmlElement* root = doc.RootElement();
// Get the name of the detector.
- TiXmlElement* detector = root->FirstChildElement("detector");
+ pandora::TiXmlElement* detector = root->FirstChildElement("detector");
if (detector->Attribute("name") != NULL)
{
detectorName = detector->Attribute("name");
@@ -49,8 +49,8 @@
}
// Process the calorimeter elements.
- TiXmlElement* calorimeters = root->FirstChildElement("calorimeters");
- TiXmlElement* calElem = (TiXmlElement*) calorimeters->FirstChild("calorimeter");
+ pandora::TiXmlElement* calorimeters = root->FirstChildElement("calorimeters");
+ pandora::TiXmlElement* calElem = (pandora::TiXmlElement*) calorimeters->FirstChild("calorimeter");
for ( ;
calElem;
calElem = calElem->NextSiblingElement() )
@@ -128,12 +128,12 @@
}
// Number of layers.
- TiXmlElement* layers = (TiXmlElement*) calElem->FirstChild("layers");
+ pandora::TiXmlElement* layers = (pandora::TiXmlElement*) calElem->FirstChild("layers");
layers->QueryIntAttribute("nlayers", &nlayers);
subdet->m_nLayers = nlayers;
// Process layer elements.
- TiXmlElement* layerElem = layers->FirstChildElement();
+ pandora::TiXmlElement* layerElem = layers->FirstChildElement();
for (;
layerElem;
layerElem = layerElem->NextSiblingElement() )
@@ -194,8 +194,8 @@
// Setup the IDDecoder.
IDDecoder::IDFields fields;
- TiXmlElement* idElem = (TiXmlElement*) calElem->FirstChild("id");
- TiXmlElement* fieldElem = (TiXmlElement*) idElem->FirstChild("field");
+ pandora::TiXmlElement* idElem = (pandora::TiXmlElement*) calElem->FirstChild("id");
+ pandora::TiXmlElement* fieldElem = (pandora::TiXmlElement*) idElem->FirstChild("field");
for (;
fieldElem;
fieldElem = fieldElem->NextSiblingElement())
@@ -276,7 +276,7 @@
}
// Tracking parameters.
- TiXmlElement* tracking = root->FirstChildElement("tracking");
+ pandora::TiXmlElement* tracking = root->FirstChildElement("tracking");
float tinnerR, touterR, tz;
tinnerR = touterR = tz = 0.f;
tracking->QueryFloatAttribute("innerR", &tinnerR);
@@ -296,7 +296,7 @@
#endif
// Coil and B-field.
- TiXmlElement* coil = root->FirstChildElement("coil");
+ pandora::TiXmlElement* coil = root->FirstChildElement("coil");
float cinnerR, couterR, cz, bfield, coilRadLen = 0.f, coilIntLen = 0.f;
cinnerR = couterR = cz = bfield = 0.;
coil->QueryFloatAttribute("innerR", &cinnerR);