slic/src

diff -u -r1.25 -r1.26
--- LcioMessenger.cc	20 Sep 2005 00:34:43 -0000	1.25
+++ LcioMessenger.cc	21 Sep 2005 00:12:47 -0000	1.26
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/LcioMessenger.cc,v 1.25 2005/09/20 00:34:43 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/LcioMessenger.cc,v 1.26 2005/09/21 00:12:47 jeremy Exp $

 #include "LcioMessenger.hh"
 
 // SLIC

@@ -92,7 +92,7 @@

 	flag_set = StringUtil::toBool( s );
       }
 

-      LcioHCBuilder* hcb = m_mgr->getHCBuilder();

+      LcioHitsCollectionBuilder* hcb = m_mgr->getHCBuilder();

 
       if ( hcb ) {
 

@@ -106,7 +106,7 @@

 	}
       }
       else {

-	G4Exception( "FATAL ERROR: LcioHCBuilder is null!" );

+	G4Exception( "FATAL ERROR: LcioHitsCollectionBuilder is null!" );

       }
     }
     // bad command; shouldn't happen

slic/src

diff -u -r1.62 -r1.63
--- LcioManager.cc	20 Sep 2005 00:34:42 -0000	1.62
+++ LcioManager.cc	21 Sep 2005 00:12:48 -0000	1.63
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/LcioManager.cc,v 1.62 2005/09/20 00:34:42 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/LcioManager.cc,v 1.63 2005/09/21 00:12:48 jeremy Exp $

 #include "LcioManager.hh"
 
 // SLIC

@@ -71,7 +71,7 @@

     m_mcpManager = LcioMcpManager::instance();
 
     // HC builder

-    m_HCBuilder = new LcioHCBuilder();

+    m_HCBuilder = new LcioHitsCollectionBuilder();

 
     // create LCWriter
     createWriter();

slic/include

diff -u -r1.47 -r1.48
--- LcioManager.hh	20 Sep 2005 00:34:40 -0000	1.47
+++ LcioManager.hh	21 Sep 2005 00:12:48 -0000	1.48
@@ -10,7 +10,7 @@

 // slic
 #include "LcioPrimaryGenerator.hh"
 #include "LcioMcpManager.hh"

-#include "LcioHCBuilder.hh"

+#include "LcioHitsCollectionBuilder.hh"

 #include "Trajectory.hh"
 
 // lcio

@@ -144,7 +144,7 @@

       return m_mcpManager;
     }
 

-    inline LcioHCBuilder* getHCBuilder()

+    inline LcioHitsCollectionBuilder* getHCBuilder()

     {
       return m_HCBuilder;
     }

@@ -206,7 +206,7 @@

     LcioPrimaryGenerator* m_eventGenerator;
 
     // creation of HCs

-    LcioHCBuilder* m_HCBuilder;

+    LcioHitsCollectionBuilder* m_HCBuilder;

 
     // current LCEvent
     IMPL::LCEventImpl* m_currentLCEvent;