Changeset 11028 for trunk/FACT++/src

Timestamp:

06/15/11 11:01:48 (13 years ago)

Author:

tbretz

Message:

Allow C:N as Dim format

File:

• trunk/FACT++/src/dataLogger.cc (modified) (2 diffs)

trunk/FACT++/src/dataLogger.cc

@@ -2028 +2028 @@
     //we've got a nice structure describing the format of this service's messages.
     //Let's create the appropriate FITS columns
-    int size = sub.dimInfo->getSize();
+    int size = 0;
 
     vector<string> dataFormatsLocal;
@@ -2038 +2038 @@
          switch (flist[i].first.first->name()[0])
          {
-             case 'c':
-             case 'C':
-                 dataQualifier.str("S");
-             break;
-             case 's':
-                 dataQualifier << "I";
-             break;
-             case 'i':
-             case 'I':
-                 dataQualifier << "J";
-             break;
-             case 'l':
-             case 'L':
-                 dataQualifier << "J";
-             break;
-             case 'f':
-             case 'F':
-                 dataQualifier << "E";
-             break;
-             case 'd':
-             case 'D':
-                 dataQualifier << "D";
-             break;
-             case 'x':
-             case 'X':
-                 dataQualifier << "K";
-             break;
-             case 'S':
-                 size--;
-                 //for strings, the number of elements I get is wrong. Correct it
-                 dataQualifier.str(""); //clear
-                 dataQualifier << size <<  "A";
-             break;
-             
-             default:
-                 Fatal("THIS SHOULD NEVER BE REACHED. dataLogger.cc ln 1198.");
+         case 'c': dataQualifier << "B"; break; // FIXME: To be checked!
+         case 's': dataQualifier << "I"; break;
+         case 'i': dataQualifier << "J"; break;
+         case 'l': dataQualifier << "J"; break;
+         case 'f': dataQualifier << "E"; break;
+         case 'd': dataQualifier << "D"; break;
+         case 'x': dataQualifier << "K"; break;
+         case 'S': //we skip the variable length strings
+             continue;
+
+         default:
+             Fatal("THIS SHOULD NEVER BE REACHED.");
          };
-         //we skip the variable length strings for now (in fits only)
-         if (dataQualifier.str() != "S")
-             dataFormatsLocal.push_back(dataQualifier.str());
+
+         size += flist[i].first.second * flist[i].second.first;
+         dataFormatsLocal.push_back(dataQualifier.str());
      }
      sub.nightlyFile.InitDataColumns(GetDescription(sub.server, sub.service), dataFormatsLocal, sub.dimInfo->getData(), size);