From e2ebb1d97506556d4027095a6d34da6ebe1defef Mon Sep 17 00:00:00 2001
From: jminock <jamesminock1997@gmail.com>
Date: Mon, 18 Nov 2024 10:29:15 -0500
Subject: [PATCH] Tuning and Timing fixes (#20)

* tuning and timing fixes

* changed QEratioWB to 1.025 for safety

* Update WCSimPrimaryGeneratorAction.cc

correct comment to account for change

---------

Co-authored-by: James Minock <jminock@anniegpvm02.fnal.gov>
Co-authored-by: marc1uk <marc1uk_@hotmail.com>
---
 macros/tuning_parameters.mac       |  4 ++--
 src/WCSimPrimaryGeneratorAction.cc |  2 +-
 src/WCSimWCSD.cc                   | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/macros/tuning_parameters.mac b/macros/tuning_parameters.mac
index 1211a988f..492fd4001 100644
--- a/macros/tuning_parameters.mac
+++ b/macros/tuning_parameters.mac
@@ -11,9 +11,9 @@
 /WCSim/tuning/holderrff 0.90		#default: 0.90
 /WCSim/tuning/holderrfflux 0.70		#default: 0.70
 /WCSim/tuning/linerrff 0.87		#default: 0.87
-/WCSim/tuning/QEratio 1.40		#default: 1.40
+/WCSim/tuning/QEratio 1.025		#default: 1.40
 /WCSim/tuning/rgcffr7081 0.32		#default: 0.32
-/WCSim/tuning/QEratioWB 1.00		#default: 1.00
+/WCSim/tuning/QEratioWB 1.025		#default: 1.00
 
 #Turning holders on (1) or off (0)
 /WCSim/tuning/holder 1
diff --git a/src/WCSimPrimaryGeneratorAction.cc b/src/WCSimPrimaryGeneratorAction.cc
index bdfca1cc0..d326ba13b 100644
--- a/src/WCSimPrimaryGeneratorAction.cc
+++ b/src/WCSimPrimaryGeneratorAction.cc
@@ -817,7 +817,7 @@ void WCSimPrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent)
 			
 			particleGun->SetParticleEnergy(keval);       // !!!kinetic!!! energy
 			particleGun->SetParticlePosition(thevtx);
-			//particleGun->SetParticleTime(vtxtval);     // set event time t=0 for prompt trigger.
+			particleGun->SetParticleTime(vtxtval);       // propagate entry time from upstream GENIE (t=0 at protons on target)
 			particleGun->SetParticleMomentumDirection(thepdir);
 			particleGun->GeneratePrimaryVertex(anEvent); //anEvent provided by G4 when invoking the method
 			//G4cout<<"Vertex set"<<G4endl;
diff --git a/src/WCSimWCSD.cc b/src/WCSimWCSD.cc
index c6612ba16..d59383e52 100644
--- a/src/WCSimWCSD.cc
+++ b/src/WCSimWCSD.cc
@@ -114,14 +114,14 @@ G4bool WCSimWCSD::ProcessHits(G4Step* aStep, G4TouchableHistory*)
   if (pmtwiseqe && detectorElement=="tank" && replicaNumber<133 && replicaNumber>0) pmtwiseratio = vector_pmtqe.at(replicaNumber-1);
 
   G4double QEratio = tuning->GetQERatio();
-  G4double QEratioWB = tuning->GetQERatioWB();
+  //G4double QEratioWB = tuning->GetQERatioWB();
   //G4cout <<"QERatio: "<<QEratio<<", QEratioWB: "<<QEratioWB<<G4endl;
   //G4cout <<"volumeName: "<<volumeName<<", replicaNumber: "<<replicaNumber<<", pmtwiseratio: "<<pmtwiseratio<<G4endl;
-  if (volumeName == "ANNIEp2v7-glassFaceWCPMT_R7081" || volumeName == "ANNIEp2v7-glassFaceWCPMT_R7081HQE" || volumeName == "ANNIEp2v7-glassFaceWCPMT_D784KFLB"){
-    ratio = QEratioWB;
-  } else { 
-    ratio = QEratio;
-  }
+  //if (volumeName == "ANNIEp2v7-glassFaceWCPMT_R7081" || volumeName == "ANNIEp2v7-glassFaceWCPMT_R7081HQE" || volumeName == "ANNIEp2v7-glassFaceWCPMT_D784KFLB"){
+  //  ratio = QEratioWB;
+  //} else { 
+  ratio = QEratio;
+  //}
   ratio *= pmtwiseratio;
   //G4cout <<"ratio: "<<ratio<<G4endl; 
   //G4cout <<"QEratio: "<<QEratio<<G4endl;