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

Small fix for StFcsDb and StFcsWaveformFitMaker #664

Merged
merged 1 commit into from
Apr 10, 2024
Merged
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
1 change: 0 additions & 1 deletion StRoot/StFcsDbMaker/StFcsDb.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -756,7 +756,6 @@ StThreeVectorD StFcsDb::projectTrack(int det, const g2t_track_st* g2ttrk, const
double linedir[3] = {g2ttrk->p[0],g2ttrk->p[1],g2ttrk->p[2]};
if( g2tvert!=0 ){
int vertind = g2ttrk->start_vertex_p - 1; //To correct for offset by one between fortran array and c array. 0 start index means it was generated at the starting vertex
std::cout << "+++++ DEBUG: vertind = " << vertind << " +++++" << std::endl;
double linestart[3] = {g2tvert[vertind].ge_x[0],g2tvert[vertind].ge_x[1],g2tvert[vertind].ge_x[2]};
if( vertind >= 0 ){//Since start index==0 means no start then vertind<0 will default to using origin
return projectLine(det, linedir, linestart, showermaxz);
Expand Down
8 changes: 4 additions & 4 deletions StRoot/StFcsWaveformFitMaker/StFcsWaveformFitMaker.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -501,11 +501,11 @@ int StFcsWaveformFitMaker::Make() {
if( mAnaWaveform ){
integral = analyzeWaveform(mEnergySelect[ehp],hits[i],res,func,res[6]);
hits[i]->setAdcSum(integral);
hits[i]->setFitPeak(res[2]);
hits[i]->setFitSigma(res[3]);
hits[i]->setFitChi2(res[4]);
hits[i]->setNPeak(res[5]);
}
hits[i]->setFitPeak(res[2]);
hits[i]->setFitSigma(res[3]);
hits[i]->setFitChi2(res[4]);
hits[i]->setNPeak(res[5]);
//apply gain and update energy
float gain = mDb->getGain(hits[i]);
float gaincorr = mDb->getGainCorrection(hits[i]);
Expand Down
Loading