projects/lcdd/branches/v00-00-01_LCDD-104-dev/src/lcdd/detectors

--- projects/lcdd/branches/v00-00-01_LCDD-104-dev/src/lcdd/detectors/StepCombiningTrackerHitProcessor.cc	2014-01-09 20:37:54 UTC (rev 2864)
+++ projects/lcdd/branches/v00-00-01_LCDD-104-dev/src/lcdd/detectors/StepCombiningTrackerHitProcessor.cc	2014-01-09 22:15:32 UTC (rev 2865)
@@ -2,7 +2,7 @@

 
 // LCDD
 #include "lcdd/detectors/StepCombiningTrackerHitProcessor.hh"

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

+//#include "lcdd/hits/TrackInformation.hh"

 
 // Geant
 #include "G4Geantino.hh"

@@ -12,17 +12,6 @@

         TrackerHitProcessor(tracker), _currentTrackID(-1), _currentPV(0), _edepTotal(0.), _minTime(0.), _startedHit(false), _currentTrack(0) {
 }
 

-int _currentTrackID;
-G4VPhysicalVolume* _currentPV;
-G4ThreeVector _entryPoint;
-G4ThreeVector _exitPoint;
-G4ThreeVector _entryMomentum;
-G4ThreeVector _exitMomentum;
-G4double _edepTotal;
-G4double _minTime;
-bool _startedHit;
-G4Track* _currentTrack;
-

 StepCombiningTrackerHitProcessor::~StepCombiningTrackerHitProcessor() {
 }
 

@@ -153,7 +142,10 @@

     _tracker->addHit(hit);
 
     // Set tracker hit flag on track information.

-    TrackInformation::getTrackInformation(_currentTrack)->setHasTrackerHit(true);

+    //TrackInformation* trackInfo = TrackInformation::getTrackInformation(_currentTrack);
+    //if (trackInfo != 0) {
+    //    trackInfo->setHasTrackerHit(true);
+    //}

 
     // Clear the cached hit data.
     clear();

projects/lcdd/branches/v00-00-01_LCDD-104-dev/src/lcdd/hits

--- projects/lcdd/branches/v00-00-01_LCDD-104-dev/src/lcdd/hits/HitContribution.cc	2014-01-09 20:37:54 UTC (rev 2864)
+++ projects/lcdd/branches/v00-00-01_LCDD-104-dev/src/lcdd/hits/HitContribution.cc	2014-01-09 22:15:32 UTC (rev 2865)
@@ -11,7 +11,7 @@

 #include "G4ParticleTypes.hh"
 
 HitContribution::HitContribution() :

-        _trackID(-1), _edep(0), _PdgId(9999999), _globalTime(0) {

+        _trackID(0), _edep(0), _PdgId(0), _globalTime(0) {

     ;
 }
 

@@ -26,26 +26,29 @@

 
 HitContribution::HitContribution(const G4Step* aStep) {
     // Get the track.

-    const G4Track* aTrack = aStep->GetTrack();

+    const G4Track* track = aStep->GetTrack();

 
     // Get the track information.

-    TrackInformation* trkInfo = static_cast<TrackInformation*>(aTrack->GetUserInformation());

+    //TrackInformation* trackInfo = static_cast<TrackInformation*>(track->GetUserInformation());

 
     // Get the track ID.

-    _trackID = trkInfo->getOriginalTrackID();

+    //if (trackInfo) {
+    //    _trackID = trackInfo->getOriginalTrackID();
+    //}
+    _trackID = track->GetTrackID();

 
     // Set edep according to type of track.

-    if (aTrack->GetDefinition() == G4OpticalPhoton::OpticalPhotonDefinition()) {
-        _edep = aTrack->GetTotalEnergy();

+    if (track->GetDefinition() == G4OpticalPhoton::OpticalPhotonDefinition()) {
+        _edep = track->GetTotalEnergy();

     } else {
         _edep = aStep->GetTotalEnergyDeposit();
     }
 
     // PDG ID.

-    _PdgId = aTrack->GetDefinition()->GetPDGEncoding();

+    _PdgId = track->GetDefinition()->GetPDGEncoding();

 
     // Global time.

-    _globalTime = aTrack->GetGlobalTime();

+    _globalTime = track->GetGlobalTime();

 
     // Compute the step midpoint.
     G4ThreeVector posVec = (0.5 * (aStep->GetPreStepPoint()->GetPosition() + aStep->GetPostStepPoint()->GetPosition()));