slic/src

diff -u -r1.16 -r1.17
--- LcioHitsCollectionBuilder.cc	14 Oct 2009 20:48:25 -0000	1.16
+++ LcioHitsCollectionBuilder.cc	15 Oct 2009 00:07:36 -0000	1.17
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/LcioHitsCollectionBuilder.cc,v 1.16 2009/10/14 20:48:25 jeremy Exp $

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

 
 #include "LcioHitsCollectionBuilder.hh"
 

@@ -329,10 +329,12 @@

         // MCP using McpManager
         MCParticleImpl* mcp = m_mcpManager->getMaps()->findMcpFromTrackID( trkHit->getTrackID() );
 

-        if ( !mcp ) {

+        if ( !mcp ) 
+        {

             log().error("No MCP found for trackID <" + StringUtil::toString( trkHit->getTrackID() ) + "> for trk hit.");
         }

-        else {

+        else 
+        {

             simTrkHit->setMCParticle( mcp );
         }
 

@@ -399,7 +401,8 @@

         // iterate over long list (one entry for every hit)
         for ( McpHitContribList::const_iterator iter = long_contrib.begin();
               iter != long_contrib.end();

-              iter++ ) {

+              iter++ ) 
+        {

 
             int trk_id = (*iter).getTrackID();
 

@@ -407,10 +410,8 @@

 
             // old track id in new combined list?
             McpHitContrib* trk_contrib = 0;

-            if ( ( trk_contrib = findMcpHitContribByTrackID( (*iter).getTrackID(), combined_contrib ) ) )  {
-	
-                //log().debug("Incr edep <" + StringUtil::toString( (*iter).getEdep() ) + ">");
-

+            if ( ( trk_contrib = findMcpHitContribByTrackID( (*iter).getTrackID(), combined_contrib ) ) )  
+            {	

                 // += edep
                 trk_contrib->incrEdep( (*iter).getEdep() );
 

@@ -418,8 +419,8 @@

                 trk_contrib->setMinTime( (*iter).getGlobalTime() );
             }
             // no existing contrib

-            else {
-

+            else 
+            {

                 //log().debug("New hit edep <" + StringUtil::toString( (*iter).getEdep() ) + ">");
 
                 // create new contrib

@@ -431,28 +432,20 @@

         }
     }
 

-    McpHitContrib* LcioHitsCollectionBuilder::findMcpHitContribByTrackID(int trk_id,
-                                                                         McpHitContribList& contribs)

+    McpHitContrib* LcioHitsCollectionBuilder::findMcpHitContribByTrackID(int trk_id, McpHitContribList& contribs)

     {
         McpHitContrib* c = 0;
         for ( McpHitContribList::iterator iter = contribs.begin();
               iter != contribs.end();

-              iter++ ) {
-            if ( (*iter).getTrackID() == trk_id ) {
-
-	
-#ifdef SLIC_LOG
-                log() << LOG::debug << "found match on trkID <" << trk_id << ">" << LOG::done;
-#endif
-                c = &(*iter);

+              iter++ ) 
+        {
+            if ( ( *iter ).getTrackID() == trk_id ) 
+            {   
+                c = &( *iter );

                 break;
             }
         }
 

-#ifdef SLIC_LOG
-        log() << LOG::debug << "returning McpHitContrib ptr <" << c << ">" << LOG::done;
-#endif
-

         return c;
     }
 

@@ -499,7 +492,9 @@

 
     bool LcioHitsCollectionBuilder::containsCollection(EVENT::LCEvent* event, const string& collectionName)
     {

-        for (std::vector<string>::const_iterator iter = event->getCollectionNames()->begin(); iter != event->getCollectionNames()->end(); iter++)

+        for (std::vector<string>::const_iterator iter = event->getCollectionNames()->begin(); 
+             iter != event->getCollectionNames()->end(); 
+             iter++)

         {
             const string thisName = *iter;
             if (thisName.compare(collectionName) == 0)