diff -u -r1.17 -r1.18
--- PfoProcessor.cpp	31 Jan 2011 22:26:43 -0000	1.17
+++ PfoProcessor.cpp	7 Sep 2011 22:40:07 -0000	1.18
@@ -1,4 +1,4 @@

-// $Id: PfoProcessor.cpp,v 1.17 2011/01/31 22:26:43 stanitzk Exp $

+// $Id: PfoProcessor.cpp,v 1.18 2011/09/07 22:40:07 jeremy Exp $

 #include "PfoProcessor.h"
 
 // lcio

@@ -45,27 +45,36 @@

     // Make a container for the clusters.
     LCCollectionVec* clusterVec = new LCCollectionVec(EVENT::LCIO::CLUSTER);
 

-

     // Set flag for pointing back to CalorimeterHits.
     LCFlagImpl clusterFlag(0);
     clusterFlag.setBit(EVENT::LCIO::CLBIT_HITS);
     clusterVec->setFlag(clusterFlag.getFlag());
 
     // Get Pandora's list of PFOs.

-    pandora::ParticleFlowObjectList particleFlowObjectList;
-    PANDORA_THROW_RESULT_IF_AND_IF(pandora::STATUS_CODE_SUCCESS, pandora::STATUS_CODE_NOT_INITIALIZED, !=, PandoraApi::GetParticleFlowObjects(getJobManager()->getPandora(),
-                                                                                                                            particleFlowObjectList));

+    //pandora::ParticleFlowObjectList particleFlowObjectList;
+/*
+    pandora::PfoList particleFlowObjectList;
+    PANDORA_THROW_RESULT_IF_AND_IF(
+        pandora::STATUS_CODE_SUCCESS, 
+	pandora::STATUS_CODE_NOT_INITIALIZED, 
+        !=, 
+	PandoraApi::GetCurrentPfoList(),
+//GetParticleFlowObjects(getJobManager()->getPandora(),
+        particleFlowObjectList);

 #ifdef PFOPROCESSOR_DEBUG
     std::cout << "Pandora found " << particleFlowObjectList.size() << " PFOs in event <" << event->getEventNumber() << ">." << std::endl;
 #endif

+*/
+    // Get current Pfo list.
+    //pandora::PfoList pfoList;
+    const pandora::PfoList *pfoList = NULL;
+    PandoraApi::GetCurrentPfoList(getJobManager()->getPandora(), pfoList);

 
     // Make a container for the ReconstructedParticles.
     LCCollectionVec* pReconstructedParticleCollection = new LCCollectionVec(EVENT::LCIO::RECONSTRUCTEDPARTICLE);
 
     // Iterate over Pandora's PFO objects to create LCIO ReconstructedParticles.

-    for (pandora::ParticleFlowObjectList::iterator itPFO = particleFlowObjectList.begin(), itPFOEnd = particleFlowObjectList.end();
-         itPFO != itPFOEnd; 
-         ++itPFO)

+    for (pandora::PfoList::iterator itPFO = pfoList->begin(), itPFOEnd = pfoList->end(); itPFO != itPFOEnd; ++itPFO)

     {
 #ifdef PFOPROCESSOR_DEBUG
         std::cout << std::endl << "proc PFO: " << (int)(&(*itPFO)) << std::endl;