Changeset 2174 in Sophya

Timestamp:

Aug 9, 2002, 10:46:59 PM (23 years ago)

Author:

cmv

Message:

gestion defaut ASCII table cmv 9/8/02

Location:

trunk/SophyaExt/FitsIOServer

Files:

• fabtcolread.cc (modified) (2 diffs)
• fabtwriter.cc (modified) (3 diffs)
• fabtwriter.h (modified) (1 diff)

trunk/SophyaExt/FitsIOServer/fabtcolread.cc

@@ -215 +215 @@
 
  // Get column name back, tunit, tform
- char tunit[64], tform[64];
+ char tunit[64], tform[64], tdisp[64];
  long repeat=0; double tscale=1., tzero=0.;
  int rc=0;
  if(HduType==BINARY_TBL) {
    fits_get_bcolparms(FitsPtr,ColNum+1,labelcol,tunit,tform
-                     ,&repeat,&tscale,&tzero,NULL,NULL,&sta);
+                     ,&repeat,&tscale,&tzero,NULL,tdisp,&sta);
  } else {
    fits_get_acolparms(FitsPtr,ColNum+1,labelcol,&repeat,tunit,tform
-                     ,&tscale,&tzero,NULL,NULL,&sta);
+                     ,&tscale,&tzero,NULL,tdisp,&sta);
  }
  if(rc) {
@@ -237 +237 @@
        <<" TypeCode="<<ColTypeCode<<" TUnit="<<ColTUnit<<" TForm="<<ColTForm<<endl;
  if(DbgLevel>1)
-   cout<<"      (repeat="<<repeat<<",tscale="<<tscale<<",tzero="<<tzero<<")"<<endl;
+   cout<<"      (repeat="<<repeat<<",tscale="<<tscale<<",tzero="<<tzero
+       <<",tdisp="<<tdisp<<")"<<endl;
 
 }

trunk/SophyaExt/FitsIOServer/fabtwriter.cc

@@ -193 +193 @@
  // Gestion auto du tform pour les tables binaires avec le datatype (si non-definie)
  bool tformauto = false;
- if(HduType==BINARY_TBL) {
+ if(HduType==BINARY_TBL || HduType==ASCII_TBL) {
    if(tform==NULL)           tformauto = true;
    else if(strlen(tform)<=0) tformauto = true;
  }
- if(tformauto) {
+ if(tformauto && HduType==BINARY_TBL) {
    char str[8];
    if(datatype==TBYTE)          strcpy(str,"1B");
@@ -212 +212 @@
    else if(datatype==TUSHORT)   strcpy(str,"1U");
    else if(datatype==TULONG)    strcpy(str,"1V");
+   else
+     throw ParmError("FitsABTWriter::addcol: datatype not allowed\n");
+   TForm.push_back(str);
+ } else if(tformauto && HduType==ASCII_TBL) {
+   char str[8];
+   if(datatype==TBYTE)          strcpy(str,"I5");
+   else if(datatype==TSHORT)    strcpy(str,"I7");
+   else if(datatype==TLONG)     strcpy(str,"I11");
+#ifdef TINT32BIT
+   else if(datatype==TINT32BIT) strcpy(str,"I11");
+#endif
+#ifdef TLONGLONG
+   else if(datatype==TLONGLONG) strcpy(str,"I21");
+#endif
+   else if(datatype==TFLOAT)    strcpy(str,"E29.20");
+   else if(datatype==TDOUBLE)   strcpy(str,"E29.20");
+   else if(datatype==TUSHORT)   strcpy(str,"I7");
+   else if(datatype==TULONG)    strcpy(str,"I11");
    else
      throw ParmError("FitsABTWriter::addcol: datatype not allowed\n");
@@ -307 +325 @@
 */
 
-/*! Write signed char (1 Byte) data to FITS file (see below) */
-void FitsABTWriter::Write(int col,long row,int_1 val)
+/*! Write unsigned char (1 Byte) data to FITS file (see below) */
+void FitsABTWriter::Write(int col,long row,uint_1 val)
 {
   if(FirstTime) createtbl();
   int sta=0;
   if(fits_write_col(FitsPtr,TBYTE,col+1,row+1,1,1,&val,&sta))
-    printerrorwrite("char",col,row,sta);
+    printerrorwrite("unsigned char",col,row,sta);
 }
 

trunk/SophyaExt/FitsIOServer/fabtwriter.h

@@ -46 +46 @@
   inline void SetDebug(int lp=0) {DbgLevel = (unsigned short) lp;}
 
-  void Write(int col,long row,int_1 val);
+  void Write(int col,long row,uint_1 val);
   void Write(int col,long row,int_2 val);
   void Write(int col,long row,uint_2 val);