Changeset 17661 for trunk/Mars/mfileio

Timestamp:

04/07/14 15:01:50 (10 years ago)

Author:

ftemme

Message:

Added the writing of MArrayF in MWriteFitsFile

File:

• trunk/Mars/mfileio/MWriteFitsFile.cc (modified) (2 diffs)

trunk/Mars/mfileio/MWriteFitsFile.cc

@@ -4 +4 @@
 #include "MArrayS.h"
 #include "MArrayB.h"
+#include "MArrayF.h"
 
 #include "MRead.h"
@@ -888 +889 @@
           if (strncmp(dataMember->GetTrueTypeName(), "MArray", 6) == 0)
           {
-//              MArrayHelperBase * clHelper;
               if (strcmp(dataMember->GetTrueTypeName(), "MArrayS*") == 0)
               {
-                    typeName = "UShort_t";
-                    arraySize = (*((MArrayS**)((char*)baseAdr + dataMember->GetOffset())))->GetSize();
-                    InitSingleColumn(tableName,
+                  typeName = "UShort_t";
+                  arraySize = (*((MArrayS**)((char*)baseAdr + dataMember->GetOffset())))->GetSize();
+                  InitSingleColumn(tableName,
+                                   arraySize,
+                                   typeName.Data(),
+                                   (char*)(*((MArrayS**)((char*)baseAdr + dataMember->GetOffset())))->GetArray(),
+                                   colName.Data(),
+                                   unit,
+                                   comment);
+              }
+              else if (strcmp(dataMember->GetTrueTypeName(), "MArrayB*") == 0)
+              {
+                      typeName = "UChar_t";
+                      arraySize = (*((MArrayB**)((char*)baseAdr + dataMember->GetOffset())))->GetSize();
+                      InitSingleColumn(tableName,
                                      arraySize,
                                      typeName.Data(),
-                                     (char*)(*((MArrayS**)((char*)baseAdr + dataMember->GetOffset())))->GetArray(),
+                                     (char*)(*((MArrayB**)((char*)baseAdr + dataMember->GetOffset())))->GetArray(),
                                      colName.Data(),
                                      unit,
                                      comment);
               }
-              else
+              else if (strcmp(dataMember->GetTrueTypeName(), "MArrayF*") == 0)
               {
-                  if (strcmp(dataMember->GetTrueTypeName(), "MArrayB*") == 0)
-                  {
-                      typeName = "UChar_t";
-                      arraySize = (*((MArrayB**)((char*)baseAdr + dataMember->GetOffset())))->GetSize();
+                      typeName = "TFloat_t";
+                      arraySize = (*((MArrayF**)((char*)baseAdr + dataMember->GetOffset())))->GetSize();
                       InitSingleColumn(tableName,
-                                       arraySize,
-                                       typeName.Data(),
-                                       (char*)(*((MArrayB**)((char*)baseAdr + dataMember->GetOffset())))->GetArray(),
-                                       colName.Data(),
-                                       unit,
-                                       comment);
-                  }
-                  else
-                  {
-                      *fLog << err << dataMember->GetTrueTypeName() << " not yet implemented." << endl;
-                      return kFALSE;
-                  }
+                                     arraySize,
+                                     typeName.Data(),
+                                     (char*)(*((MArrayF**)((char*)baseAdr + dataMember->GetOffset())))->GetArray(),
+                                     colName.Data(),
+                                     unit,
+                                     comment);
               }
 
-            continue;
+              else {
+                  *fLog << err << dataMember->GetTrueTypeName() << " not yet implemented." << endl;
+                  return kFALSE;
+              }
+
+
+              continue;
           }
          else if (strcmp(dataMember->GetTrueTypeName(), "TClonesArray") == 0)