Changeset 12705 for trunk

Timestamp:

12/06/11 13:55:51 (13 years ago)

Author:

lyard

Message:

added more columns in grouping files

File:

• trunk/FACT++/src/datalogger.cc (modified) (4 diffs)

trunk/FACT++/src/datalogger.cc

@@ -2053 +2053 @@
         names.push_back("MEMBER_NAME");
         dataTypes.push_back(pathTypeName.str());
+        names.push_back("MEMBER_VERSION");
+        dataTypes.push_back("1J");
+        names.push_back("MEMBER_POSITION");
+        dataTypes.push_back("1J");
 
         groupTable = groupFile->addTable("GROUPING", numFilesToGroup, names, dataTypes);
@@ -2064 +2068 @@
          return;
      }
-
+     try
+     {
+         groupTable->addKey("GRPNAME", "FACT_RAW_DATA", "Data from the FACT telescope");
+     }
+     catch (CCfits::FitsException e)
+     {
+         Error("CCfits::Table::addKey failed for 'GRPNAME' in '"+groupName+"-GROUPING': "+e.message());
+         return;
+     }
     //CCfits seems to be buggy somehow: can't use the column's function "write": it create a compilation error: maybe strings were not thought about.
     //use cfitsio routines instead
     groupTable->makeThisCurrent();
     //create appropriate buffer.
-    const unsigned int n = 8 + 3 + 2*maxCharLength + 1; //+1 for trailling character
+    const unsigned int n = 8 + 3 + 2*maxCharLength + 1 + 8; //+1 for trailling character
 
     vector<unsigned char> realBuffer;
@@ -2080 +2092 @@
     char* startOfLocation  = reinterpret_cast<char*>(&fitsBuffer[8 + 3]);
     char* startOfName      = reinterpret_cast<char*>(&fitsBuffer[8+3+maxCharLength]);
+ //   char* startOfMemVer    = reinterpret_cast<char*>(&fitsBuffer[8+3+2*maxCharLength]);
+ //   char* startOfMemPos    = reinterpret_cast<char*>(&fitsBuffer[8+3+2*maxCharLength+1]);
 
     strcpy(startOfExtension, "BINTABLE");
     strcpy(startOfURI,       "URL");
+    fitsBuffer[8+3+2*maxCharLength+3] = 1;
+    fitsBuffer[8+3+2*maxCharLength+7] = 1;
 
     int i=1;
@@ -2099 +2115 @@
 
             int status = 0;
-            fits_write_tblbytes(groupFile->fitsPointer(), i, 1, 8+3+2*maxCharLength, fitsBuffer, &status);
+            fits_write_tblbytes(groupFile->fitsPointer(), i, 1, 8+3+2*maxCharLength +8, fitsBuffer, &status);
             if (status)
             {