Use the truncated times/charges for creating digits

Add Digitizer Precisions to WCSimRootOptions

Author: tdealtry

include/WCSimRootOptions.hh

@@ -55,10 +55,14 @@ public:
   void SetDigitizerClassName(string iDigitizerClassName) {DigitizerClassName = iDigitizerClassName;}
   void SetDigitizerDeadTime(int iDigitizerDeadTime) {DigitizerDeadTime = iDigitizerDeadTime;}
   void SetDigitizerIntegrationWindow(int iDigitizerIntegrationWindow) {DigitizerIntegrationWindow = iDigitizerIntegrationWindow;}
+  void SetDigitizerTimingPrecision(double iDigitizerTimingPrecision) {DigitizerTimingPrecision = iDigitizerTimingPrecision;}
+  void SetDigitizerPEPrecision(double iDigitizerPEPrecision) {DigitizerPEPrecision = iDigitizerPEPrecision;}
   //WCSimWCDigitizer* gets
   string GetDigitizerClassName() {return DigitizerClassName;}
   int    GetDigitizerDeadTime() {return DigitizerDeadTime;}
   int    GetDigitizerIntegrationWindow() {return DigitizerIntegrationWindow;}
+  int    GetDigitizerTimingPrecision() {return DigitizerTimingPrecision;}
+  int    GetDigitizerPEPrecision() {return DigitizerPEPrecision;}
   //WCSimWCTrigger* sets
   void SetTriggerClassName(string itriggerClassName) {TriggerClassName = itriggerClassName;};
   void SetMultiDigitsPerTrigger(bool imultiDigitsPerTrigger) {MultiDigitsPerTrigger = imultiDigitsPerTrigger;};
@@ -139,6 +143,8 @@ private:
   string DigitizerClassName;
   int    DigitizerDeadTime; // ns
   int    DigitizerIntegrationWindow; // ns
+  int    DigitizerTimingPrecision; // 
+  int    DigitizerPEPrecision; // 
 
   //WCSimWCTrigger*
   string TriggerClassName;

src/WCSimRootOptions.cc

@@ -44,6 +44,8 @@ void WCSimRootOptions::Print(Option_t *) const
     << "\tDigitizerClassName: " << DigitizerClassName << endl
     << "\tDigitizerDeadTime: " << DigitizerDeadTime << " ns" << endl
     << "\tDigitizerIntegrationWindow: " << DigitizerIntegrationWindow << " ns" << endl
+    << "\tDigitizerTimingPrecision: " << DigitizerTimingPrecision << " ns" << endl
+    << "\tDigitizerPEPrecision: " << DigitizerPEPrecision << " ns" << endl
     << "Trigger options:" << endl
     << "\tTriggerClassName: " << TriggerClassName << endl
     << "\tMultiDigitsPerTrigger: " << MultiDigitsPerTrigger << endl

src/WCSimWCDigitizer.cc

@@ -107,31 +107,33 @@ void WCSimWCDigitizerBase::Digitize()
 
 bool WCSimWCDigitizerBase::AddNewDigit(int tube, int gate, float digihittime, float peSmeared, std::vector<int> digi_comp)
 {
+  //digitised hit information does not have infinite precision
+  //so need to round the charge and time information
+  double digihittime_d = Truncate(digihittime, DigitizerTimingPrecision);
+  double peSmeared_d   = Truncate(peSmeared,   DigitizerPEPrecision);
+
   //gate is not a trigger, but just the position of the digit in the array
   //inside the WCSimWCDigi object
 #ifdef WCSIMWCDIGITIZER_VERBOSE
   if(tube < NPMTS_VERBOSE) {
     G4cout<<"Adding hit "<<gate<<" in tube "<<tube
-	  << " with time " << digihittime << " charge " << peSmeared
+	  << " with time " << digihittime_d << " charge " << peSmeared_d
+	  << " (truncated from t: " << digihittime << " q: " << peSmeared << ")"
 	  << " (made of " << digi_comp.size() << " raw hits with IDs ";
     for(unsigned int iv = 0; iv < digi_comp.size(); iv++)
       G4cout << " " << digi_comp[iv] << ",";
     G4cout << ")";
   }
 #endif
 
-  //digitised hit information does not have infinite precision
-  //so need to round the charge and time information
-  double digihittime_d = Truncate(digihittime, DigitizerTimingPrecision);
-  double peSmeared_d   = Truncate(peSmeared,   DigitizerPEPrecision);
-
+  //use un-truncated peSmeared here, so that truncation does not affect the test
   if (peSmeared > 0.0) {
       if ( DigiStoreHitMap[tube] == 0) {
 	WCSimWCDigi* Digi = new WCSimWCDigi();
 	Digi->SetTubeID(tube);
-	Digi->SetPe(gate,peSmeared);
-	Digi->AddPe(digihittime);
-	Digi->SetTime(gate,digihittime);
+	Digi->SetPe(gate,peSmeared_d);
+	Digi->AddPe(digihittime_d);
+	Digi->SetTime(gate,digihittime_d);
 	Digi->AddDigiCompositionInfo(digi_comp);
 	DigiStoreHitMap[tube] = DigiStore->insert(Digi);
 #ifdef WCSIMWCDIGITIZER_VERBOSE
@@ -140,9 +142,9 @@ bool WCSimWCDigitizerBase::AddNewDigit(int tube, int gate, float digihittime, fl
 #endif
       }
       else {
-	(*DigiStore)[DigiStoreHitMap[tube]-1]->SetPe(gate,peSmeared);
-	(*DigiStore)[DigiStoreHitMap[tube]-1]->SetTime(gate,digihittime);
-	(*DigiStore)[DigiStoreHitMap[tube]-1]->AddPe(digihittime);
+	(*DigiStore)[DigiStoreHitMap[tube]-1]->SetPe(gate,peSmeared_d);
+	(*DigiStore)[DigiStoreHitMap[tube]-1]->SetTime(gate,digihittime_d);
+	(*DigiStore)[DigiStoreHitMap[tube]-1]->AddPe(digihittime_d);
 	(*DigiStore)[DigiStoreHitMap[tube]-1]->AddDigiCompositionInfo(digi_comp);
 #ifdef WCSIMWCDIGITIZER_VERBOSE
 	if(tube < NPMTS_VERBOSE)
@@ -154,8 +156,8 @@ bool WCSimWCDigitizerBase::AddNewDigit(int tube, int gate, float digihittime, fl
   else {
 #ifdef WCSIMWCDIGITIZER_VERBOSE
     if(tube < NPMTS_VERBOSE)
-      G4cout << "DIGIT REJECTED with charge " << peSmeared
-	     << " time " << digihittime << G4endl;
+      G4cout << "DIGIT REJECTED with charge " << peSmeared_d
+	     << " time " << digihittime_d << G4endl;
 #endif
     return false;
   }
@@ -166,6 +168,8 @@ void WCSimWCDigitizerBase::SaveOptionsToOutput(WCSimRootOptions * wcopt)
   wcopt->SetDigitizerClassName(DigitizerClassName);
   wcopt->SetDigitizerDeadTime(DigitizerDeadTime);
   wcopt->SetDigitizerIntegrationWindow(DigitizerIntegrationWindow);
+  wcopt->SetDigitizerTimingPrecision(DigitizerTimingPrecision);
+  wcopt->SetDigitizerPEPrecision(DigitizerPEPrecision);
 }