Changeset 1047 in Sophya for trunk/SophyaExt/FitsIOServer/fitstarray.cc

Timestamp:

Jun 15, 2000, 12:22:23 PM (25 years ago)

Author:

ansari

Message:

modifs pour introduction lecteur de fits par lignes

File:

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

trunk/SophyaExt/FitsIOServer/fitstarray.cc

@@ -60 +60 @@
 
 template <class T>
-void FITS_TArray<T>::ReadFromFits(FitsFile& fn)
+void FITS_TArray<T>::ReadFromFits()
 {
 
-  if (!fn.IsFitsImage())
+  //  if (!fn.IsFitsImage())
+  if (!IsFitsImage())
     {
       throw PException("ReadFromFits: the fits file seems not to be an image");
     }
-  int dimension = fn.nbDimOfImage();
+  //  int dimension = fn.nbDimOfImage();
+  int dimension = nbDimOfImage();
   cout << " dimension de l'image a lire: " << dimension << endl;
    
   uint_4* siz = new uint_4[dimension];
-  for (int k=0; k< dimension; k++) siz[k] = fn.dimOfImageAxes()[k];
+  //  for (int k=0; k< dimension; k++) siz[k] = fn.dimOfImageAxes()[k];
+  for (int k=0; k< dimension; k++) siz[k] = dimOfImageAxes()[k];
   if(dobj_ == NULL)
     dobj_ = new TArray<T>(dimension,siz);
@@ -78 +81 @@
   
   delete [] siz;
-  if (dobj_->Size() != fn.nbOfImageData() )
+  //  if (dobj_->Size() != fn.nbOfImageData() )
+  if (dobj_->Size() != nbOfImageData() )
   {
     cout << " total size of TArray: " << dobj_->Size() << endl;
-    cout << " total size from fits file: " << fn.nbOfImageData() << endl;
+    cout << " total size from fits file: " << nbOfImageData() << endl;
       throw PException("ReadFromFits: size conflict");
   }
   // On lit le tableau
-  fn.GetSingleColumn( dobj_->Data(),dobj_->Size());
+  //  fn.GetSingleColumn( dobj_->Data(),dobj_->Size());
+  GetSingleColumn( dobj_->Data(),dobj_->Size());
 
 }
@@ -91 +96 @@
 
   template <class T>
-void FITS_TArray<T>::WriteToFits(FitsFile& fn)  
+void FITS_TArray<T>::WriteToFits()  
 {
   if(dobj_ == NULL) return;
@@ -125 +130 @@
     }
   cout << " nombre total d'elements a copier " << nbels << endl;
-  fn.makeHeaderImageOnFits(type, nbdim, naxisn);
+  //  fn.makeHeaderImageOnFits(type, nbdim, naxisn);
+  makeHeaderImageOnFits(type, nbdim, naxisn);
   if (!dobj_->IsPacked()) 
     {
@@ -138 +144 @@
       
     }
-  fn.putImageToFits(nbels, dobj_->Data());
+  //  fn.putImageToFits(nbels, dobj_->Data());
+  putImageToFits(nbels, dobj_->Data());
   
   delete [] naxisn;