diff -u -r1.2 -r1.3
--- McpHitContrib.cc	4 Mar 2005 22:51:13 -0000	1.2
+++ McpHitContrib.cc	15 Jul 2007 23:38:07 -0000	1.3
@@ -1,11 +1,12 @@

-// $Header: /cvs/lcd/lcdd/src/McpHitContrib.cc,v 1.2 2005/03/04 22:51:13 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/src/McpHitContrib.cc,v 1.3 2007/07/15 23:38:07 wenzel Exp $

 
 #include "McpHitContrib.hh"
 #include "TrackInformation.hh"
 
 #include "G4Track.hh"
 #include "G4Step.hh"

-

+#include "G4ParticleDefinition.hh"
+#include "G4ParticleTypes.hh"

 McpHitContrib::McpHitContrib()
   : m_trackID(-1),
     m_edep(0),

@@ -37,7 +38,14 @@

 
   // setup this contrib using step, track and track info
   m_trackID = trkInfo->getOriginalTrackID();

-  m_edep = aStep->GetTotalEnergyDeposit();

+  if(aTrack->GetDefinition() == G4OpticalPhoton::OpticalPhotonDefinition())
+    {
+      m_edep = aTrack->GetTotalEnergy();
+	 }
+  else
+    {
+      m_edep = aStep->GetTotalEnergyDeposit();
+    }

   m_PdgId = aTrack->GetDefinition()->GetPDGEncoding();
   m_globalTime = aTrack->GetGlobalTime();      
 }