Merge pull request #134 from JamesJieranShen/pr/fix-pmt-waveform-memleak

Memory Leak in the PMTWaveformGenerator code.
rat-pac · May 22, 2024 · 0fb67b7 · 0fb67b7
2 parents 0c4ebc6 + deef9a7
commit 0fb67b7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/daq/include/RAT/PMTWaveform.hh b/src/daq/include/RAT/PMTWaveform.hh
@@ -17,7 +17,7 @@ class PMTWaveform {
   virtual ~PMTWaveform();
   virtual double GetHeight(double time);
 
-  std::vector<PMTPulse *> fPulse;
+  std::vector<PMTPulse> fPulse;
 };
 
 }  // namespace RAT

diff --git a/src/daq/src/PMTWaveform.cc b/src/daq/src/PMTWaveform.cc
@@ -9,8 +9,8 @@ PMTWaveform::~PMTWaveform() {}
 
 double PMTWaveform::GetHeight(double currenttime) {
   double height = 0.;
-  for (unsigned int i = 0; i < fPulse.size() && fPulse[i]->GetPulseStartTime() <= currenttime; i++) {
-    height += fPulse[i]->GetPulseHeight(currenttime);
+  for (unsigned int i = 0; i < fPulse.size() && fPulse[i].GetPulseStartTime() <= currenttime; i++) {
+    height += fPulse[i].GetPulseHeight(currenttime);
   }
   return height;
 }

diff --git a/src/daq/src/PMTWaveformGenerator.cc b/src/daq/src/PMTWaveformGenerator.cc
@@ -68,7 +68,8 @@ PMTWaveform PMTWaveformGenerator::GenerateWaveforms(DS::MCPMT *mcpmt, double tri
   for (int iph = 0; iph < mcpmt->GetMCPhotonCount(); iph++) {
     DS::MCPhoton *mcpe = mcpmt->GetMCPhoton(iph);
 
-    PMTPulse *pmtpulse = new PMTPulse(fPMTPulseType, fPMTPulseShape);
+    pmtwf.fPulse.push_back(PMTPulse(fPMTPulseType, fPMTPulseShape));
+    PMTPulse *pmtpulse = &pmtwf.fPulse.back();
     pmtpulse->SetPulseCharge(mcpe->GetCharge() * fTerminationOhms);
     pmtpulse->SetPulseMin(fPMTPulseMin);
     pmtpulse->SetPulseOffset(fPMTPulseOffset);
@@ -81,8 +82,6 @@ PMTWaveform PMTWaveformGenerator::GenerateWaveforms(DS::MCPMT *mcpmt, double tri
 
     pmtpulse->SetPulseTimes(fPMTPulseShapeTimes);
     pmtpulse->SetPulseValues(fPMTPulseShapeValues);
-
-    pmtwf.fPulse.push_back(pmtpulse);
   }
 
   return pmtwf;