diff -u -r1.56 -r1.57
--- LcioManager.cc	17 May 2005 19:06:34 -0000	1.56
+++ LcioManager.cc	31 Aug 2005 19:35:12 -0000	1.57
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/LcioManager.cc,v 1.56 2005/05/17 19:06:34 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/LcioManager.cc,v 1.57 2005/08/31 19:35:12 jeremy Exp $

 #include "LcioManager.hh"
 
 // SLIC

@@ -64,7 +64,7 @@

 
     // generator
     m_eventGenerator = new LcioPrimaryGenerator(this);

-    

+

     // Mcp manager instance
     m_mcpManager = LcioMcpManager::instance();
 

@@ -184,7 +184,7 @@

 
   void LcioManager::beginEvent(const G4Event*)
   {

-    ++m_runNumber;

+    // NO-OP???

   }
 
   void LcioManager::createWriter()

@@ -200,7 +200,7 @@

       }
       catch (...) {}
       delete m_writer;

-      m_writer = 0;      

+      m_writer = 0;

     }
   }
 

@@ -228,6 +228,9 @@

 
     // write the run header
     m_writer->writeRunHeader( m_runHdr );

+
+    // incr run number
+    ++m_runNumber;

   }
 
   void LcioManager::endRun()

@@ -237,7 +240,7 @@

 
     // close the writer to flush it (may reopen)
     m_writer->close();

-    

+

     // set append for subsequent writes if interactive mode
     if ( G4Application::instance()->getMode() == G4Application::eInteractive ) {
       m_fileExistsAction = eAppend;

@@ -266,7 +269,7 @@

   void LcioManager::setDetectorName()
   {
     std::string det_tag = LCDDProcessor::instance()->getDetectorName();

-    

+

 #ifdef SLIC_VERBOSE
     if ( verbose() > 0 ) {
       std::cout << "Setting detTag <" << det_tag << "> in LCIO header." << std::endl;

@@ -296,36 +299,36 @@

     }
   }
 

-  void LcioManager::setPath(const std::string& path) 
-  { 

+  void LcioManager::setPath(const std::string& path)
+  {

 #ifdef SLIC_VERBOSE
     if ( verbose() > 0 ) {
       std::cout << "setPath: " << path << std::endl;
     }
 #endif
 

-    m_path = path; 

+    m_path = path;

   }
 

-  void LcioManager::setFilename(const std::string& filename) 
-  { 

+  void LcioManager::setFilename(const std::string& filename)
+  {

 #ifdef SLIC_VERBOSE
     if ( verbose() > 0 ) {
       std::cout << "setFilename: " << filename << std::endl;
     }
 #endif
 

-    m_filename = filename; 

+    m_filename = filename;

   }
 

-  const std::string& LcioManager::getPath() const 
-  { 
-    return m_path; 

+  const std::string& LcioManager::getPath() const
+  {
+    return m_path;

   }
 

-  const std::string& LcioManager::getFilename() const 
-  { 
-    return m_filename; 

+  const std::string& LcioManager::getFilename() const
+  {
+    return m_filename;

   }
 
   LCEventImpl* LcioManager::createLCEvent(const G4Event* anEvent)

@@ -346,14 +349,14 @@

   }
 
   void LcioManager::endEvent(const G4Event* anEvent)

-  {  

+  {

     // set current G4Event
     setCurrentG4Event( anEvent );
 
     // create LCEvent
     createLCEvent();
 

-    // create mcp collection from input event 

+    // create mcp collection from input event

     createFinalMcpCollection();
 
     // create HC in current LCEvent from current G4Event using builder

@@ -390,10 +393,10 @@

   }
 
   void LcioManager::reset()

-  {    

+  {

     m_currentG4Event = 0;
 

-    // delete transient event container 

+    // delete transient event container

     delete m_currentLCEvent;
     m_currentLCEvent = 0;