slic/src

diff -u -r1.27 -r1.28
--- EventAction.cc	27 Apr 2007 01:54:34 -0000	1.27
+++ EventAction.cc	11 Feb 2011 23:32:24 -0000	1.28
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/EventAction.cc,v 1.27 2007/04/27 01:54:34 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/EventAction.cc,v 1.28 2011/02/11 23:32:24 jeremy Exp $

 
 #include "EventAction.hh"
 

@@ -71,10 +71,8 @@

     // debugger
     EventDebugger::instance()->endEvent( anEvent );
 

-#ifdef SLIC_LOG

     // end event mesg
     printEndEventMessage( anEvent );

-#endif

   }
 
   void EventAction::printEndEventMessage(const G4Event *anEvent)

slic/src

diff -u -r1.68 -r1.69
--- LcioMcpManager.cc	26 Aug 2008 23:15:31 -0000	1.68
+++ LcioMcpManager.cc	11 Feb 2011 23:32:24 -0000	1.69
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/LcioMcpManager.cc,v 1.68 2008/08/26 23:15:31 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/LcioMcpManager.cc,v 1.69 2011/02/11 23:32:24 jeremy Exp $

 #include "LcioMcpManager.hh"
 
 // slic

@@ -84,10 +84,10 @@

 #ifdef SLIC_LOG
                 log() << LOG::debug << "trajectoryIndex: " << i << LOG::done;
                 log() << LOG::debug << "TID: " << trj->GetTrackID() << LOG::done;

-#endif

 
                 //log() << "Trajectory (Name TID PID time): " << ((int)trj->GetTrackID()) << " " << ((int)trj->GetParentID()) << " " << ((std::string)trj->GetParticleName()) << " " << log::DONE;
                 log() << LOG::done;

+#endif

             }            
         }
         else

slic/src

diff -u -r1.35 -r1.36
--- LcioPrimaryGenerator.cc	4 Aug 2009 22:50:42 -0000	1.35
+++ LcioPrimaryGenerator.cc	11 Feb 2011 23:32:24 -0000	1.36
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/LcioPrimaryGenerator.cc,v 1.35 2009/08/04 22:50:42 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/LcioPrimaryGenerator.cc,v 1.36 2011/02/11 23:32:24 jeremy Exp $

 
 // slic
 #include "LcioPrimaryGenerator.hh"

@@ -79,7 +79,9 @@

 
             G4int numPar = mcp->getParents().size();
 

-            log() << "    nparents: " << numPar << LOG::done;

+#ifdef SLIC_LOG
+            log() << log::DEBUG << "    nparents: " << numPar << LOG::done;
+#endif

 
             /*
              * Handle 4 cases, following Ron Cassell's LCSHEPEvtInterface from LCS package:

slic/src

diff -u -r1.32 -r1.33
--- PrimaryGeneratorAction.cc	10 Sep 2008 00:04:34 -0000	1.32
+++ PrimaryGeneratorAction.cc	11 Feb 2011 23:32:24 -0000	1.33
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/PrimaryGeneratorAction.cc,v 1.32 2008/09/10 00:04:34 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/PrimaryGeneratorAction.cc,v 1.33 2011/02/11 23:32:24 jeremy Exp $

 
 #include "PrimaryGeneratorAction.hh"
 

@@ -33,9 +33,7 @@

         EventSourceManager* mgr = EventSourceManager::instance();
 
         // print begin message

-#ifdef SLIC_LOG

         printBeginEventMessage( anEvent );

-#endif

 
         // needs to be called here for setup purposes rather than in EventAction
         mgr->beginEvent(anEvent);

slic/src

diff -u -r1.2 -r1.3
--- SlicMain.cc	8 Jan 2010 23:18:56 -0000	1.2
+++ SlicMain.cc	11 Feb 2011 23:32:24 -0000	1.3
@@ -1,10 +1,10 @@

-// $Id: SlicMain.cc,v 1.2 2010/01/08 23:18:56 jeremy Exp $

+// $Id: SlicMain.cc,v 1.3 2011/02/11 23:32:24 jeremy Exp $

 
 #include "SlicMain.hh"
 
 // slic
 #include "SlicApplication.hh"

-#include "TimeUtil.hh"

+//#include "TimeUtil.hh"

 
 // geant4
 #include "G4RunManager.hh"

@@ -26,8 +26,8 @@

     SlicApplication* slicApp = 0;
     
     // Top-level try block.

-    try 
-    {     

+    //try 
+    //{     

       // Create the SLIC application using singleton function.
       slicApp = SlicApplication::instance();
       

@@ -39,17 +39,17 @@

       
       // Get the application return code.
       returnCode = slicApp->getReturnCode();

-    }

+    //}

     // Catch an std::exception.

-    catch(std::exception& stde) 
-    {
-      log() << LOG::error << stde.what() << LOG::done;
-    }

+    //catch(std::exception& stde) 
+    //{
+    //  log() << LOG::error << stde.what() << LOG::done;
+    //}

     // Catch an unknown exception.

-    catch(...) 
-    {
-      log() << LOG::error << "Top-level flak catcher caught unknown exception!" << LOG::done;
-    }

+    //catch(...) 
+    //{
+    //  log() << LOG::error << "Top-level catch caught unknown exception!" << LOG::done;
+    //}

 
     if ( slicApp ) {
       delete slicApp;

slic/src

diff -u -r1.38 -r1.39
--- StdHepToLcioConvertor.cc	16 Dec 2009 00:16:05 -0000	1.38
+++ StdHepToLcioConvertor.cc	11 Feb 2011 23:32:24 -0000	1.39
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/StdHepToLcioConvertor.cc,v 1.38 2009/12/16 00:16:05 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/StdHepToLcioConvertor.cc,v 1.39 2011/02/11 23:32:24 jeremy Exp $

 #include "StdHepToLcioConvertor.hh"
 
 // slic

@@ -278,8 +278,8 @@

         std::vector<int> dauVec;
         dauVec = makeIndexVec( dau1_idx, dau2_idx, dauVec );
 

-        log() << "printing dau vec ..." << LOG::done;

 #ifdef SLIC_LOG

+        log() << LOG::debug << "printing dau vec ..." << LOG::done;

         for (std::vector<int>::const_iterator it = dauVec.begin();
              it != dauVec.end();
              it++)