Changeset 18282 for branches/MarsGapdTimeJitter/mfileio

Timestamp:

08/18/15 10:28:44 (9 years ago)

Author:

Jens Buss

Message:

merged Trunk into Branch

Location:

branches/MarsGapdTimeJitter

Files:

• . (modified) (1 prop)
• mfileio/FileIOLinkDef.h (modified) (1 diff)
• mfileio/MFitsArray.h (modified) (1 diff)
• mfileio/MWriteFitsFile.cc (modified) (1 diff)

branches/MarsGapdTimeJitter/mfileio/FileIOLinkDef.h

@@ -19 +19 @@
 #pragma link C++ class MWriteRootFile+;
 #pragma link C++ class MWriteFitsFile+;
+
 #pragma link C++ class MMatrix+;
 

branches/MarsGapdTimeJitter/mfileio/MFitsArray.h

@@ -30 +30 @@
 
 public:
+    virtual ~MArrayHelperBase() { };
+
    ofits* GetFitsTable()     {return fFitsTable;}
    UInt_t *      GetArraySizePtr()  {return &fArraySize;}

branches/MarsGapdTimeJitter/mfileio/MWriteFitsFile.cc

@@ -519 +519 @@
 
          // initialize all columns of the sub-table, defined by the current container
+         TString containerName = i_subTable->second.GetContainer()->GetName();
          TClass * cl = i_subTable->second.GetContainer()->IsA();
-         if (!InitColumns(i_table->first, TString(cl->GetName()) + ".",  fitsTable, 
-                          i_subTable->second.GetContainer(), cl)     ) 
+         if (!InitColumns(i_table->first, containerName + ".",  fitsTable,
+                          i_subTable->second.GetContainer(), cl)     )
             return kFALSE;