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

Jump to bottom

HBHE M2 = fix Memory Leak #17821

Merged
merged 3 commits into from Mar 10, 2017
Merged

HBHE M2 = fix Memory Leak #17821

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e6a96f
fixMemLeakM2
mariadalfonso Mar 8, 2017
ae88bd8
more fix
mariadalfonso Mar 8, 2017
dabac13
use std::unique_ptr
mariadalfonso Mar 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions RecoLocalCalo/HcalRecAlgos/interface/PulseShapeFitOOTPileupCorrection.h
View file
Open in desktop
Expand Up @@ -117,6 +117,7 @@ class PulseShapeFitOOTPileupCorrection
double iTMin, double iTMax,
const std::vector<double> & its4Chi2, HcalTimeSlew::BiasSetting slewFlavor, int iFitTimes);

const HcalPulseShapes::Shape* currentPulseShape_;
void setChi2Term( bool isHPD );

void setPulseShapeTemplate (const HcalPulseShapes::Shape& ps, bool isHPD);
Expand Down Expand Up @@ -164,6 +165,7 @@ class PulseShapeFitOOTPileupCorrection
double noiseSiPM_;
HcalTimeSlew::BiasSetting slewFlavor_;

bool isCurrentChannelHPD_;
};

#endif // PulseShapeFitOOTPileupCorrection_h
18 changes: 9 additions & 9 deletions RecoLocalCalo/HcalRecAlgos/src/PulseShapeFitOOTPileupCorrection.cc
View file
Open in desktop
Expand Up @@ -278,15 +278,15 @@ void PulseShapeFitOOTPileupCorrection::setPUParams(bool iPedestalConstraint, b
}

void PulseShapeFitOOTPileupCorrection::setPulseShapeTemplate(const HcalPulseShapes::Shape& ps, bool isHPD) {
// initialize for every hit now to avoid incorrect settings for different channel types (HPD vs SiPM)
// FIXME: keep this as a reminder to improve and reduce CPU use
// if( cntsetPulseShape ) return;

// set the M2 parameters before defining the shape
setChi2Term(isHPD);

resetPulseShapeTemplate(ps);

// initialize for every different channel types (HPD vs SiPM)

if (!(&ps == currentPulseShape_ && isHPD == isCurrentChannelHPD_))
Copy link
Contributor

Choose a reason for hiding this comment

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

Both "currentPulseShape_" and "isCurrentChannelHPD_" are used uninitialized here

{
setChi2Term(isHPD);
resetPulseShapeTemplate(ps);
currentPulseShape_ = &ps;
isCurrentChannelHPD_ = isHPD;
}
}

void PulseShapeFitOOTPileupCorrection::resetPulseShapeTemplate(const HcalPulseShapes::Shape& ps) {
Expand Down