--- projects/slic/branches/v00-00-01_SLIC-218-dev/CMakeLists.txt	2014-01-11 00:46:42 UTC (rev 2870)
+++ projects/slic/branches/v00-00-01_SLIC-218-dev/CMakeLists.txt	2014-01-11 01:08:53 UTC (rev 2871)
@@ -12,9 +12,9 @@

 PROJECT( SLIC )
 
 # project version

-SET( SLIC_VERSION_MAJOR 3 )
-SET( SLIC_VERSION_MINOR 1 )
-SET( SLIC_VERSION_PATCH 4 )

+SET( SLIC_VERSION_MAJOR 4 )
+SET( SLIC_VERSION_MINOR 0 )
+SET( SLIC_VERSION_PATCH 0 )

 
 # option for enabling and disabling the logging system
 OPTION( ENABLE_SLIC_LOG "enable slic logging system" ON )

@@ -80,7 +80,7 @@

 IF ( NOT HEPPDT_FOUND )
     MESSAGE( FATAL_ERROR "HEPPDT was not found!" )
 ELSE()

-    MESSAGE( STATUS "Found HEPPDT: ${HEPPDT_ROOT}" )

+    MESSAGE( STATUS "Found HEPPDT: ${HEPPDT_DIR}" )

 ENDIF()
 
 # configure files

--- projects/slic/branches/v00-00-01_SLIC-218-dev/include/MCParticleManager.hh	2014-01-11 00:46:42 UTC (rev 2870)
+++ projects/slic/branches/v00-00-01_SLIC-218-dev/include/MCParticleManager.hh	2014-01-11 01:08:53 UTC (rev 2871)
@@ -19,7 +19,7 @@

 
 namespace slic {
 

-typedef map<G4int, MCParticle*> MCParticle2TrackIDMap_type;

+typedef map<G4int, MCParticle*> MCParticle2TrackIDMap;

 
 class MCParticleManager : public Singleton<MCParticleManager> {
 

@@ -56,7 +56,7 @@

 
 private:
 

-    MCParticle2TrackIDMap_type _mcpMap;

+    MCParticle2TrackIDMap _mcpMap;

     LCCollectionVec* _mcpVec;
 };
 

--- projects/slic/branches/v00-00-01_SLIC-218-dev/include/TrackManager.hh	2014-01-11 00:46:42 UTC (rev 2870)
+++ projects/slic/branches/v00-00-01_SLIC-218-dev/include/TrackManager.hh	2014-01-11 01:08:53 UTC (rev 2871)
@@ -26,6 +26,7 @@

 
     TrackManager() : Module("TrackManager") {
         _trackSummaries = new TrackSummaryVector;

+        _trackSummaryMap = new TrackSummaryMap;

     }
 
     virtual ~TrackManager() {

@@ -42,17 +43,33 @@

         _trackSummaries->clear();
     }
 

-    void saveTracks(const G4Event*, LCEvent*);

+    void saveTrackSummaries(const G4Event*, LCEvent*);

 
     void clearTrackSummaries() {

+        /* Clear the vector. */

         for (TrackSummaryVector::iterator it = _trackSummaries->begin();
                 it != _trackSummaries->end();
                 it++) {
             delete *it;
         }
         _trackSummaries->clear();

+
+        /* Clear the map. */
+        _trackSummaryMap->clear();

     }
 

+    TrackSummaryMap* getTrackSummaryMap() {
+        return _trackSummaryMap;
+    }
+
+    void registerTrackSummary(TrackSummary* trackSummary) {
+        (*_trackSummaryMap)[trackSummary->getTrackID()] = trackSummary;
+    }
+
+    TrackSummary* findTrackSummary(G4int trackID) {
+        return (*_trackSummaryMap)[trackID];
+    }
+

 private:
 
     TrackSummary* findFirstSavedAncestor(TrackSummary* trackSummary);

@@ -60,7 +77,7 @@

 private:
 
     TrackSummaryVector* _trackSummaries;

-

+    TrackSummaryMap* _trackSummaryMap;

 };
 
 }

--- projects/slic/branches/v00-00-01_SLIC-218-dev/include/TrackSummary.hh	2014-01-11 00:46:42 UTC (rev 2870)
+++ projects/slic/branches/v00-00-01_SLIC-218-dev/include/TrackSummary.hh	2014-01-11 01:08:53 UTC (rev 2871)
@@ -21,7 +21,10 @@

 namespace slic {
 
 class TrackSummary;

+class TrackManager;
+

 typedef std::vector<TrackSummary*> TrackSummaryVector;

+typedef std::map<G4int, TrackSummary*> TrackSummaryMap;

 
 class TrackSummary {
 

@@ -114,11 +117,11 @@

     void setParentToBeSaved();
 
     MCParticleImpl* getMCParticle() {

-        return _theMCParticle;

+        return _mcparticle;

     }
 
     void setMCParticle(MCParticleImpl* mcp) {

-        _theMCParticle = mcp;

+        _mcparticle = mcp;

     }
 
     void buildMCParticle();

@@ -147,9 +150,10 @@

     G4int _parentTrackID;
     G4double _trackLength;
 

-    MCParticleImpl* _theMCParticle;

+    MCParticleImpl* _mcparticle;

     G4bool _mcParticleIsUpToDate;
 

+    static TrackManager* m_trackManager;

 };
 
 extern G4Allocator<TrackSummary> TrackSummaryAllocator;

--- projects/slic/branches/v00-00-01_SLIC-218-dev/include/TrackUtil.hh	2014-01-11 00:46:42 UTC (rev 2870)
+++ projects/slic/branches/v00-00-01_SLIC-218-dev/include/TrackUtil.hh	2014-01-11 01:08:53 UTC (rev 2871)
@@ -40,10 +40,22 @@

      * @return The UserTrackInformation that was created for the track.
      */
     static UserTrackInformation* setupUserTrackInformation(const G4Track* track, G4bool save) {

+
+        /* Create new TrackSummary. */

         TrackSummary* trackSummary = new TrackSummary(track, save);

+
+        /* Add it to the master list. */

         TrackManager::instance()->getTrackSummaries()->push_back(trackSummary);

+
+        /* Associate it to its track ID. */
+        (*TrackManager::instance()->getTrackSummaryMap())[track->GetTrackID()] = trackSummary;
+
+        /* Create new UserTrackInformation. */

         UserTrackInformation* trackInfo = new UserTrackInformation(trackSummary);

+
+        /* Set the UserTrackInformation on the track. */

         ((G4Track*) track)->SetUserInformation(trackInfo);

+

         return trackInfo;
     }
 

--- projects/slic/branches/v00-00-01_SLIC-218-dev/include/UserTrackInformation.hh	2014-01-11 00:46:42 UTC (rev 2870)
+++ projects/slic/branches/v00-00-01_SLIC-218-dev/include/UserTrackInformation.hh	2014-01-11 01:08:53 UTC (rev 2871)
@@ -41,16 +41,16 @@

     TrackSummary* _trackSummary;
 };
 

-extern G4Allocator<UserTrackInformation> TrackInformationAllocator;

+extern G4Allocator<UserTrackInformation> UserTrackInformationAllocator;

 
 inline void* UserTrackInformation::operator new(size_t) {
     void* trackInfo;

-    trackInfo = (void*) TrackInformationAllocator.MallocSingle();

+    trackInfo = (void*) UserTrackInformationAllocator.MallocSingle();

     return trackInfo;
 }
 
 inline void UserTrackInformation::operator delete(void *trackInfo) {

-    TrackInformationAllocator.FreeSingle((UserTrackInformation*) trackInfo);

+    UserTrackInformationAllocator.FreeSingle((UserTrackInformation*) trackInfo);

 }
 
 }

--- projects/slic/branches/v00-00-01_SLIC-218-dev/src/EventAction.cc	2014-01-11 00:46:42 UTC (rev 2870)
+++ projects/slic/branches/v00-00-01_SLIC-218-dev/src/EventAction.cc	2014-01-11 01:08:53 UTC (rev 2871)
@@ -30,6 +30,9 @@

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

+    // Reset the global TrackSummaryVector used for MCParticle output.
+    TrackManager::instance()->resetTrackSummaries();
+

     /* Clear the MCParticle map from last event. */
     MCParticleManager::instance()->clearMap();
 

@@ -40,7 +43,7 @@

 void EventAction::EndOfEventAction(const G4Event *anEvent) {
 
     /* Save track information to MCParticle collection in LCIO output event. */

-    TrackManager::instance()->saveTracks(anEvent, LcioManager::instance()->getCurrentLCEvent());

+    TrackManager::instance()->saveTrackSummaries(anEvent, LcioManager::instance()->getCurrentLCEvent());

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

--- projects/slic/branches/v00-00-01_SLIC-218-dev/src/RunAction.cc	2014-01-11 00:46:42 UTC (rev 2870)
+++ projects/slic/branches/v00-00-01_SLIC-218-dev/src/RunAction.cc	2014-01-11 01:08:53 UTC (rev 2871)
@@ -33,9 +33,6 @@

 	printBeginOfRunMessage( aRun );
 #endif
 

-	// Reset the global TrackSummaryVector used for MCParticle output.
-	TrackManager::instance()->resetTrackSummaries();
-

 	// Execute LcioManager's beginRun action.
 	LcioManager::instance()->beginRun(aRun);
 

@@ -54,10 +51,6 @@

 	// LcioManager's action
 	LcioManager::instance()->endRun(run);
 

-    std::cout << "TrackManager has "
-            << TrackManager::instance()->getTrackSummaries()->size()
-            << " TrackSummary objects at end of run." << std::endl;
-

 	// event source mgr
 	EventSourceManager::instance()->endRun(run);
 

--- projects/slic/branches/v00-00-01_SLIC-218-dev/src/RunManager.cc	2014-01-11 00:46:42 UTC (rev 2870)
+++ projects/slic/branches/v00-00-01_SLIC-218-dev/src/RunManager.cc	2014-01-11 01:08:53 UTC (rev 2871)
@@ -34,7 +34,7 @@

 	SetUserAction(new RunAction);
 	SetUserAction(new EventAction);
 	SetUserAction(new TrackingAction);

-	SetUserAction(new SteppingAction);

+	//SetUserAction(new SteppingAction);

 	m_userActionsInitialized = true;
 }
 

--- projects/slic/branches/v00-00-01_SLIC-218-dev/src/TrackManager.cc	2014-01-11 00:46:42 UTC (rev 2870)
+++ projects/slic/branches/v00-00-01_SLIC-218-dev/src/TrackManager.cc	2014-01-11 01:08:53 UTC (rev 2871)
@@ -16,7 +16,7 @@

 
 namespace slic {
 

-void TrackManager::saveTracks(const G4Event* anEvent, LCEvent* lcEvent) {

+void TrackManager::saveTrackSummaries(const G4Event* anEvent, LCEvent* lcEvent) {

 
     StdHepGenerator::LCIO2Geant4MapIterator it;
 

@@ -45,11 +45,10 @@

     /* Get the MCParticle collection created by event generation. */
     LCCollectionVec* mcpVec = MCParticleManager::instance()->getMCParticleCollection();
 

+    /* Save TrackSummary objects to LCIO collection. */

 #ifdef SLIC_LOG

-

+    log() << LOG::always << "TrackManager processing " << _trackSummaries->size() << " TrackSummary objects." << LOG::done;

 #endif

-
-    /* Save TrackSummary objects to LCIO collection. */

     size_t l;
     TrackSummary* trackSummary;
     for (l = 0; l < _trackSummaries->size(); l++) {

@@ -88,6 +87,11 @@

 
     /* Save the MCParticle collection into the event. */
     lcEvent->addCollection((LCCollection*)mcpVec, "MCParticle");

+
+#ifdef SLIC_LOG
+    log() << LOG::always << "Saved " << mcpVec->getNumberOfElements() << " MCParticles." << LOG::done;
+#endif
+

 }
 
 TrackSummary* TrackManager::findFirstSavedAncestor(TrackSummary* trackSummary) {

@@ -105,5 +109,4 @@

     return parent;
 }
 

-

 }

--- projects/slic/branches/v00-00-01_SLIC-218-dev/src/TrackingAction.cc	2014-01-11 00:46:42 UTC (rev 2870)
+++ projects/slic/branches/v00-00-01_SLIC-218-dev/src/TrackingAction.cc	2014-01-11 01:08:53 UTC (rev 2871)
@@ -1,9 +1,6 @@

 // $Header: /nfs/slac/g/lcd/cvs/lcdroot/slic/src/TrackingAction.cc,v 1.14 2012-11-27 19:32:19 jeremy Exp $
 #include "TrackingAction.hh"
 

-// LCDD
-#include "lcdd/hits/TrackInformation.hh"
-

 // SLIC
 #include "TrackUtil.hh"
 #include "UserTrackInformation.hh"

@@ -16,43 +13,45 @@

 void TrackingAction::PreUserTrackingAction(const G4Track* track) {
 
     G4bool isPrimary = (track->GetParentID() == 0);

-    G4ThreeVector trackPosition = track->GetPosition();

     UserRegionInformation* regionInfo = TrackUtil::getRegionInformation(track);
     G4bool insideTrackerRegion = regionInfo->getStoreSecondaries();

-    G4bool decayInsideTracker = false;
-    TrackInformation* trackInfo = dynamic_cast<TrackInformation*>(track->GetUserInformation());

+    //G4bool decayInsideTracker = false;
+    UserTrackInformation* trackInfo = dynamic_cast<UserTrackInformation*>(track->GetUserInformation());

 
     /* Track is primary? */

-    if (!isPrimary) {

+    //if (!isPrimary) {

 
         /* Inside tracker region? */

-        if (insideTrackerRegion) {
-            const G4VProcess* theCreatorProcess = track->GetCreatorProcess();

+        //if (insideTrackerRegion) {
+            //const G4VProcess* theCreatorProcess = track->GetCreatorProcess();

 
             /* Decay in tracker? */

-            if (theCreatorProcess)
-                decayInsideTracker = theCreatorProcess->GetProcessName() == "Decay";
-        }
-    }

+            //if (theCreatorProcess)
+            //    decayInsideTracker = theCreatorProcess->GetProcessName() == "Decay";
+        //}
+    //}

+    /* Default setting of not saving this track's information to the LCIO output. */
+    G4bool save = false;
+

     /* Store trajectory? */

-    TrackSummary* trackSummary = 0;

     if (isPrimary || (insideTrackerRegion && track->GetKineticEnergy() > regionInfo->getThreshold())) {
 

+        /* These tracks should be saved. */
+        save = true;
+

         /* Turn on trajectory storage in Geant4. */
         fpTrackingManager->SetStoreTrajectory(true);

-
-        /* Setup the UserTrackInformation if it does not exist. */
-        if (!trackInfo) {
-            TrackUtil::setupUserTrackInformation(track, true);
-        }

     }
     /* Turn off trajectory storing. */
     else {
         fpTrackingManager->SetStoreTrajectory(false);

-        /* Setup track information, which will not be saved. */
-        TrackUtil::setupUserTrackInformation(track, false);

     }

+
+    /* Setup the UserTrackInformation if it does not exist. */
+    if (!trackInfo) {
+        TrackUtil::setupUserTrackInformation(track, save);
+    }

 }
 
 void TrackingAction::PostUserTrackingAction(const G4Track* track) {

--- projects/slic/branches/v00-00-01_SLIC-218-dev/src/UserTrackInformation.cc	2014-01-11 00:46:42 UTC (rev 2870)
+++ projects/slic/branches/v00-00-01_SLIC-218-dev/src/UserTrackInformation.cc	2014-01-11 01:08:53 UTC (rev 2871)
@@ -1,6 +1,6 @@

 #include "UserTrackInformation.hh"
 
 namespace slic {

-G4Allocator<UserTrackInformation> TrackInformationAllocator;

+G4Allocator<UserTrackInformation> UserTrackInformationAllocator;

 }