Merge pull request #43 from rest-for-physics/lobis-threshold-tpc

add threshold energy tpc parameter
rest-for-physics · Mar 7, 2024 · 9d46a0a · 9d46a0a
2 parents fbb5bfa + 39f46e1
commit 9d46a0a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/inc/TRestDetectorSignalToRawSignalProcess.h b/inc/TRestDetectorSignalToRawSignalProcess.h
@@ -69,6 +69,7 @@ class TRestDetectorSignalToRawSignalProcess : public TRestEventProcess {
 
     /// This parameter is used by integralWindow trigger mode to define the acquisition window.
     Double_t fIntegralThreshold = 1229.0;
+    Double_t fIntegralThresholdTPCkeV = 0.1;
 
     /// two distinct energy values used for calibration
     TVector2 fCalibrationEnergy = TVector2(0.0, 0.0);
@@ -148,7 +149,7 @@ class TRestDetectorSignalToRawSignalProcess : public TRestEventProcess {
     std::map<std::string, Parameters> fParametersMap;
     std::set<std::string> fReadoutTypes;
 
-    ClassDefOverride(TRestDetectorSignalToRawSignalProcess, 6);
+    ClassDefOverride(TRestDetectorSignalToRawSignalProcess, 7);
 };
 
 #endif
diff --git a/src/TRestDetectorSignalToRawSignalProcess.cxx b/src/TRestDetectorSignalToRawSignalProcess.cxx
@@ -290,12 +290,11 @@ TRestEvent* TRestDetectorSignalToRawSignalProcess::ProcessEvent(TRestEvent* inpu
             RESTDebug << "TRestDetectorSignalToRawSignalProcess::ProcessEvent: "
                       << "Trigger mode integralThresholdTPC" << RESTendl;
 
-            const double signalIntegralThreshold = 0.5;  // keV
             double totalEnergy = 0;
             for (const auto& signal : tpcSignals) {
                 totalEnergy += signal->GetIntegral();
             }
-            if (totalEnergy < signalIntegralThreshold) {
+            if (totalEnergy < fIntegralThresholdTPCkeV) {
                 return nullptr;
             }
 
@@ -340,7 +339,7 @@ TRestEvent* TRestDetectorSignalToRawSignalProcess::ProcessEvent(TRestEvent* inpu
                 if (energy > maxEnergy) {
                     maxEnergy = energy;
                 }
-                if (maxEnergy > signalIntegralThreshold) {
+                if (maxEnergy >= fIntegralThresholdTPCkeV) {
                     thresholdReached = true;
                     break;
                 }
@@ -577,6 +576,15 @@ void TRestDetectorSignalToRawSignalProcess::InitFromConfigFile() {
 
     fTriggerDelay = StringToInteger(GetParameter("triggerDelay", fTriggerDelay));
     fIntegralThreshold = StringToDouble(GetParameter("integralThreshold", fIntegralThreshold));
+    fIntegralThresholdTPCkeV =
+        StringToDouble(GetParameter("integralThresholdTPCkeV", fIntegralThresholdTPCkeV));
+    if (fIntegralThresholdTPCkeV <= 0) {
+        RESTWarning << "integralThresholdTPCkeV must be greater than 0: " << fIntegralThresholdTPCkeV
+                    << RESTendl;
+        // This should always be an error but breaks the CI...
+        // exit(1);
+    }
+
     fTriggerFixedStartTime = GetDblParameterWithUnits("triggerFixedStartTime", fTriggerFixedStartTime);
 
     // load default parameters (for backward compatibility)