[Tree] Delete virtual copy and copy assignment methods in TTree

bindings/pyroot/pythonizations/test/memory.py

@@ -1,7 +1,7 @@
 import ROOT
 import gc
 import os
 import unittest
 
 
 def _leak(obj):
@@ -16,7 +16,7 @@
     def test_tstyle_memory_management(self):
         """Regression test for https://github.com/root-project/root/issues/16918"""
 
         h1 = ROOT.TH1F("h1", "", 100, 0, 10)
 
         style = ROOT.TStyle("NewSTYLE", "")
         groot = ROOT.ROOT.GetROOT()
@@ -27,19 +27,19 @@
         """Regression test for https://github.com/root-project/root/issues/16942"""
         # The test is just that the memory regulation works correctly and the
         # application does not segfault
         f2 = ROOT.TF2("f2", "sin(x)*sin(y)/x/y")
 
     def test_tf3_memory_regulation(self):
         """Make sure TF3 is properly managed by the memory regulation logic"""
         # The test is just that the memory regulation works correctly and the
         # application does not segfault
         f3 = ROOT.TF3("f3","[0] * sin(x) + [1] * cos(y) + [2] * z",0,10,0,10,0,10)
 
     def test_tcolor_memory_regulation(self):
         """Make sure TColor is properly managed by the memory regulation logic"""
         # The test is just that the memory regulation works correctly and the
         # application does not segfault
         c = ROOT.TColor(42, 42, 42)
 
     def test_ttree_clone_in_file_context(self):
         """Test that CloneTree() doesn't give the ownership to Python when
@@ -49,8 +49,8 @@
 
         ttree = ROOT.TTree("tree", "tree")
 
-        with ROOT.TFile(filename, "RECREATE") as infile:
+        with ROOT.TFile(filename, "RECREATE") as _:
             ttree_clone = ttree.CloneTree()
 
         os.remove(filename)
 
@@ -88,7 +88,6 @@
             "TH1I": ("h", "h", 10, 0, 10),
             "TH1L": ("h", "h", 10, 0, 10),
             "TH1F": ("h", "h", 10, 0, 10),
-            "TH1D": ("h", "h", 10, 0, 10),
             "TProfile": ("h", "h", 10, 0, 10),
             "TH2C": ("h", "h", 10, 0, 10, 10, 0, 10),
             "TH2S": ("h", "h", 10, 0, 10, 10, 0, 10),
@@ -111,8 +110,6 @@
             "TGraph2D": (100,),
             "TEntryList": ("name", "title"),
             "TEventList": ("name", "title"),
-            "TTree": ("name", "title"),
-            "TNtuple": ("name", "title", "x:y:z"),
         }
         for klass, args in objs.items():
             with self.subTest(klass=klass):

io/io/src/TFileMerger.cxx

@@ -529,7 +529,7 @@ Bool_t TFileMerger::MergeOne(TDirectory *target, TList *sourcelist, Int_t type,
                  && !cl->InheritsFrom( TDirectory::Class() )) {
          R__ASSERT(cl->IsTObject());
          TDirectory::TContext ctxt(current_sourcedir);
-         obj = obj->Clone();
+         obj = gDirectory->CloneObject(obj);
          ownobj = kTRUE;
       }
    } else if (key) {

roofit/roofitcore/src/RooTreeDataStore.cxx

@@ -369,7 +369,7 @@ void RooTreeDataStore::loadValues(const TTree *t, const RooFormulaVar* select, c
   // We need a custom deleter, because if we don't deregister the Tree from the directory
   // of the original, it tears it down at destruction time!
   auto deleter = [](TTree* tree){tree->SetDirectory(nullptr); delete tree;};
-  std::unique_ptr<TTree, decltype(deleter)> tClone(static_cast<TTree*>(t->Clone()), deleter);
+  std::unique_ptr<TTree, decltype(deleter)> tClone{static_cast<TTree*>(gDirectory->CloneObject(t)), deleter};
   tClone->SetDirectory(t->GetDirectory());
 
   // Clone list of variables

tree/tree/inc/TTree.h

@@ -354,6 +354,9 @@ class TTree : public TNamed, public TAttLine, public TAttFill, public TAttMarker
    TTree(const TTree& tt) = delete;
    TTree& operator=(const TTree& tt) = delete;
 
+   TObject *Clone(const char *newname="") const override;
+   void     Copy(TObject &object) const override;
+
    virtual Int_t           AddBranchToCache(const char *bname, bool subbranches = false);
    virtual Int_t           AddBranchToCache(TBranch *branch,   bool subbranches = false);
    virtual Int_t           DropBranchFromCache(const char *bname, bool subbranches = false);

tree/tree/src/TTree.cxx

@@ -1059,6 +1059,17 @@ TTree::~TTree()
    }
 }
 
+TObject *TTree::Clone(const char *) const
+{
+   Error("Clone", "Not implemented, use TTree::CloneTree instead.");
+   return nullptr;
+}
+
+void TTree::Copy(TObject &) const
+{
+   Error("Copy", "Not implemented, use TTree::CopyTree or TTree::CopyEntries instead.");
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 /// Returns the transient buffer currently used by this TTree for reading/writing baskets.
 
@@ -3204,7 +3215,7 @@ TTree* TTree::CloneTree(Long64_t nentries /* = -1 */, Option_t* option /* = "" *
 
    // Note: For a chain, the returned clone will be
    //       a clone of the chain's first tree.
-   TTree* newtree = (TTree*) thistree->Clone();
+   TTree* newtree = (TTree*) thistree->TNamed::Clone();
    if (!newtree) {
       return nullptr;
    }