Changeset 1359 in Sophya for trunk/SophyaExt/FitsIOServer/fitsbntbllineRW.cc

Timestamp:

Dec 19, 2000, 12:27:39 PM (25 years ago)

Author:

lemeur

Message:

extension bntblLineRW aux long et byte

File:

• trunk/SophyaExt/FitsIOServer/fitsbntbllineRW.cc (modified) (5 diffs)

trunk/SophyaExt/FitsIOServer/fitsbntbllineRW.cc

@@ -50 +50 @@
   vector<int> IfitsCol;
   vector<int> SfitsCol;
+  vector<int> LfitsCol;
+  vector<int> BfitsCol;
   for (k=0; k<nbcols;k++)
     {
        FitsFile::FitsDataType ss= inFits_->ColTypeFromFits(k);
+
       if (ss == FitsFile::FitsDataType_double) DfitsCol.push_back(k);
       else if (ss == FitsFile::FitsDataType_float) FfitsCol.push_back(k);
       else if (ss == FitsFile::FitsDataType_int) IfitsCol.push_back(k);
+      else if (ss == FitsFile::FitsDataType_long) LfitsCol.push_back(k);
+      else if (ss == FitsFile::FitsDataType_byte) BfitsCol.push_back(k);
       else if (ss == FitsFile::FitsDataType_char) SfitsCol.push_back(k);
       else {
@@ -76 +81 @@
       ColN[compt++] =  inFits_->ColNameFromFits(IfitsCol[k]);
     }
+  for (k=0; k<LfitsCol.size(); k++)
+    {
+      ColN[compt++] =  inFits_->ColNameFromFits(LfitsCol[k]);
+    }
+  for (k=0; k<BfitsCol.size(); k++)
+    {
+      ColN[compt++] =  inFits_->ColNameFromFits(BfitsCol[k]);
+    }
   for (k=0; k<SfitsCol.size(); k++)
     {
@@ -81 +94 @@
     }
 
-  ligne_.setFormat(DfitsCol.size(), FfitsCol.size(), IfitsCol.size(), SfitsCol.size(), ColN);
+  ligne_.setFormat(DfitsCol.size(), FfitsCol.size(), IfitsCol.size(), LfitsCol.size(), BfitsCol.size(),SfitsCol.size(),  ColN);
 }
 
@@ -99 +112 @@
 
 
-FITS_BntblLineWriter::FITS_BntblLineWriter(char inputfile[],int dc, int fc,int ic, int cc, vector<string> names,DVList* ptr_dvl,  FitsFile::WriteMode wrm)
+FITS_BntblLineWriter::FITS_BntblLineWriter(char inputfile[],int dc, int fc,int ic, int lc, int bc, int cc,  vector<string> names,DVList* ptr_dvl,  FitsFile::WriteMode wrm)
 {
   int k;
-  int nbcols = dc+fc+ic+cc;
+  int nbcols = dc+fc+ic+cc+lc+bc;
   if (nbcols !=  names.size())
     {
@@ -123 +136 @@
       types+='I';
     }
+  for (k=0; k<lc;k++)
+    {
+      types+='J';
+    }
+  for (k=0; k<bc;k++)
+    {
+      types+='B';
+    }
   for (k=0; k<cc;k++)
     {
       types+='A';
-      StringSizes[k] = names[dc+fc+ic+k].length();
+      StringSizes[k] = names[dc+fc+ic+lc+bc+k].length();
     }            
   string extname("Lines_on_Binary_tbl"); 
 
   outFits_->makeHeaderBntblOnFits(types, names, 1, nbcols, ptr_dvl, extname,StringSizes); 
-    ligne_.setFormat(dc, fc, ic, cc, names);
+    ligne_.setFormat(dc, fc, ic,lc,bc,cc, names);
 
 }