Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TRestRawSignalAnalysisProcess. fIntegralRange renamed to fAnalysisRange #111

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions inc/TRestRawSignalAnalysisProcess.h
Original file line number Diff line number Diff line change
@@ -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
19 changes: 0 additions & 19 deletions inc/TRestRawSignalConvolutionFittingProcess.h
Original file line number Diff line number Diff line change
@@ -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();
}

4 changes: 2 additions & 2 deletions pipeline/processes/analysis/veto.rml
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@
</addProcess>

<addProcess type="TRestRawSignalAnalysisProcess" name="vetoRaw" value="ON" signalsRange="(4612,4888)"
baseLineRange="(${BL_MIN},${BL_MAX})" integralRange="(${INT_MIN},${INT_MAX})"
baseLineRange="(${BL_MIN},${BL_MAX})" analysisRange="(${INT_MIN},${INT_MAX})"
pointThreshold="${POINT_TH}" pointsOverThreshold="${NPOINTS}" signalThreshold="${SGNL_TH}"
verboseLevel="silent" >
<observable name="max_amplitude_map" type="map<int,double>" value="ON" />
@@ -52,7 +52,7 @@
</addProcess>

<addProcess type="TRestRawSignalAnalysisProcess" name="mmRaw" value="ON"
baseLineRange="(${BL_MIN},${BL_MAX})" integralRange="(${INT_MIN},${INT_MAX})"
baseLineRange="(${BL_MIN},${BL_MAX})" analysisRange="(${INT_MIN},${INT_MAX})"
pointThreshold="${POINT_TH}" pointsOverThreshold="${NPOINTS}" signalThreshold="${SGNL_TH}"
verboseLevel="silent" >
// We define all observables except MinValue because is not yet on validation.root
4 changes: 2 additions & 2 deletions src/TRestRawSignalAnalysisProcess.cxx
Original file line number Diff line number Diff line change
@@ -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);
14 changes: 0 additions & 14 deletions src/TRestRawSignalConvolutionFittingProcess.cxx
Original file line number Diff line number Diff line change
@@ -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"));
*/
}