Adding deletes for heap variables

"And I ain't never called malloc without calling free!" -- Monzy
jturkewitz · May 8, 2014 · 0c26969 · 0c26969
1 parent d5ebc4f
commit 0c26969
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/ZFinder/Event/interface/ZFinderEvent.h b/ZFinder/Event/interface/ZFinderEvent.h
@@ -62,6 +62,8 @@ namespace zf {
                     const edm::EventSetup& iSetup,
                     const edm::ParameterSet& iConfig
                     );
+            // Destructor
+            ~ZFinderEvent();
 
             // Data or MC
             bool is_real_data;

diff --git a/ZFinder/Event/src/ZFinder.cc b/ZFinder/Event/src/ZFinder.cc
@@ -163,6 +163,20 @@ ZFinder::ZFinder(const edm::ParameterSet& iConfig) : iConfig_(iConfig) {
 ZFinder::~ZFinder() {
     // do anything here that needs to be done at destruction time
     // (e.g. close files, deallocate resources etc.)
+
+    // Delete our heap variables
+    for (auto& i_set : setters_) {
+        delete i_set;
+    }
+    for (auto& i_zdef : zdefs_) {
+        delete i_zdef;
+    }
+    for (auto& i_zdefp : zdef_plotters_) {
+        delete i_zdefp;
+    }
+    for (auto& i_zdefw : zdef_workspaces_) {
+        delete i_zdefw;
+    }
 }
 
 

diff --git a/ZFinder/Event/src/ZFinderEvent.cc b/ZFinder/Event/src/ZFinderEvent.cc
@@ -786,4 +786,17 @@ namespace zf {
             return false;
         }
     }
+
+    ZFinderEvent::~ZFinderEvent() {
+        // Clean up all the heap variables we have declared
+        for (auto& i_elec : reco_electrons_) {
+            delete i_elec;
+        }
+        for (auto& i_elec : hlt_electrons_) {
+            delete i_elec;
+        }
+        for (auto& i_elec : truth_electrons_) {
+            delete i_elec;
+        }
+    }
 }  // namespace zf