From 63acecb13340e094c9dbaa4fad8947d120496fa1 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sat, 28 Jul 2018 14:27:13 -0400
Subject: [PATCH 1/2] For optical photon that reach geom boundary, store post
 step point

This fixes #127.

Issues created? Maybe some.
- How do we want to store optical photon hits? Ideally none at all since
the only physical way to detect them is by absorption on a surface...
- This may impact how optical photons (but only optical photons) are
store currently.
---
 src/remollGenericDetector.cc | 66 +++++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/src/remollGenericDetector.cc b/src/remollGenericDetector.cc
index 1273ae800..c16e36a85 100644
--- a/src/remollGenericDetector.cc
+++ b/src/remollGenericDetector.cc
@@ -101,12 +101,12 @@ G4bool remollGenericDetector::ProcessHits( G4Step *step, G4TouchableHistory *){
     }
 
     // Get the step point and track
-    G4StepPoint *point = step->GetPreStepPoint();
-    G4Track     *track = step->GetTrack();
+    G4StepPoint* prepoint = step->GetPreStepPoint();
+    G4StepPoint* postpoint = step->GetPostStepPoint();
+    G4Track*     track = step->GetTrack();
 
     // Get touchable volume info
-    G4TouchableHistory *hist = (G4TouchableHistory*)(point->GetTouchable());
-    //G4int  copyID = hist->GetVolume(1)->GetCopyNo();//return the copy id of the parent volume
+    G4TouchableHistory *hist = (G4TouchableHistory*)(prepoint->GetTouchable());
     G4int  copyID = hist->GetVolume()->GetCopyNo();//return the copy id of the logical volume
 
     G4double edep = step->GetTotalEnergyDeposit();
@@ -114,45 +114,48 @@ G4bool remollGenericDetector::ProcessHits( G4Step *step, G4TouchableHistory *){
     // We're just going to record primary particles and things
     // that have just entered our boundary
     badhit = true;
-    if( track->GetCreatorProcess() == 0 ||
-	(fDetectSecondaries && point->GetStepStatus() == fGeomBoundary)
-      ){
+    if (track->GetCreatorProcess() == 0 ||
+	(fDetectSecondaries && prepoint->GetStepStatus() == fGeomBoundary)) {
 	badhit = false;
     }
 
-
-    //  Make pointer to new hit if it's a valid track
-    remollGenericDetectorHit *thishit;
-    if( !badhit ){
-	thishit = new remollGenericDetectorHit(fDetNo, copyID);
-	fHitColl->insert( thishit );
+    badedep = false;
+    if (edep <= 0.0) {
+        badedep = true;
     }
 
-    //  Get pointer to our sum  /////////////////////////
-    remollGenericDetectorSum *thissum = NULL;
-
-    if( !fSumMap.count(copyID) ){
-	if( edep > 0.0 ){
-	    thissum = new remollGenericDetectorSum(fDetNo, copyID);
-	    fSumMap[copyID] = thissum;
-	    fSumColl->insert( thissum );
-	} else {
-	    badedep = true;
-	}
-    } else {
-	thissum = fSumMap[copyID];
-    } 
     /////////////////////////////////////////////////////
 
     // Do the actual data grabbing
 
-    if( !badedep ){
-	// This is all we need to do for the sum
-	thissum->fEdep += edep;
+    if (! badedep) {
+        // Sum
+        remollGenericDetectorSum* thissum = 0;
+        if (! fSumMap.count(copyID)) {
+	    thissum = new remollGenericDetectorSum(fDetNo, copyID);
+	    fSumMap[copyID] = thissum;
+	    fSumColl->insert(thissum);
+        } else thissum = fSumMap[copyID];
+
+        // Add energy deposit
+        thissum->fEdep += edep;
     }
 
-    if( !badhit ){
+    if (! badhit) {
 	// Hit
+	remollGenericDetectorHit* thishit = new remollGenericDetectorHit(fDetNo, copyID);
+	fHitColl->insert( thishit );
+
+        // Which point do we store?
+        G4StepPoint* point = 0;
+        // optical absorption
+        if (step->GetTrack()->GetDefinition() == G4OpticalPhoton::OpticalPhotonDefinition()
+         && postpoint->GetStepStatus() == fGeomBoundary) {
+          point = postpoint;
+        // all other cases
+        } else {
+          point = prepoint;
+        }
 
 	// Positions
 	G4ThreeVector global_position = point->GetPosition();
@@ -177,6 +180,7 @@ G4bool remollGenericDetector::ProcessHits( G4Step *step, G4TouchableHistory *){
 	// FIXME - Enumerate encodings
 	thishit->fGen   = (long int) track->GetCreatorProcess();
 
+        thishit->fEdep  = step->GetTotalEnergyDeposit();
     }
 
     return !badedep && !badhit;

From fd0599844297816dfe247b5744b7eecccb5eb790 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Wed, 1 Aug 2018 10:37:14 +0100
Subject: [PATCH 2/2] No Edep field (pulled in through cherry-pick)

---
 src/remollGenericDetector.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/remollGenericDetector.cc b/src/remollGenericDetector.cc
index c16e36a85..d68b7bf6c 100644
--- a/src/remollGenericDetector.cc
+++ b/src/remollGenericDetector.cc
@@ -179,8 +179,6 @@ G4bool remollGenericDetector::ProcessHits( G4Step *step, G4TouchableHistory *){
 
 	// FIXME - Enumerate encodings
 	thishit->fGen   = (long int) track->GetCreatorProcess();
-
-        thishit->fEdep  = step->GetTotalEnergyDeposit();
     }
 
     return !badedep && !badhit;