diff --git a/inc/TRestRawSignalAnalysisProcess.h b/inc/TRestRawSignalAnalysisProcess.h
index 2ee95921..9cb79b6b 100644
--- a/inc/TRestRawSignalAnalysisProcess.h
+++ b/inc/TRestRawSignalAnalysisProcess.h
@@ -40,7 +40,7 @@ class TRestRawSignalAnalysisProcess : public TRestEventProcess {
TVector2 fBaseLineRange = TVector2(5, 55);
/// The range where the observables will be calculated
- TVector2 fIntegralRange = TVector2(10, 500);
+ TVector2 fAnalysisRange = TVector2(10, 500);
/// Option for calculation of baseline parameters, can be set to "ROBUST"
std::string fBaseLineOption = ""; //<
@@ -74,7 +74,7 @@ class TRestRawSignalAnalysisProcess : public TRestEventProcess {
RESTMetadata << "Baseline range : ( " << fBaseLineRange.X() << " , " << fBaseLineRange.Y() << " ) "
<< RESTendl;
- RESTMetadata << "Integral range : ( " << fIntegralRange.X() << " , " << fIntegralRange.Y() << " ) "
+ RESTMetadata << "Integral range : ( " << fAnalysisRange.X() << " , " << fAnalysisRange.Y() << " ) "
<< RESTendl;
RESTMetadata << "Point Threshold : " << fPointThreshold << " sigmas" << RESTendl;
RESTMetadata << "Signal threshold : " << fSignalThreshold << " sigmas" << RESTendl;
@@ -90,6 +90,6 @@ class TRestRawSignalAnalysisProcess : public TRestEventProcess {
TRestRawSignalAnalysisProcess(); // Constructor
~TRestRawSignalAnalysisProcess(); // Destructor
- ClassDefOverride(TRestRawSignalAnalysisProcess, 5);
+ ClassDefOverride(TRestRawSignalAnalysisProcess, 6);
};
#endif
diff --git a/inc/TRestRawSignalConvolutionFittingProcess.h b/inc/TRestRawSignalConvolutionFittingProcess.h
index c405d8ce..af11392a 100644
--- a/inc/TRestRawSignalConvolutionFittingProcess.h
+++ b/inc/TRestRawSignalConvolutionFittingProcess.h
@@ -36,13 +36,6 @@ class TRestRawSignalConvolutionFittingProcess : public TRestEventProcess {
/// A pointer to the specific TRestRawSignalEvent input
TRestRawSignalEvent* fRawSignalEvent; //!
- /* Metadata members
- TVector2 fBaseLineRange;
- TVector2 fIntegralRange;
- Double_t fPointThreshold;
- Double_t fSignalThreshold;
- Int_t fNPointsOverThreshold; */
-
void InitFromConfigFile() override;
void Initialize() override;
@@ -65,18 +58,6 @@ class TRestRawSignalConvolutionFittingProcess : public TRestEventProcess {
void PrintMetadata() override {
BeginPrintProcess();
- /*
- metadata << "Baseline range : ( " << fBaseLineRange.X() << " , " <<
- fBaseLineRange.Y() << " ) "
- << endl;
- metadata << "Integral range : ( " << fIntegralRange.X() << " , " <<
- fIntegralRange.Y() << " ) " << endl;
- metadata << "Point Threshold : " << fPointThreshold << " sigmas" << endl;
- metadata << "Signal threshold : " << fSignalThreshold << " sigmas" << endl;
- metadata << "Number of points over threshold : " << fNPointsOverThreshold << endl;
- metadata << " " << endl;
- */
-
EndPrintProcess();
}
diff --git a/pipeline/processes/analysis/veto.rml b/pipeline/processes/analysis/veto.rml
index cf62bdba..4b6773e3 100644
--- a/pipeline/processes/analysis/veto.rml
+++ b/pipeline/processes/analysis/veto.rml
@@ -40,7 +40,7 @@
@@ -52,7 +52,7 @@
// We define all observables except MinValue because is not yet on validation.root
diff --git a/src/TRestRawSignalAnalysisProcess.cxx b/src/TRestRawSignalAnalysisProcess.cxx
index cdd6c004..d1e2c48e 100644
--- a/src/TRestRawSignalAnalysisProcess.cxx
+++ b/src/TRestRawSignalAnalysisProcess.cxx
@@ -35,7 +35,7 @@
/// methods, instead of mean and standard deviation, the median and IQR sigma
/// are used.
///
-/// * **integralRange**: The calculated observables will only consider points
+/// * **analysisRange**: The calculated observables will only consider points
/// found inside this range.
///
/// There are 3 additional parameters that are used in combination to identify
@@ -318,7 +318,7 @@ TRestEvent* TRestRawSignalAnalysisProcess::ProcessEvent(TRestEvent* inputEvent)
// This will affect the calculation of observables, but not the stored
// TRestRawSignal data.
fSignalEvent->SetBaseLineRange(fBaseLineRange, fBaseLineOption);
- fSignalEvent->SetRange(fIntegralRange);
+ fSignalEvent->SetRange(fAnalysisRange);
for (int s = 0; s < fSignalEvent->GetNumberOfSignals(); s++) {
TRestRawSignal* sgnl = fSignalEvent->GetSignal(s);
diff --git a/src/TRestRawSignalConvolutionFittingProcess.cxx b/src/TRestRawSignalConvolutionFittingProcess.cxx
index 261dff10..828c974b 100644
--- a/src/TRestRawSignalConvolutionFittingProcess.cxx
+++ b/src/TRestRawSignalConvolutionFittingProcess.cxx
@@ -352,17 +352,3 @@ void TRestRawSignalConvolutionFittingProcess::EndProcess() {
// Comment this if you don't want it.
// TRestEventProcess::EndProcess();
}
-
-///////////////////////////////////////////////
-/// \brief Function to read input parameters.
-///
-void TRestRawSignalConvolutionFittingProcess::InitFromConfigFile() {
- /* Parameters to initialize from RML
- fBaseLineRange = StringTo2DVector(GetParameter("baseLineRange", "(5,55)"));
- fIntegralRange = StringTo2DVector(GetParameter("integralRange", "(10,500)"));
- fPointThreshold = StringToDouble(GetParameter("pointThreshold", "2"));
- fNPointsOverThreshold = StringToInteger(GetParameter("pointsOverThreshold",
- "5"));
- fSignalThreshold = StringToDouble(GetParameter("signalThreshold", "5"));
- */
-}