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.

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

Implementing generic analysis methods inside detectorlib #75

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

Implementing generic analysis methods inside detectorlib #75

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9a817d4
Implementing generic signal processing functions inside detectorlib
juanangp Feb 16, 2023
3458ff1
Merge branch 'master' of github.com:rest-for-physics/detectorlib into…
juanangp Mar 28, 2023
c4ae874
Implementing generic signal processing methods inside detectorlib
juanangp Mar 31, 2023
dcf6d3b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 31, 2023
fc30468
Adding protection at TRestDetectorSignal::Sort() in case both vectors…
juanangp Mar 31, 2023
9c910cf
Reverting Sort function since it is buggy in new implementation
juanangp Mar 31, 2023
42bbebf
Addressing bug which made the pipeline fail
juanangp Mar 31, 2023
5156e0e
Addressing bugs
juanangp Mar 31, 2023
c6de5fc
Addressing pipeline failure, although the functions should be doing t…
juanangp Mar 31, 2023
dd34dae
Removing baseline related methods
juanangp Apr 1, 2023
87f8460
Renaming TRestSignalAnalysis to TRestPulseShapeAnalysis
juanangp Apr 3, 2023
cad751e
Merge branch 'master' into signal-ana
juanangp Apr 19, 2023
29175e5
Merge branch 'master' into signal-ana
juanangp May 30, 2023
8ca222a
Merge branch 'master' into signal-ana
juanangp May 31, 2023
474dd4a
Merge branch 'master' into signal-ana
juanangp Jun 20, 2023
299a050
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
Prev Previous commit
Next Next commit
Reverting Sort function since it is buggy in new implementation
  • Loading branch information
@juanangp
juanangp committed Mar 31, 2023
commit 9c910cf2aa3c3d8dbaa0d529527c5b7de4d1cf0b
16 changes: 9 additions & 7 deletions src/TRestDetectorSignal.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,14 +271,16 @@ Int_t TRestDetectorSignal::GetTimeIndex(Double_t t) {
Bool_t TRestDetectorSignal::isSorted() { return is_sorted(fSignalTime.begin(), fSignalTime.end()); }

void TRestDetectorSignal::Sort() {
if (fSignalCharge.size() != fSignalTime.size()) {
cout << "Time and charge vectors have different size " << fSignalCharge.size() << " "
<< fSignalTime.size() << endl;
exit(0);
while (!isSorted()) {
for (int i = 0; i < GetNumberOfPoints(); i++) {
for (int j = i; j < GetNumberOfPoints(); j++) {
if (GetTime(i) > GetTime(j)) {
iter_swap(fSignalTime.begin() + i, fSignalTime.begin() + j);
iter_swap(fSignalCharge.begin() + i, fSignalCharge.begin() + j);
}
}
}
}
sort(fSignalCharge.begin(), fSignalCharge.end(),
[&](size_t i, size_t j) { return fSignalTime[i] > fSignalTime[j]; });
sort(fSignalTime.begin(), fSignalTime.end());
}

void TRestDetectorSignal::GetDifferentialSignal(TRestDetectorSignal* diffSgnl, Int_t smearPoints) {
Expand Down