projects/slic/branches/v04-00-00-pre/src

TrackingAction.cc 3165 -> 3166

--- projects/slic/branches/v04-00-00-pre/src/TrackingAction.cc	2014-07-02 00:01:15 UTC (rev 3165)
+++ projects/slic/branches/v04-00-00-pre/src/TrackingAction.cc	2014-07-02 00:03:13 UTC (rev 3166)
@@ -1,6 +1,9 @@

 // $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/detectors/CurrentTrackState.hh"
+

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

@@ -12,53 +15,77 @@

 
 void TrackingAction::PreUserTrackingAction(const G4Track* track) {

-    G4bool isPrimary = (track->GetParentID() == 0);

+    G4int trackID = track->GetTrackID();
+    G4int parentID = track->GetParentID();
+
+    G4bool isTruePrimary = (track->GetParentID() == 0);

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

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

+    UserTrackInformation* trackInfo = TrackUtil::getUserTrackInformation(track);
+    bool hasTrackInfo = (trackInfo != NULL);
+    bool aboveEnergyThreshold = (track->GetKineticEnergy() > regionInfo->getThreshold());

-    /* Track is primary? */
-    //if (!isPrimary) {

+    // This happens when backscattering track are un-suspended.
+    if (hasTrackInfo) {
+        // Track is backscattering?
+        if (trackInfo->getTrackSummary()->getBackScattering()) {
+            // Update current track ID for calorimeter SDs and return.
+            CurrentTrackState::setCurrentTrackID(trackID);
+            return;
+        }
+        return;
+    }

-        /* Inside tracker region? */
-        //if (insideTrackerRegion) {
-            //const G4VProcess* theCreatorProcess = track->GetCreatorProcess();

+    // Primary OR in tracker region and above energy threshold?
+    if (isTruePrimary || (insideTrackerRegion && aboveEnergyThreshold)) {

-            /* Decay in tracker? */
-            //if (theCreatorProcess)
-            //    decayInsideTracker = theCreatorProcess->GetProcessName() == "Decay";
-        //}
-    //}

+        // Update track ID for calorimeter SDs.
+        CurrentTrackState::setCurrentTrackID(trackID);

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

+        // Turn on trajectory storage.
+        fpTrackingManager->SetStoreTrajectory(true);

-    /* Store trajectory? */
-    if (isPrimary || (insideTrackerRegion && track->GetKineticEnergy() > regionInfo->getThreshold())) {

+        // Has track information?
+        if (!hasTrackInfo) {
+            // Create the track information and save it.
+            TrackUtil::setupUserTrackInformation(track, true);
+        }

-        /* These tracks should be saved. */
-        save = true;
-
-        /* Turn on trajectory storage in Geant4. */
-        fpTrackingManager->SetStoreTrajectory(true);

+    } else {
+        // Inside tracker region and below energy threshold?
+        if (insideTrackerRegion && !aboveEnergyThreshold) {
+            // Has track information?
+            if (!hasTrackInfo) {
+                // Create track information but do not save it.
+                TrackUtil::setupUserTrackInformation(track, false);
+            }
+        } else {
+            // Track is outside tracking region so turn off trajectory storage.
+            // These are generally tracks from calorimeter showers.
+            fpTrackingManager->SetStoreTrajectory(false);
+        }

-    /* Turn off trajectory storing. */
-    else {
-        fpTrackingManager->SetStoreTrajectory(false);
-    }
-
-    /* Setup the UserTrackInformation if it does not exist. */
-    if (!trackInfo) {
-        TrackUtil::setupUserTrackInformation(track, save);
-    }

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

-    /* Update the TrackSummary with final information about the track. */

+
+    // Get the track information and summary.

     UserTrackInformation* trackInfo = TrackUtil::getUserTrackInformation(track);

-    if (trackInfo) {
-        trackInfo->getTrackSummary()->update(track);

+    TrackSummary* trackSummary = NULL;
+    if (trackInfo != NULL)
+        trackSummary = trackInfo->getTrackSummary();
+
+    // Track has secondaries?
+    if (fpTrackingManager->GimmeSecondaries()->size() > 0 && trackInfo == NULL) {
+        // Tracks with secondaries always get track information but they are not saved by default.
+        trackSummary = TrackUtil::setupUserTrackInformation(track, false)->getTrackSummary();

+
+    // Track summary exists?
+    if (trackSummary != NULL) {
+        // Update the track summary.
+        trackSummary->update(track);
+    }

-}

+
+} // namespace slic

Commit in `projects/slic/branches/v04-00-00-pre` on MAIN
`include/StackingAction.hh`	+25		added 3166
`/TrackUtil.hh`	+2	-1	3165 -> 3166
`/UserTrackInformation.hh`	+10	-1	3165 -> 3166
`src/MCParticleManager.cc`	+1	-1	3165 -> 3166
`/RunManager.cc`	+7	-5	3165 -> 3166
`/StackingAction.cc`	+24		added 3166
`/SteppingAction.cc`	+18		3165 -> 3166
`/TrackManager.cc`	+14	-31	3165 -> 3166
`/TrackSummary.cc`	+11	-2	3165 -> 3166
`/TrackingAction.cc`	+62	-35	3165 -> 3166
	+174	-76