Changeset 2173 in Sophya for trunk

Timestamp:

Aug 9, 2002, 6:47:25 PM (23 years ago)

Author:

cmv

Message:

modifs cmv 9/8/02

Location:

trunk/SophyaExt/FitsIOServer

Files:

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

trunk/SophyaExt/FitsIOServer/fabtcolread.cc

@@ -216 +216 @@
  // Get column name back, tunit, tform
  char tunit[64], tform[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,NULL,NULL,NULL,NULL,NULL,&sta);
+   fits_get_bcolparms(FitsPtr,ColNum+1,labelcol,tunit,tform
+                     ,&repeat,&tscale,&tzero,NULL,NULL,&sta);
  } else {
-   fits_get_acolparms(FitsPtr,ColNum+1,labelcol,NULL,tunit,tform,NULL,NULL,NULL,NULL,&sta);
+   fits_get_acolparms(FitsPtr,ColNum+1,labelcol,&repeat,tunit,tform
+                     ,&tscale,&tzero,NULL,NULL,&sta);
  }
  if(rc) {
@@ -232 +235 @@
  if(DbgLevel)
    cout<<"FitsABTColRead::Init Num="<<ColNum<<" Label="<<ColLabel
-       <<" TypeCode="<<ColTypeCode
-       <<" TUnit="<<ColTUnit<<" TForm="<<ColTForm<<endl;
+       <<" TypeCode="<<ColTypeCode<<" TUnit="<<ColTUnit<<" TForm="<<ColTForm<<endl;
+ if(DbgLevel>1)
+   cout<<"      (repeat="<<repeat<<",tscale="<<tscale<<",tzero="<<tzero<<")"<<endl;
 
 }

trunk/SophyaExt/FitsIOServer/fabtwriter.cc

@@ -288 +288 @@
 //////////////////////////////////////////////////////////////
 /*!
-  Write a short data to FITS file.
+  Write a data to FITS file.
   \param col : column number [0,ncol[
   \param row : row number    [0,nrow[
@@ -306 +306 @@
   \endverbatim
 */
+
+/*! Write signed char (1 Byte) data to FITS file (see below) */
+void FitsABTWriter::Write(int col,long row,int_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);
+}
+
+/*! Write short (2 Bytes) data to FITS file (see below) */
 void FitsABTWriter::Write(int col,long row,int_2 val)
 {
@@ -330 +341 @@
   // Bug ou inconsistence cfitsio sur machine ou long=8Bytes ?
   int T = (sizeof(long)==4) ? TLONG: TINT;
+  if(fits_write_col(FitsPtr,T,col+1,row+1,1,1,&val,&sta))
+    printerrorwrite("long",col,row,sta);
+}
+
+/*! Write unsigned long (4 Bytes) data to FITS file (see below) */
+void FitsABTWriter::Write(int col,long row,uint_4 val)
+{
+  if(FirstTime) createtbl();
+  int sta=0;
+  // Bug ou inconsistence cfitsio sur machine ou long=8Bytes ?
+  int T = (sizeof(unsigned long)==4) ? TULONG: TUINT;
   if(fits_write_col(FitsPtr,T,col+1,row+1,1,1,&val,&sta))
     printerrorwrite("long",col,row,sta);
@@ -367 +389 @@
 //////////////////////////////////////////////////////////////
 /*!
-  Write a vector of long data to FITS file.
+  Write a vector of data to FITS file.
   \param col : column number [0,ncol[
   \param row : starting row number    [0,nrow[
@@ -374 +396 @@
       that is "N-1" is the number of the last row written.
 */
+
 /*! Write a vector of unsigned short (2 Bytes) data to FITS file (see below) */
 long FitsABTWriter::Write(int col,long row,TVector<uint_2>& val)

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,int_2 val);
   void Write(int col,long row,uint_2 val);
   void Write(int col,long row,int_4 val);
+  void Write(int col,long row,uint_4 val);
   void Write(int col,long row,int_8 val);
   void Write(int col,long row,float val);