10 modified files
slicPandora/include
diff -u -r1.8 -r1.9
--- JobManager.h 8 Jun 2010 22:12:42 -0000 1.8
+++ JobManager.h 24 Nov 2010 16:44:08 -0000 1.9
@@ -1,4 +1,4 @@
-// $Id: JobManager.h,v 1.8 2010/06/08 22:12:42 jeremy Exp $
+// $Id: JobManager.h,v 1.9 2010/11/24 16:44:08 speckmay Exp $
#ifndef JobManager_h
#define JobManager_h 1
@@ -88,12 +88,12 @@
/**
* Create Pandora's algorithm generators.
*/
- StatusCode registerUserAlgorithmFactories();
+ pandora::StatusCode registerUserAlgorithmFactories();
/**
* Create the geometry from the XML geometry file.
*/
- StatusCode createGeometry();
+ pandora::StatusCode createGeometry();
private:
JobConfig* m_config;
slicPandora/include
diff -u -r1.3 -r1.4
--- PfoConstructionAlgorithm.h 8 Jun 2010 21:43:02 -0000 1.3
+++ PfoConstructionAlgorithm.h 24 Nov 2010 16:44:08 -0000 1.4
@@ -1,10 +1,13 @@
-// $Id: PfoConstructionAlgorithm.h,v 1.3 2010/06/08 21:43:02 jeremy Exp $
+// $Id: PfoConstructionAlgorithm.h,v 1.4 2010/11/24 16:44:08 speckmay Exp $
/**
* @file PandoraPFANew/include/Algorithms/PfoConstructionAlgorithm.h
*
* @brief Header file for the pfo construction algorithm class.
*
* $Log: PfoConstructionAlgorithm.h,v $
+ * Revision 1.4 2010/11/24 16:44:08 speckmay
+ * status codes are now in namespace pandora
+ *
* Revision 1.3 2010/06/08 21:43:02 jeremy
* make compatible with Pandora release1 (set PANDORA_RELEASE macro to enable); add basic code for digital calorimetry
*
@@ -38,8 +41,8 @@
};
private:
- StatusCode Run();
- StatusCode ReadSettings(const TiXmlHandle xmlHandle);
+ pandora::StatusCode Run();
+ pandora::StatusCode ReadSettings(const TiXmlHandle xmlHandle);
// Member variables here
};
slicPandora/src
diff -u -r1.14 -r1.15
--- CalorimeterHitProcessor.cpp 16 Aug 2010 18:31:13 -0000 1.14
+++ CalorimeterHitProcessor.cpp 24 Nov 2010 16:44:08 -0000 1.15
@@ -1,4 +1,4 @@
-// $Id: CalorimeterHitProcessor.cpp,v 1.14 2010/08/16 18:31:13 jeremy Exp $
+// $Id: CalorimeterHitProcessor.cpp,v 1.15 2010/11/24 16:44:08 speckmay Exp $
#include "CalorimeterHitProcessor.h"
@@ -61,7 +61,7 @@
printCaloHitParameters(caloHitParams);
#endif
- PANDORA_THROW_RESULT_IF(STATUS_CODE_SUCCESS, !=, PandoraApi::CaloHit::Create(pandora, caloHitParams));
+ PANDORA_THROW_RESULT_IF(pandora::STATUS_CODE_SUCCESS, !=, PandoraApi::CaloHit::Create(pandora, caloHitParams));
}
#ifdef CALO_PARAMS_DEBUG
std::cout << "-----------------------------------------------------" << std::endl;
slicPandora/src
diff -u -r1.10 -r1.11
--- JobManager.cpp 1 Nov 2010 17:04:21 -0000 1.10
+++ JobManager.cpp 24 Nov 2010 16:44:08 -0000 1.11
@@ -45,22 +45,22 @@
m_pandora = new pandora::Pandora();
// Create the slicPandora DetectorGeometry.
- PANDORA_THROW_RESULT_IF(STATUS_CODE_SUCCESS, !=, createGeometry());
+ PANDORA_THROW_RESULT_IF(pandora::STATUS_CODE_SUCCESS, !=, createGeometry());
// create a new bfield calculator
- PANDORA_THROW_RESULT_IF(STATUS_CODE_SUCCESS, !=, PandoraApi::SetBFieldCalculator(*m_pandora, new SimpleBFieldCalculator()));
+ PANDORA_THROW_RESULT_IF(pandora::STATUS_CODE_SUCCESS, !=, PandoraApi::SetBFieldCalculator(*m_pandora, new SimpleBFieldCalculator()));
// create a new pseudo layer calculator
- PANDORA_THROW_RESULT_IF(STATUS_CODE_SUCCESS, !=, PandoraApi::SetPseudoLayerCalculator(*m_pandora, new pandora::HighGranularityPseudoLayerCalculator()));
+ PANDORA_THROW_RESULT_IF(pandora::STATUS_CODE_SUCCESS, !=, PandoraApi::SetPseudoLayerCalculator(*m_pandora, new pandora::HighGranularityPseudoLayerCalculator()));
// Create the GeometryParameters within Pandora.
- PANDORA_THROW_RESULT_IF(STATUS_CODE_SUCCESS, !=, PandoraApi::Geometry::Create(*m_pandora, *m_detectorGeometry->getGeometryParameters()));
+ PANDORA_THROW_RESULT_IF(pandora::STATUS_CODE_SUCCESS, !=, PandoraApi::Geometry::Create(*m_pandora, *m_detectorGeometry->getGeometryParameters()));
// Register the the user algorithm factories with Pandora.
- PANDORA_THROW_RESULT_IF(STATUS_CODE_SUCCESS, !=, registerUserAlgorithmFactories());
+ PANDORA_THROW_RESULT_IF(pandora::STATUS_CODE_SUCCESS, !=, registerUserAlgorithmFactories());
// Read the run control settings into Pandora.
- PANDORA_THROW_RESULT_IF(STATUS_CODE_SUCCESS, !=, PandoraApi::ReadSettings(*m_pandora, m_config->getPandoraSettingsXmlFile()));
+ PANDORA_THROW_RESULT_IF(pandora::STATUS_CODE_SUCCESS, !=, PandoraApi::ReadSettings(*m_pandora, m_config->getPandoraSettingsXmlFile()));
}
void JobManager::setJobConfig(JobConfig* config)
@@ -79,19 +79,19 @@
m_processors.push_back(processor);
}
-StatusCode JobManager::registerUserAlgorithmFactories()
+pandora::StatusCode JobManager::registerUserAlgorithmFactories()
{
pandora::AlgorithmFactory* pfac = new PfoConstructionAlgorithm::Factory();
PandoraApi::RegisterAlgorithmFactory(*m_pandora, "PFO_Construction", pfac);
- return STATUS_CODE_SUCCESS;
+ return pandora::STATUS_CODE_SUCCESS;
}
-StatusCode JobManager::createGeometry()
+pandora::StatusCode JobManager::createGeometry()
{
m_detectorGeometry = new DetectorGeometry(m_config->getGeometryFile());
m_geometryLoaded = true;
- return STATUS_CODE_SUCCESS;
+ return pandora::STATUS_CODE_SUCCESS;
}
DetectorGeometry* JobManager::getDetectorGeometry()
slicPandora/src
diff -u -r1.1 -r1.2
--- MCParticleProcessor.cpp 24 Sep 2010 07:22:50 -0000 1.1
+++ MCParticleProcessor.cpp 24 Nov 2010 16:44:08 -0000 1.2
@@ -1,4 +1,4 @@
-// $Id: MCParticleProcessor.cpp,v 1.1 2010/09/24 07:22:50 speckmay Exp $
+// $Id: MCParticleProcessor.cpp,v 1.2 2010/11/24 16:44:08 speckmay Exp $
#include "MCParticleProcessor.h"
@@ -48,7 +48,7 @@
printCaloHitParameters(mcParticleParams);
#endif
- PANDORA_THROW_RESULT_IF(STATUS_CODE_SUCCESS, !=, PandoraApi::MCParticle::Create(pandora, mcParticleParams));
+ PANDORA_THROW_RESULT_IF(pandora::STATUS_CODE_SUCCESS, !=, PandoraApi::MCParticle::Create(pandora, mcParticleParams));
}
#ifdef MCPARTICLE_PARAMS_DEBUG
std::cout << "-----------------------------------------------------" << std::endl;
@@ -71,13 +71,13 @@
mcParticleParameters.m_endpoint = pandora::CartesianVector(pMcParticle->getEndpoint()[0], pMcParticle->getEndpoint()[1],
pMcParticle->getEndpoint()[2]);
- PANDORA_THROW_RESULT_IF(STATUS_CODE_SUCCESS, !=, PandoraApi::MCParticle::Create(pandora, mcParticleParameters));
+ PANDORA_THROW_RESULT_IF(pandora::STATUS_CODE_SUCCESS, !=, PandoraApi::MCParticle::Create(pandora, mcParticleParameters));
// Create parent-daughter relationships
for(std::vector<MCParticle*>::const_iterator itDaughter = pMcParticle->getDaughters().begin(),
itDaughterEnd = pMcParticle->getDaughters().end(); itDaughter != itDaughterEnd; ++itDaughter)
{
- PANDORA_THROW_RESULT_IF(STATUS_CODE_SUCCESS, !=, PandoraApi::SetMCParentDaughterRelationship(pandora, pMcParticle,
+ PANDORA_THROW_RESULT_IF(pandora::STATUS_CODE_SUCCESS, !=, PandoraApi::SetMCParentDaughterRelationship(pandora, pMcParticle,
*itDaughter));
}
slicPandora/src
diff -u -r1.3 -r1.4
--- PandoraProcessor.cpp 11 Mar 2010 19:04:24 -0000 1.3
+++ PandoraProcessor.cpp 24 Nov 2010 16:44:08 -0000 1.4
@@ -4,14 +4,14 @@
#include "JobManager.h"
// pandora
-#include "StatusCodes.h"
+#include "Pandora/StatusCodes.h"
#include "Api/PandoraApi.h"
void PandoraProcessor::processEvent(EVENT::LCEvent*)
{
//std::cout << "PandoraProcessor::processEvent" << std::endl;
- StatusCode stat = PandoraApi::ProcessEvent(getJobManager()->getPandora());
- if (stat != STATUS_CODE_SUCCESS)
+ pandora::StatusCode stat = PandoraApi::ProcessEvent(getJobManager()->getPandora());
+ if (stat != pandora::STATUS_CODE_SUCCESS)
{
std::cerr << "PandoraApi::ProcessEvent did not succeed!" << std::endl;
exit(1);
slicPandora/src
diff -u -r1.5 -r1.6
--- PfoConstructionAlgorithm.cpp 16 Aug 2010 17:51:58 -0000 1.5
+++ PfoConstructionAlgorithm.cpp 24 Nov 2010 16:44:08 -0000 1.6
@@ -6,11 +6,11 @@
using namespace pandora;
-StatusCode PfoConstructionAlgorithm::Run()
+pandora::StatusCode PfoConstructionAlgorithm::Run()
{
// Algorithm code here
const ClusterList *pClusterList = NULL;
- PANDORA_RETURN_RESULT_IF(STATUS_CODE_SUCCESS, !=, PandoraContentApi::GetCurrentClusterList(*this, pClusterList));
+ PANDORA_RETURN_RESULT_IF(pandora::STATUS_CODE_SUCCESS, !=, PandoraContentApi::GetCurrentClusterList(*this, pClusterList));
for (ClusterList::const_iterator iter = pClusterList->begin(), iterEnd = pClusterList->end(); iter != iterEnd; ++iter)
{
@@ -28,17 +28,17 @@
// Make a new pfo for every cluster.
particleFlowObjectParameters.m_clusterList.insert(pCluster);
- PANDORA_RETURN_RESULT_IF(STATUS_CODE_SUCCESS, !=, PandoraContentApi::ParticleFlowObject::Create(*this, particleFlowObjectParameters));
+ PANDORA_RETURN_RESULT_IF(pandora::STATUS_CODE_SUCCESS, !=, PandoraContentApi::ParticleFlowObject::Create(*this, particleFlowObjectParameters));
}
- return STATUS_CODE_SUCCESS;
+ return pandora::STATUS_CODE_SUCCESS;
}
//------------------------------------------------------------------------------------------------------------------------------------------
-StatusCode PfoConstructionAlgorithm::ReadSettings(const TiXmlHandle xmlHandle)
+pandora::StatusCode PfoConstructionAlgorithm::ReadSettings(const TiXmlHandle xmlHandle)
{
// Read settings from xml file here
- return STATUS_CODE_SUCCESS;
+ return pandora::STATUS_CODE_SUCCESS;
}
slicPandora/src
diff -u -r1.15 -r1.16
--- PfoProcessor.cpp 1 Nov 2010 17:04:21 -0000 1.15
+++ PfoProcessor.cpp 24 Nov 2010 16:44:08 -0000 1.16
@@ -1,4 +1,4 @@
-// $Id: PfoProcessor.cpp,v 1.15 2010/11/01 17:04:21 speckmay Exp $
+// $Id: PfoProcessor.cpp,v 1.16 2010/11/24 16:44:08 speckmay Exp $
#include "PfoProcessor.h"
// lcio
@@ -55,7 +55,7 @@
// Get Pandora's list of PFOs.
pandora::ParticleFlowObjectList particleFlowObjectList;
- PANDORA_THROW_RESULT_IF_AND_IF(STATUS_CODE_SUCCESS, STATUS_CODE_NOT_INITIALIZED, !=, PandoraApi::GetParticleFlowObjects(getJobManager()->getPandora(),
+ PANDORA_THROW_RESULT_IF_AND_IF(pandora::STATUS_CODE_SUCCESS, pandora::STATUS_CODE_NOT_INITIALIZED, !=, PandoraApi::GetParticleFlowObjects(getJobManager()->getPandora(),
particleFlowObjectList));
#ifdef PFOPROCESSOR_DEBUG
std::cout << "Pandora found " << particleFlowObjectList.size() << " PFOs in event <" << event->getEventNumber() << ">." << std::endl;
slicPandora/src
diff -u -r1.22 -r1.23
--- SimCalorimeterHitProcessor.cpp 26 Oct 2010 08:44:10 -0000 1.22
+++ SimCalorimeterHitProcessor.cpp 24 Nov 2010 16:44:08 -0000 1.23
@@ -197,7 +197,7 @@
for (MCParticleToEnergyWeightMap::const_iterator mcParticleIter = mcParticleToEnergyWeightMap.begin(),
mcParticleIterEnd = mcParticleToEnergyWeightMap.end(); mcParticleIter != mcParticleIterEnd; ++mcParticleIter)
{
- PANDORA_THROW_RESULT_IF(STATUS_CODE_SUCCESS, !=, PandoraApi::SetCaloHitToMCParticleRelationship(pandora, calHit , mcParticleIter->first, mcParticleIter->second));
+ PANDORA_THROW_RESULT_IF(pandora::STATUS_CODE_SUCCESS, !=, PandoraApi::SetCaloHitToMCParticleRelationship(pandora, calHit , mcParticleIter->first, mcParticleIter->second));
}
// -------- add link to MCParticle --- end
slicPandora/src
diff -u -r1.17 -r1.18
--- SimpleTrackProcessor.cpp 1 Nov 2010 17:04:21 -0000 1.17
+++ SimpleTrackProcessor.cpp 24 Nov 2010 16:44:08 -0000 1.18
@@ -1,4 +1,4 @@
-// $Id: SimpleTrackProcessor.cpp,v 1.17 2010/11/01 17:04:21 speckmay Exp $
+// $Id: SimpleTrackProcessor.cpp,v 1.18 2010/11/24 16:44:08 speckmay Exp $
#include "SimpleTrackProcessor.h"
// slicPandora
@@ -142,7 +142,7 @@
// Register Track parameters with Pandora.
const pandora::Pandora& pandora = getJobManager()->getPandora();
- PANDORA_THROW_RESULT_IF(STATUS_CODE_SUCCESS, !=, PandoraApi::Track::Create(pandora, trackParameters));
+ PANDORA_THROW_RESULT_IF(pandora::STATUS_CODE_SUCCESS, !=, PandoraApi::Track::Create(pandora, trackParameters));
// Setup the Track to MCParticle relations (optional).
EVENT::TrackerHitVec trackHits = track->getTrackerHits();
@@ -187,10 +187,10 @@
if (NULL == pBestMCParticle)
continue;
- PANDORA_THROW_RESULT_IF(STATUS_CODE_SUCCESS, !=, PandoraApi::SetTrackToMCParticleRelationship(pandora, track,
+ PANDORA_THROW_RESULT_IF(pandora::STATUS_CODE_SUCCESS, !=, PandoraApi::SetTrackToMCParticleRelationship(pandora, track,
pBestMCParticle));
}
- catch (StatusCodeException &statusCodeException)
+ catch (pandora::StatusCodeException &statusCodeException)
{
std::cout << "Failed to extract track to mc particle relationship: " << statusCodeException.ToString() << std::endl;
}
CVSspam 0.2.8