Changeset 7967061 in git for classes

Timestamp:

Feb 10, 2021, 10:58:52 AM (4 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

0852ba95

Parents:

f84b626 (diff), 44bfedd (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.

git-author:

Pavel Demin <pavel-demin@…> (02/10/21 10:58:52)

git-committer:

GitHub <noreply@…> (02/10/21 10:58:52)

Message:

Merge pull request #81 from gganis/fixTFormula

Possible fix for TFormula related issue with ROOT >= 6.23/00

File:

• classes/DelphesTF2.cc (modified) (1 diff)

classes/DelphesTF2.cc

@@ -32 +32 @@
 {
 
-#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 3, 0)
+#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 23, 0)
+  fFormula = std::unique_ptr<TFormula>(new TFormula());
+#elif ROOT_VERSION_CODE >= ROOT_VERSION(6, 3, 0)
   fFormula = new TFormula();
 #endif