diff -u -r1.18 -r1.19
--- StdHepLoader.cc	27 Apr 2007 01:54:35 -0000	1.18
+++ StdHepLoader.cc	6 May 2008 01:44:40 -0000	1.19
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/StdHepLoader.cc,v 1.18 2007/04/27 01:54:35 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/StdHepLoader.cc,v 1.19 2008/05/06 01:44:40 jeremy Exp $

 
 #include "StdHepLoader.hh"
 

@@ -15,75 +15,77 @@

 namespace slic
 {
 

-  StdHepLoader::~StdHepLoader()
-  {;}

+    StdHepLoader::~StdHepLoader()
+    {;}

-  StdHepLoader::StdHepLoader()
-    : Module("StdHepLoader"),
-      m_filename(""),
-      m_reader(0),
-      m_isEndOfInput(false)
-  {;}
-
-  void StdHepLoader::openStdHepFile(const std::string& filename)
-  {
-    openStdHepFile( filename.c_str() );
-  }
-
-  void StdHepLoader::openStdHepFile(const char* filename)
-  {
-    // set filename
-    m_filename = filename;
-
-    // close if currently open
-    closeStdHepFile();
-
-    // new lStdHep interface
-    m_reader = new lStdHep( filename );
-
-    // if error, assume fatal
-    if ( m_reader->getError() ) {
-      G4Exception( "StdHepLoader::openStdHepFile() - error opening input file." );

+    StdHepLoader::StdHepLoader()
+        : Module("StdHepLoader"),
+          m_filename(""),
+          m_reader(0),
+          m_isEndOfInput(false)
+    {;}
+
+    void StdHepLoader::openStdHepFile(const std::string& filename)
+    {
+        openStdHepFile( filename.c_str() );

     }
 

-    // print open message
-    log().okay("StdHep file <" + std::string( filename ) + "> opened with <" + StringUtil::toString( (int)m_reader->numEvents() ) + "> events.");
-  }
-
-  void StdHepLoader::closeStdHepFile()
-  {
-    if ( 0 != m_reader ) {
-      delete m_reader;
-      m_reader = 0;

+    void StdHepLoader::openStdHepFile(const char* filename)
+    {
+        // set filename
+        m_filename = filename;
+
+        // close if currently open
+        closeStdHepFile();
+
+        // new lStdHep interface
+        m_reader = new lStdHep( filename );
+
+        // if error, assume fatal
+        if ( m_reader->getError() ) 
+        {
+            G4Exception( "StdHepLoader::openStdHepFile() - error opening input file." );
+        }
+
+        // print open message
+        log().okay("StdHep file <" + std::string( filename ) + "> opened with <" + StringUtil::toString( (int)m_reader->numEvents() ) + "> events.");

     }

-  }

-  void StdHepLoader::readNextEvent()
-  {
-    /* Read the next event and check the error code. */
-    if ( m_reader->readEvent() != LSH_SUCCESS ) {
-
-      /* The error code was not EOF.  Assume this means a fatal error occurred. */
-      if ( m_reader->getError() != LSH_ENDOFFILE ) {
-	log().fatal("StdHep errorcode <" + StringUtil::toString( (int)m_reader->getError() ) + ">.");
-	G4Exception("FATAL ERROR: lStdHep reported an unrecoverable error.");
-      }
-      /* EOF */
-      else {
-	m_isEndOfInput = true;
-      }

+    void StdHepLoader::closeStdHepFile()
+    {
+        if ( 0 != m_reader ) 
+        {
+            delete m_reader;
+            m_reader = 0;
+        }

     }

-  }

-  void StdHepLoader::dumpCurrentEvent()
-  {
-    if ( m_reader ) {
-      m_reader->printEventHeader();
-      m_reader->printEvent();
-      m_reader->printEventTable();

+    void StdHepLoader::readNextEvent()
+    {
+        /* Read the next event and check the error code. */
+        if ( m_reader->readEvent() != LSH_SUCCESS ) 
+        {
+            /* The error code was not EOF.  Assume this means a fatal error occurred. */
+            if ( m_reader->getError() != LSH_ENDOFFILE ) {
+                log().fatal("StdHep errorcode <" + StringUtil::toString( (int)m_reader->getError() ) + ">.");
+                G4Exception("FATAL ERROR: lStdHep reported an unrecoverable error.");
+            }
+            /* EOF */
+            else {
+                m_isEndOfInput = true;
+            }
+        }

     }

-    else {
-      log().error("Cannot run StdHepLoader::dumpCurrentEvent.  StdHep reader is not initialized.");

+
+    void StdHepLoader::dumpCurrentEvent()
+    {
+        if ( m_reader ) {
+            m_reader->printEventHeader();
+            m_reader->printEvent();
+            m_reader->printEventTable();
+        }
+        else {
+            log().error("Cannot run StdHepLoader::dumpCurrentEvent.  StdHep reader is not initialized.");
+        }

     }

-  }

 }