Merge pull request #58 from rest-for-physics/nkx111-patch-2

Avoid invoking hardcoded process names
rest-for-physics · Sep 9, 2022 · fb0927e · fb0927e
2 parents b48afee + 11b67ee
commit fb0927e
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/src/TRestDetectorSingleChannelAnalysisProcess.cxx b/src/TRestDetectorSingleChannelAnalysisProcess.cxx
@@ -95,14 +95,11 @@ TRestEvent* TRestDetectorSingleChannelAnalysisProcess::ProcessEvent(TRestEvent*
     Double_t new_PeakAmplitudeIntegral = 0;
     Double_t new_ThresholdIntegral = 0;
 
-    map<int, Double_t> sAna_max_amplitude_map =
-        fAnalysisTree->GetObservableValue<map<int, Double_t>>("sAna_max_amplitude_map");
-    map<int, Double_t> sAna_thr_integral_map =
-        fAnalysisTree->GetObservableValue<map<int, Double_t>>("sAna_thr_integral_map");
-    Double_t sAna_PeakAmplitudeIntegral =
-        fAnalysisTree->GetObservableValue<Double_t>("sAna_PeakAmplitudeIntegral");
-    Double_t sAna_ThresholdIntegral = fAnalysisTree->GetObservableValue<Double_t>("sAna_ThresholdIntegral");
-    Double_t sAna_NumberOfGoodSignals = fAnalysisTree->GetObservableValue<int>("sAna_NumberOfGoodSignals");
+    map<int, Double_t> sAna_max_amplitude_map = GetObservableValue<map<int, Double_t>>("max_amplitude_map");
+    map<int, Double_t> sAna_thr_integral_map = GetObservableValue<map<int, Double_t>>("thr_integral_map");
+    Double_t sAna_PeakAmplitudeIntegral = GetObservableValue<Double_t>("PeakAmplitudeIntegral");
+    Double_t sAna_ThresholdIntegral = GetObservableValue<Double_t>("ThresholdIntegral");
+    Double_t sAna_NumberOfGoodSignals = GetObservableValue<int>("NumberOfGoodSignals");
 
     if (fCreateGainMap) {
         if ((sAna_ThresholdIntegral > fThrIntegralCutRange.X() &&