lcdd/src
diff -u -r1.5 -r1.6
--- G4OpticalCalorimeter.cc 1 Apr 2008 19:52:47 -0000 1.5
+++ G4OpticalCalorimeter.cc 30 Dec 2008 02:44:09 -0000 1.6
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/G4OpticalCalorimeter.cc,v 1.5 2008/04/01 19:52:47 wenzel Exp $
+// $Header: /cvs/lcd/lcdd/src/G4OpticalCalorimeter.cc,v 1.6 2008/12/30 02:44:09 wenzel Exp $
#include "G4OpticalCalorimeterSD.hh"
@@ -54,33 +54,18 @@
G4bool G4OpticalCalorimeterSD::ProcessHits(G4Step* aStep, G4TouchableHistory* tahis)
{
- // set cached step
-// G4SensitiveDetector::ProcessHits(aStep, 0);
- G4Track * aTrack = aStep->GetTrack();
-
- if(aTrack->GetCreatorProcess()==0)
- {
- return false;
- }
+ G4Track * aTrack = aStep->GetTrack();
// check that particle is optical photon:
if(aTrack->GetDefinition() != G4OpticalPhoton::OpticalPhotonDefinition())
{
- G4String processname = aTrack->GetCreatorProcess()->G4VProcess::GetProcessName();
- // G4cout << "Process Name : "<<processname<<G4endl;
return G4CalorimeterSD::ProcessHits(aStep, tahis);
}
else
{
G4SensitiveDetector::ProcessHits(aStep, 0);
- if(aTrack->GetParentID()==0) {
- // particle is primary
- aTrack->SetTrackStatus(fStopAndKill);
- return false;
- }
-
- // particle is secondary
+
G4String processname = aTrack->GetCreatorProcess()->G4VProcess::GetProcessName();
// deal only with Cerenkov photons