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

TRestRawToDetectorSignalProcess. fIntegralRange is now fAnalysisRange #34

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
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/TRestRawToDetectorSignalProcess.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class TRestRawToDetectorSignalProcess : public TRestEventProcess {
TVector2 fBaseLineRange = TVector2(5, 55);

/// The ADC range used for integral definition and signal identification
TVector2 fIntegralRange = TVector2(10, 500);
TVector2 fAnalysisRange = TVector2(10, 500);

/// Number of sigmas over baseline fluctuation to accept a point is over threshold.
Double_t fPointThreshold = 3;
Expand Down Expand Up @@ -92,7 +92,7 @@ class TRestRawToDetectorSignalProcess : public TRestEventProcess {
if (fZeroSuppression) {
RESTMetadata << "Base line range definition : ( " << fBaseLineRange.X() << " , "
<< fBaseLineRange.Y() << " ) " << RESTendl;
RESTMetadata << "Integral range : ( " << fIntegralRange.X() << " , " << fIntegralRange.Y()
RESTMetadata << "Analysis range : ( " << fAnalysisRange.X() << " , " << fAnalysisRange.Y()
<< " ) " << RESTendl;
RESTMetadata << "Point Threshold : " << fPointThreshold << " sigmas" << RESTendl;
RESTMetadata << "Signal threshold : " << fSignalThreshold << " sigmas" << RESTendl;
Expand All @@ -117,6 +117,6 @@ class TRestRawToDetectorSignalProcess : public TRestEventProcess {
// Destructor
~TRestRawToDetectorSignalProcess();

ClassDefOverride(TRestRawToDetectorSignalProcess, 2);
ClassDefOverride(TRestRawToDetectorSignalProcess, 3);
};
#endif
2 changes: 1 addition & 1 deletion src/TRestRawToDetectorSignalProcess.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ TRestEvent* TRestRawToDetectorSignalProcess::ProcessEvent(TRestEvent* inputEvent

if (fZeroSuppression) {
fInputSignalEvent->SetBaseLineRange(fBaseLineRange);
fInputSignalEvent->SetRange(fIntegralRange);
fInputSignalEvent->SetRange(fAnalysisRange);
}

for (int n = 0; n < fInputSignalEvent->GetNumberOfSignals(); n++) {
Expand Down