Changeset 3069 in Sophya for trunk/SophyaExt/FitsIOServer/swfitsdtable.cc

Timestamp:

Sep 8, 2006, 4:30:31 PM (19 years ago)

Author:

ansari

Message:

Correction plusieurs bugs lies a SwFitsDataTable - Reza 08/09/2006

File:

• trunk/SophyaExt/FitsIOServer/swfitsdtable.cc (modified) (11 diffs)

trunk/SophyaExt/FitsIOServer/swfitsdtable.cc

@@ -70 +70 @@
   mFgCreate = false;
 }
-/*! Constructor with the specification of the output swap stream -
-    and optional specification of block (or segment) size
+/*!
+  \brief Construcor with specification of the \b FitsInOutFile swap stream.
+  if fgcreate == true, creates an empty table (the fits file should then be 
+  opened for writing). 
+  if fgcreate == false , the table is initialized (read in) from the current HDU.
 */
 SwFitsDataTable::SwFitsDataTable(FitsInOutFile & os, sa_size_t segsz, bool fgcreate)
@@ -82 +85 @@
   }
 }
+
+/*!
+  \brief Construcor with specification of the FITS file name.
+  if fgcreate == false , the FITS file is opened and the table is 
+  initialized (read in) from HDU \b hdunum
+*/
+SwFitsDataTable::SwFitsDataTable(string fitsname, int hdunum, sa_size_t segsz)
+  : BaseDataTable(segsz) ,
+    mSwF(fitsname, FitsInOutFile::Fits_RO) 
+{
+  // Lecture de la table 
+  FitsHandler<BaseDataTable> fio(*this);
+  mSwF.MoveAbsToHDU(hdunum);
+  fio.Read(mSwF);
+}
+
 //! copy constructor - shares the data
 SwFitsDataTable::SwFitsDataTable(SwFitsDataTable const & a)
@@ -158 +177 @@
 void SwFitsDataTable::SwapOutAll() const
 {
+  if (NRows() < 1) return;
   // Et on vide les buffers de swap 
   for (size_t kk=0; kk<mNames.size(); kk++) {
@@ -185 +205 @@
       break;
     default:
-      throw ForbiddenError("SwFitsDataTable::Share() : unknown column type ");
+      throw ForbiddenError("SwFitsDataTable::SwapOutAll() : unknown column type ");
     break;
     }
@@ -261 +281 @@
   {
     ser = mICols.size();
-    FITSDataSwapper<int_4> ISwapper(mSwF, colidx);
+    FITSDataSwapper<int_4> ISwapper(mSwF, colidx, this);
     if (swpos)
       mICols.push_back(SwSegDataBlock<int_4>(ISwapper, *swpos, mSegSz));
@@ -275 +295 @@
   {
     ser = mLCols.size();
-    FITSDataSwapper<int_8> LSwapper(mSwF, colidx);
+    FITSDataSwapper<int_8> LSwapper(mSwF, colidx, this);
     if (swpos)    
       mLCols.push_back(SwSegDataBlock<int_8>(LSwapper, *swpos, mSegSz));
@@ -289 +309 @@
   {
     ser = mFCols.size();
-    FITSDataSwapper<r_4> FSwapper(mSwF, colidx);
+    FITSDataSwapper<r_4> FSwapper(mSwF, colidx, this);
     if (swpos)    
       mFCols.push_back(SwSegDataBlock<r_4>(FSwapper, *swpos, mSegSz));
@@ -304 +324 @@
   {
     ser = mDCols.size();
-    FITSDataSwapper<r_8> DSwapper(mSwF, colidx);
+    FITSDataSwapper<r_8> DSwapper(mSwF, colidx, this);
     if (swpos)    
       mDCols.push_back(SwSegDataBlock<r_8>(DSwapper, *swpos, mSegSz));
@@ -318 +338 @@
   {
     ser = mYCols.size();
-    FITSDataSwapper< complex<r_4> > YSwapper(mSwF, colidx);
+    FITSDataSwapper< complex<r_4> > YSwapper(mSwF, colidx, this);
     if (swpos)    
       mYCols.push_back(SwSegDataBlock< complex<r_4> >(YSwapper, *swpos, mSegSz));
@@ -332 +352 @@
   {
     ser = mZCols.size();
-    FITSDataSwapper< complex<r_8> > ZSwapper(mSwF, colidx);
+    FITSDataSwapper< complex<r_8> > ZSwapper(mSwF, colidx, this);
     if (swpos)    
       mZCols.push_back(SwSegDataBlock< complex<r_8> >(ZSwapper, *swpos, mSegSz));
@@ -346 +366 @@
   {
     ser = mSCols.size();
-    FITSDataSwapper< string > SSwapper(mSwF, colidx);
+    FITSDataSwapper< string > SSwapper(mSwF, colidx, this);
     if (swpos)    
       mSCols.push_back(SwSegDataBlock< string >(SSwapper, *swpos, mSegSz));