Skip to content

Commit 4ec9c5b

Browse files
committed
feat(actaf):Added utils to manage the signals
Move data to cal level properly Move data to cal level properly Check thrs Baseline for cal data Check Check Check again Check again Check again Check again Check again Check again Check again Check again Check again Check again Check again Check again Update online code Last modificatio for online Last modificatio for online Last modificatio for online Last modificatio for online
1 parent 00d3faf commit 4ec9c5b

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

actaf/calibration/R3BActafMapped2Cal.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ void R3BActafMapped2Cal::Exec(Option_t*)
160160
continue;
161161

162162
std::array<double, ACTAF_BINS> waveform = mappedData->GetTrace();
163+
int maxPos = R3BActafUtils::FindMaxPosition(waveform);
163164

164165
// Apply the SG filter to the waveform (on baseline-subtracted data)
165166
if (fApplySGFilter)
@@ -168,8 +169,7 @@ void R3BActafMapped2Cal::Exec(Option_t*)
168169
auto drift = mappedData->GetLeadingEdgeTime() * fConversionCh2ns; // in ns
169170
auto zpos = drift * fVelocity; // in cm
170171
auto syntime = drift - synTagTime * fConversionCh2ns; // in ns
171-
172-
auto maxPos = R3BActafUtils::FindMaxPosition(waveform);
172+
maxPos = R3BActafUtils::FindMaxPosition(waveform);
173173
double rms = R3BActafUtils::ComputeBaselineMean(waveform, maxPos, 0);
174174
double mean = R3BActafUtils::ComputeBaselineMean(waveform, maxPos, 1);
175175

actaf/online/R3BActafOnlineSpectra.cxx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,14 @@ InitStatus R3BActafOnlineSpectra::Init()
756756
p3->cd(iPad + 1);
757757
else
758758
p4->cd(iPad - 4 + 1);
759+
<<<<<<< HEAD
760+
<<<<<<< HEAD
759761
g_CorrectedTraces_4pads_highestAmp[iPad]->GetYaxis()->SetRangeUser(-200, 1000);
762+
=======
763+
>>>>>>> d78008ab (Last modificatio for online)
764+
=======
765+
g_CorrectedTraces_4pads_highestAmp[iPad]->GetYaxis()->SetRangeUser(-200, 1000);
766+
>>>>>>> 43df9eae (Last modificatio for online)
760767
g_CorrectedTraces_4pads_highestAmp[iPad]->Draw("AL");
761768
g_CorrectedTraces_4pads_highestAmp[iPad]->GetYaxis()->SetRangeUser(-200, 1000);
762769
}

0 commit comments

Comments
 (0)