projects/slic/branches/v00-00-01_SLIC-218-dev/src

--- projects/slic/branches/v00-00-01_SLIC-218-dev/src/EventAction.cc	2014-01-15 19:19:30 UTC (rev 2878)
+++ projects/slic/branches/v00-00-01_SLIC-218-dev/src/EventAction.cc	2014-01-15 19:20:17 UTC (rev 2879)
@@ -29,38 +29,38 @@

 }
 
 void EventAction::BeginOfEventAction(const G4Event *anEvent) {

-
-    /* Create an empty LCEvent. */
-    LcioManager::instance()->createLCEvent();

 }
 
 void EventAction::EndOfEventAction(const G4Event *anEvent) {
 

-    /* Save track information to MCParticle collection in LCIO output event. */
-    TrackManager::instance()->saveTrackSummaries(anEvent, LcioManager::instance()->getCurrentLCEvent());
-

 	// check aborted
 	if (!SlicApplication::instance()->isAborting()) {

-		// Execute LcioManager's end of event action.

+
+	    /* Create an empty LCEvent. */
+	    LcioManager::instance()->createLCEvent();
+
+	    /* Save track information to MCParticle collection in LCIO output event. */
+	    TrackManager::instance()->saveTrackSummaries(anEvent, LcioManager::instance()->getCurrentLCEvent());
+
+		/* Execute LcioManager's end of event action. */

 		LcioManager::instance()->endEvent(anEvent);

+
+	    /* Begin of event processing for the current event generator. */
+	    EventSourceManager::instance()->endEvent(anEvent);

 	}
 

-	/* Begin of event processing for the current event generator. */
-	EventSourceManager::instance()->endEvent(anEvent);
-

 	/* Stop the event timer. */
 	stopEventTimer();
 
 	// debugger
 	//EventDebugger::instance()->endEvent(anEvent);
 

-	// end event mesg

+	/* Print the end event message. */

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

-	log() << LOG::okay << ">>>> EndEvent <" + StringUtil::toString(anEvent->GetEventID()) + ">" << LOG::endl
-			<< LOG::done;

+	log() << LOG::okay << ">>>> EndEvent <" + StringUtil::toString(anEvent->GetEventID()) + ">" << LOG::endl << LOG::done;

 }
 
 EventAction* EventAction::getEventAction() {

projects/slic/branches/v00-00-01_SLIC-218-dev/src

--- projects/slic/branches/v00-00-01_SLIC-218-dev/src/SlicApplication.cc	2014-01-15 19:19:30 UTC (rev 2878)
+++ projects/slic/branches/v00-00-01_SLIC-218-dev/src/SlicApplication.cc	2014-01-15 19:20:17 UTC (rev 2879)
@@ -4,7 +4,6 @@

 #include "SlicApplication.hh"
 #include "CommandLineProcessor.hh"
 #include "CommandQueue.hh"

-#include "EventDebugger.hh"

 #include "FieldManager.hh"
 #include "SlicApplicationMessenger.hh"
 #include "LcioManager.hh"

@@ -14,30 +13,22 @@

 #include "TimeUtil.hh"
 #include "HepPDTManager.hh"
 #include "VRML2WriterMessenger.hh"

+#include "PhysicsListManager.hh"

 
 // LCDD
 #include "lcdd/util/StringUtil.hh"
 #include "lcdd/core/LCDDDetectorConstruction.hh"
 

-// geant4

+// Geant4

 #include "G4ApplicationState.hh"

-#include "G4ScoringManager.hh"

 #include "G4StateManager.hh"
 

-// geant4 visualization

 #ifdef G4VIS_USE
 #include "G4VisExecutive.hh"
 #endif
 

-// geant4 UI

 #include "G4UIExecutive.hh"
 

-#ifdef HAVE_G4VERSION
-#include "G4Version.hh"
-#endif
-
-#include "PhysicsListManager.hh"
-

 namespace slic {
 
 SlicApplication::SlicApplication() :

@@ -100,9 +91,6 @@

 		// Create a new RunManager.
 		m_runManager = new RunManager();
 

-		// Activate command-based scorer.
-		G4ScoringManager::GetScoringManager();
-

 		// Initialize the physics list manager.
 		PhysicsListManager::instance();