Changeset 9666d3b in git for modules/Delphes.cc

Timestamp:

Apr 11, 2018, 4:19:18 PM (7 years ago)

Author:

Ulrike Schnoor <ulrike.schnoor@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

6ba7847

Parents:

6f96f62 (diff), a670493 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merged the upstream/master

File:

• modules/Delphes.cc (modified) (2 diffs)

modules/Delphes.cc

@@ -78 +78 @@
 Delphes::~Delphes()
 {
-  if(fFactory) delete fFactory;
   TFolder *folder = GetFolder();
   if(folder)
@@ -85 +84 @@
     delete folder;
   }
+  if(fFactory) delete fFactory;
 }