Changeset 19760 for trunk/Mars/mdata

Timestamp:

10/11/19 19:22:02 (5 years ago)

Author:

tbretz

Message:

They are added to the ListOfCleanups. This is implemented as a THashTable. According to the root documentation, it is required to rehash the table whenever the name of an object in the table changes. This is now guranteed if name change happens via SetName

Location:

trunk/Mars/mdata

Files:

• MDataPhrase.cc (modified) (2 diffs)
• MDataPhrase.h (modified) (1 diff)

trunk/Mars/mdata/MDataPhrase.cc

@@ -115 +115 @@
 #include <TPRegexp.h>
 #include <TFormula.h>
+#include <THashList.h>
 #if ROOT_VERSION_CODE >= ROOT_VERSION(5,26,00)
 #if ROOT_VERSION_CODE < ROOT_VERSION(6,00,00)
@@ -533 +534 @@
 }
 
+void MDataPhrase::SetName(const char *name)
+{
+    MData::SetName(name);
+
+    // Some code produces crashed with root 6 (6.14 and 6.18 tested)
+    //
+    //    MParameterCalc calc("MCorsikaEvtHeader.fZd");
+    //    MContinue cont("MPhotonEvent.GetNumPhotons<2");
+    //    MTaskList tasks;
+    //    tasks.AddToList(&calc);
+    //    tasks.AddToList(&cont);
+    //    MEnv env("ceres.rc");
+    //    if (!tasks.ReadEnv(env, "", kFALSE))
+    //        return kFALSE;
+    //
+
+    // From the documentation of THashList::THashList
+    //
+    // WARNING !!!
+    // If the name of an object in the HashList is modified, The hashlist
+    // must be Rehashed
+    //
+    auto table = dynamic_cast<THashList*>(gROOT->GetListOfCleanups());
+    if (table)
+        table->Rehash(THashList::kInitHashTableCapacity);
+}
+
+
 // --------------------------------------------------------------------------
 //

trunk/Mars/mdata/MDataPhrase.h

@@ -37 +37 @@
     void     Clear(Option_t *o="");
     void     RecursiveRemove(TObject *obj);
+    void     SetName(const char *name);
 
     // MParContainer