Skip to content

Moving to generic methods inside TRestRawSignal #100

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.

Sign up for GitHub

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

Open
juanangp wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Moving to generic methods inside TRestRawSignal #100

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9b6bfd0
Moving to generic methods inside TRestRawSignal
juanangp Feb 15, 2023
9d6054e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 15, 2023
5282c8a
Addressing minor minor bugs in the new implementation
juanangp Feb 15, 2023
9475fa4
Reverting removal of GetBaseLineCorredted erased by mistake
juanangp Feb 15, 2023
d914d97
Moving pointsOverThreshold to a vector of pairs instead of a vector o…
juanangp Feb 16, 2023
80f8713
Merge branch 'master' into signal-ana
juanangp Mar 28, 2023
384530b
Implementing further generic methods inside TRestRawSignal
juanangp Mar 31, 2023
3ed4639
Merge branch 'signal-ana' of github.com:rest-for-physics/rawlib into …
juanangp Mar 31, 2023
76b8d0d
Addressing pipeline failure
juanangp Mar 31, 2023
f805aac
Updating points over threshold calculation after changes in TRestRawS…
juanangp Mar 31, 2023
9fc02a3
Minor update
juanangp Apr 1, 2023
6027b91
Renaming TRestSignalAnalysis to TRestPulseShapeAnalysis
juanangp Apr 3, 2023
9ba3dc7
Merge branch 'master' into signal-ana
juanangp Apr 29, 2023
0ef974b
Merge branch 'master' into signal-ana
juanangp May 23, 2023
1f4521c
Update src/TRestRawSignal.cxx
juanangp May 23, 2023
13eb9ef
Update src/TRestRawSignal.cxx
juanangp May 23, 2023
5f9ead2
Moving GetPointsOverThreshold from ´std::pair<Float_t, Float_t>´ to ´…
juanangp May 25, 2023
f3131e6
Merge branch 'master' into signal-ana
juanangp Jun 20, 2023
9710690
Merge branch 'master' into signal-ana
juanangp Sep 8, 2023
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
22 changes: 9 additions & 13 deletions inc/TRestRawSignal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ class TRestRawSignal : public TObject {
private:
void CalculateThresholdIntegral();

void CalculateBaseLineSigmaSD(Int_t startBin, Int_t endBin);

void CalculateBaseLineSigmaIQR(Int_t startBin, Int_t endBin);

std::vector<Float_t> GetSignalSmoothed_ExcludeOutliers(Int_t averagingPoints);

protected:
Expand All @@ -56,7 +52,7 @@ class TRestRawSignal : public TObject {
TGraph* fGraph; //!

/// A std::vector containing the index of points that are identified over threshold.
std::vector<Int_t> fPointsOverThreshold; //!
std::vector<std::pair<Float_t, Float_t> > fPointsOverThreshold; //!
Copy link
Member

@nkx111 nkx111 May 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better to have fPointsOverThreshold in correspondence with TRestRawSignal's data structure. x should be time bin(int) and y should be amplitude(unsigned short). Therefore the returned type should be std::vector<std::pair<Int_t, UShort_t> >

Copy link
Member

@jgalan jgalan May 25, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I didn't notice this, I also think it would make more sense <Int_t, UShort_t>

Copy link
Member Author

@juanangp juanangp May 25, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at the code fPointsOverThreshold corresponds to the points with the baseline substracted, so for me it doesn't make sense to return std::vector<std::pair<Int_t, Short_t> > since we will be loosing precision.


/// It stores the integral value obtained from the points identified over threshold.
Double_t fThresholdIntegral = -1; //!
Expand All @@ -80,13 +76,15 @@ class TRestRawSignal : public TObject {
inline Int_t GetSignalID() const { return fSignalID; }

/// Returns the value of signal ID
inline Int_t GetID() const { return fSignalID; }
inline Int_t GetID() const { return GetSignalID(); }

/// Returns the actual number of points, or size of the signal
inline Int_t GetNumberOfPoints() const { return fSignalData.size(); }

/// Returns a std::vector containing the indexes of data points over threshold
inline std::vector<Int_t> GetPointsOverThreshold() const { return fPointsOverThreshold; }
inline std::vector<std::pair<Float_t, Float_t> > GetPointsOverThreshold() const {
return fPointsOverThreshold;
}

/// Returns the maximum value found in the data points. It includes baseline correction
inline Double_t GetMaxValue() { return GetMaxPeakValue(); }
Expand All @@ -111,12 +109,16 @@ class TRestRawSignal : public TObject {
/// Returns the range defined by user
inline TVector2 GetRange() const { return fRange; }

inline std::vector<Short_t> GetSignalData() const { return fSignalData; }

/// Returns false if the baseline and its baseline fluctuation was not initialized.
inline Bool_t isBaseLineInitialized() {
if (fBaseLineSigma == 0 && fBaseLine == 0) return false;
return true;
}

std::vector<Float_t> GetData() const;

Double_t GetData(Int_t n) const;

Double_t GetRawData(Int_t n) const;
Expand Down Expand Up @@ -187,16 +189,10 @@ class TRestRawSignal : public TObject {

void GetDifferentialSignal(TRestRawSignal* diffSignal, Int_t smearPoints);

void GetSignalSmoothed(TRestRawSignal* smoothedSignal, Int_t averagingPoints);

std::vector<Float_t> GetSignalSmoothed(Int_t averagingPoints, std::string option = "");

void GetWhiteNoiseSignal(TRestRawSignal* noiseSignal, Double_t noiseLevel = 1.);

void CalculateBaseLineMean(Int_t startBin, Int_t endBin);

void CalculateBaseLineMedian(Int_t startBin, Int_t endBin);

void CalculateBaseLine(Int_t startBin, Int_t endBin, const std::string& option = "");

void GetBaseLineCorrected(TRestRawSignal* smoothedSignal, Int_t averagingPoints);
Expand Down
Loading