diff -u -r1.9 -r1.10
--- SimpleTrackProcessor.cpp	30 Jul 2010 17:30:25 -0000	1.9
+++ SimpleTrackProcessor.cpp	2 Aug 2010 22:00:55 -0000	1.10
@@ -66,9 +66,6 @@

         trackParameters.m_particleId = 211;
 #endif
 

-        // Set the momentum at DCA to track's start state.  
-        trackParameters.m_momentumAtDca = trackParameters.m_trackStateAtStart.Get().GetMomentum();
-        

         // FIXME Next three boolean parameters are hard-coded.
         trackParameters.m_reachesECal = true;
         trackParameters.m_canFormPfo = true;

@@ -77,6 +74,9 @@

         // Setup track states from GenericObject collections, assuming that the ordering matches that in the "Tracks" collection.
         setupTrackStatesFromGenericObjects(trackParameters, event, i);
 

+        // Set the momentum at DCA to track's start state.  
+        trackParameters.m_momentumAtDca = trackParameters.m_trackStateAtStart.Get().GetMomentum();
+

 #ifdef SIMPLETRACKPROCESSOR_DEBUG
         std::cout << "Track Parameters: " << std::endl;
         std::cout << "    d0 = " << trackParameters.m_d0.Get() << std::endl;