slicPandora/include

diff -u -r1.1 -r1.2
--- SimpleTrackProcessor.h	17 Mar 2010 02:13:04 -0000	1.1
+++ SimpleTrackProcessor.h	26 Mar 2010 18:47:33 -0000	1.2
@@ -1,4 +1,4 @@

-// $Id: SimpleTrackProcessor.h,v 1.1 2010/03/17 02:13:04 jeremy Exp $

+// $Id: SimpleTrackProcessor.h,v 1.2 2010/03/26 18:47:33 jeremy Exp $

 #ifndef SIMPLETRACKPROCESSOR_H
 #define SIMPLETRACKPROCESSOR_H 1
 

@@ -32,7 +32,7 @@

 private:
 
     void setupTrackStatesFromRelations(PandoraApi::Track::Parameters&, EVENT::LCEvent*);

-    void setupTrackStatesFromGenericObjects(PandoraApi::Track::Parameters& trackParameters, EVENT::LCEvent* event);

+    void setupTrackStatesFromGenericObjects(PandoraApi::Track::Parameters&, EVENT::LCEvent*, int);

 
 private:
 

slicPandora/src

diff -u -r1.3 -r1.4
--- SimpleTrackProcessor.cpp	22 Mar 2010 21:50:57 -0000	1.3
+++ SimpleTrackProcessor.cpp	26 Mar 2010 18:47:33 -0000	1.4
@@ -74,7 +74,7 @@

         trackParameters.m_canFormClusterlessPfo = false;
         
         // Setup track states from GenericObject collections, assuming that the ordering matches that in the "Tracks" collection.

-        setupTrackStatesFromGenericObjects(trackParameters, event);

+        setupTrackStatesFromGenericObjects(trackParameters, event, i);

 
 #ifdef SIMPLETRACKPROCESSOR_DEBUG
         std::cout << "Track Parameters: " << std::endl;

@@ -96,48 +96,48 @@

     }
 }
 

-void SimpleTrackProcessor::setupTrackStatesFromGenericObjects(PandoraApi::Track::Parameters& trackParameters, EVENT::LCEvent* event)

+void SimpleTrackProcessor::setupTrackStatesFromGenericObjects(PandoraApi::Track::Parameters& trackParameters, EVENT::LCEvent* event, int i)

 {       
     LCCollection* startCollection = event->getCollection("StateAtStart");
     LCCollection* ecalCollection = event->getCollection("StateAtECal");
     LCCollection* endCollection = event->getCollection("StateAtEnd");
 

-    LCCollection* trackCollection = event->getCollection(trackCollectionName);
-    int ntracks = trackCollection->getNumberOfElements();
-    for (int i=0; i<ntracks; i++)
-    {

+    //LCCollection* trackCollection = event->getCollection(trackCollectionName);
+    //int ntracks = trackCollection->getNumberOfElements();
+    //for (int i=0; i<ntracks; i++)
+    //{

         // Get the LCIO Track.

-        Track* track = dynamic_cast<Track*>(trackCollection->getElementAt(i));
-
-        // Add start state.
-        LCGenericObject* startObj = dynamic_cast<LCGenericObject*>(startCollection->getElementAt(i));
-        trackParameters.m_trackStateAtStart = 
-            pandora::TrackState(startObj->getFloatVal(0), 
-                                startObj->getFloatVal(1), 
-                                startObj->getFloatVal(2), 
-                                startObj->getFloatVal(3), 
-                                startObj->getFloatVal(4), 
-                                startObj->getFloatVal(5));

+        //Track* track = dynamic_cast<Track*>(trackCollection->getElementAt(i));

-        // Add ECal state.
-        LCGenericObject* ecalObj = dynamic_cast<LCGenericObject*>(ecalCollection->getElementAt(i));
-        trackParameters.m_trackStateAtECal = 
-            pandora::TrackState(ecalObj->getFloatVal(0), 
-                                ecalObj->getFloatVal(1), 
-                                ecalObj->getFloatVal(2), 
-                                ecalObj->getFloatVal(3), 
-                                ecalObj->getFloatVal(4), 
-                                ecalObj->getFloatVal(5));
-        
-        // Add end state.
-        LCGenericObject* endObj = dynamic_cast<LCGenericObject*>(endCollection->getElementAt(i));
-        trackParameters.m_trackStateAtEnd = pandora::TrackState(endObj->getFloatVal(0), 
-                                                                 endObj->getFloatVal(1), 
-                                                                 endObj->getFloatVal(2), 
-                                                                 endObj->getFloatVal(3), 
-                                                                 endObj->getFloatVal(4), 
-                                                                 endObj->getFloatVal(5));
-    }       

+    // Add start state.
+    LCGenericObject* startObj = dynamic_cast<LCGenericObject*>(startCollection->getElementAt(i));
+    trackParameters.m_trackStateAtStart = 
+        pandora::TrackState(startObj->getFloatVal(0), 
+                            startObj->getFloatVal(1), 
+                            startObj->getFloatVal(2), 
+                            startObj->getFloatVal(3), 
+                            startObj->getFloatVal(4), 
+                            startObj->getFloatVal(5));
+    
+    // Add ECal state.
+    LCGenericObject* ecalObj = dynamic_cast<LCGenericObject*>(ecalCollection->getElementAt(i));
+    trackParameters.m_trackStateAtECal = 
+        pandora::TrackState(ecalObj->getFloatVal(0), 
+                            ecalObj->getFloatVal(1), 
+                            ecalObj->getFloatVal(2), 
+                            ecalObj->getFloatVal(3), 
+                            ecalObj->getFloatVal(4), 
+                            ecalObj->getFloatVal(5));
+    
+    // Add end state.
+    LCGenericObject* endObj = dynamic_cast<LCGenericObject*>(endCollection->getElementAt(i));
+    trackParameters.m_trackStateAtEnd = pandora::TrackState(endObj->getFloatVal(0), 
+                                                            endObj->getFloatVal(1), 
+                                                            endObj->getFloatVal(2), 
+                                                            endObj->getFloatVal(3), 
+                                                            endObj->getFloatVal(4), 
+                                                            endObj->getFloatVal(5));
+    //}       

 }
 
 /**