slic/src

diff -u -r1.17 -r1.18
--- LcioHitsCollectionBuilder.cc	15 Oct 2009 00:07:36 -0000	1.17
+++ LcioHitsCollectionBuilder.cc	15 Oct 2009 19:14:39 -0000	1.18
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/LcioHitsCollectionBuilder.cc,v 1.17 2009/10/15 00:07:36 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/LcioHitsCollectionBuilder.cc,v 1.18 2009/10/15 19:14:39 jeremy Exp $

 
 #include "LcioHitsCollectionBuilder.hh"
 

@@ -344,39 +344,39 @@

     // add an MCParticle hit contribution from G4 to LCIO
     void LcioHitsCollectionBuilder::addMcpContribs( G4CalorimeterHit* g4CalHit, IMPL::SimCalorimeterHitImpl* simCalHit)
     {

-        // create empty hit contrib list

+        // Create empty hit contrib list.

         McpHitContribList contribs;
 

-        // aggregation of contribs by track ID if CHBIT_PDG is not set
-        if ( !m_calCollFlag.bitSet(LCIO::CHBIT_PDG) ) {
-
-            // pass ref to contrib list, which will get filled

+        // Use aggregation of contribs by track ID if CHBIT_PDG is not set.
+        if ( !m_calCollFlag.bitSet(LCIO::CHBIT_PDG) ) 
+        {
+            // Pass a ref to contrib list, which will get filled.

             combineMcpHitContribs( g4CalHit->getMcpHitContribList(),
                                    contribs );
 
         }

-        // otherwise use the complete list from cal hit
-        else {
-
-            // set contrib list to cal contribs

+        // Otherwise, use the complete list from the CalHit.
+        else 
+        {

             contribs = g4CalHit->getMcpHitContribList();
         }
 

-        // add contribs to LCIO Mcp

+        // Add contribs to the LCIO MCParticle.

         size_t ncontrib = 0;
         for ( McpHitContribList::const_iterator iter = contribs.begin();
               iter != contribs.end();

-              iter++ ) {

+              iter++ ) 
+        {

-            // get this contrib

+            // This contrib.

             const McpHitContrib& contrib = ( *iter );
 

-            // fetch associcated MCP pointer by trackID

+            // Get the MCParticle pointer from the track ID.

             MCParticleImpl* contribMcp = m_mcpManager->getMaps()->findMcpFromTrackID( contrib.getTrackID() );
 

-            if ( contribMcp != 0 ) {
-
-                // add the Mcp contrib to the Lcio cal hit

+            if ( contribMcp != 0 ) 
+            {
+                // Add the MCParticle contribution to the hit.

                 simCalHit->addMCParticleContribution(contribMcp,
                                                      contrib.getEdep() / GeV,
                                                      contrib.getGlobalTime(),

@@ -384,10 +384,18 @@

                     );
                 ++ncontrib;
             }

+            // Problem!  Contributing particle is missing from MCParticle list.
+#ifdef SLIC_LOG
+            else
+            {
+                log() << LOG::always << "ERROR:  Could not find MCParticle from track ID <" << contrib.getTrackID() << ">." << LOG::endl;
+            }
+#endif

         }
 
 #ifdef SLIC_LOG 

-        if ( ncontrib == 0 ) {

+        if ( ncontrib == 0 ) 
+        {

             log().error("No hit contribs for sim cal hit.");
         }
 #endif