slic/src

diff -u -r1.18 -r1.19
--- LcioMcpFactory.cc	27 Apr 2011 20:21:25 -0000	1.18
+++ LcioMcpFactory.cc	9 Jun 2011 01:51:43 -0000	1.19
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/LcioMcpFactory.cc,v 1.18 2011/04/27 20:21:25 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/LcioMcpFactory.cc,v 1.19 2011/06/09 01:51:43 jeremy Exp $

 #include "LcioMcpFactory.hh"
 
 // slic

@@ -347,6 +347,10 @@

         int trkID = primary->GetTrackID();
 
 #ifdef SLIC_LOG

+        if (trkID <= 0)
+        {
+            log() << "WARNING: trkID <" << trkID << "> looks bad" << LOG::done;
+        }

         log() << LOG::done << "primary TID <" << trkID << ">" << LOG::done;
 #endif
 

@@ -365,7 +369,8 @@

 
         }
         // Found a trajectory.

-        else {

+        else 
+        {

 
 #ifdef SLIC_LOG
             log() << LOG::debug << "initialAndTrajectory" << LOG::done;

@@ -386,12 +391,23 @@

         m_manager->getMaps()->addInitialMcpToFinalMcpLink( mcpInit, mcp);
 
 

+//#ifdef SLIC_LOG
+//        log() << LOG::debug << "createMcpFromPrimary() - adding trackId <" << trj->GetTrackID() << "> to MCP <" << mcp << "> link." << LOG::done;
+//#endif
+
+        // Link the track ID to the output particle.
+        if (trkID > 0)
+        {
+            m_manager->getMaps()->addTrackIDToMcpLink( trkID, mcp );
+        }
+        else
+        {

 #ifdef SLIC_LOG

-        log() << LOG::debug << "createMcpFromPrimary() - adding trackId <" << trj->GetTrackID() << "> to MCP <" << mcp << "> link." << LOG::done;

+            log() << LOG::debug << "WARNING: not adding trkID <" << trkID << "> to map!" << LOG::done;

 #endif

+        }

-        // Link the track ID to the output particle.
-        m_manager->getMaps()->addTrackIDToMcpLink( trkID, mcp );

+        log() << LOG::done;

 
         return mcp;
     }