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

Timestamp:

Aug 24, 2000, 12:18:02 PM (25 years ago)

Author:

ansari

Message:

structuration a la ppersist+ convention sur hdu

File:

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

trunk/SophyaExt/FitsIOServer/fitstarray.cc

@@ -12 +12 @@
 FITS_TArray<T>::FITS_TArray()
 {
-  dobj_=new TArray<T>;
-  ownobj=true;
+  dobj_= NULL;
+  ownobj_=false;
 }
 
@@ -19 +19 @@
 FITS_TArray<T>::FITS_TArray(char inputfile[],int hdunum)
 {
-  dobj_=new TArray<T>;
-  ownobj=true; 
-  ReadF(inputfile,hdunum);
+  dobj_=NULL;
+  ownobj_=false; 
+  Read(inputfile,hdunum);
 }
 
@@ -27 +27 @@
 FITS_TArray<T>::FITS_TArray(const TArray<T> & obj) 
 { 
-  dobj_ = new TArray<T>(obj);
-  ownobj=true; 
+    dobj_ = new TArray<T>(obj);
+  ownobj_=true; 
 }
 
@@ -35 +35 @@
 { 
   dobj_ = obj;
-  ownobj=false; 
+  ownobj_=false; 
 }
 
@@ -42 +42 @@
 FITS_TArray<T>::~FITS_TArray()
 {
-  if (ownobj && dobj_) delete dobj_;
+  if (ownobj_ && dobj_) delete dobj_;
 }
-
-template <class T>
-void FITS_TArray<T>::Write(char outputfile[], bool OldFile)
-{
-  WriteF(outputfile, OldFile);
-}
-
 
 
@@ -59 +52 @@
 }
 
+
 template <class T>
-void FITS_TArray<T>::ReadFromFits()
+void   FITS_TArray<T>::SetDataObj(AnyDataObj & o) 
+  {   
+    TArray<T>* po = dynamic_cast<  TArray<T>* >(& o); 
+    if (po == NULL) return;
+    if (ownobj_ && dobj_) delete dobj_;  
+    dobj_ = po; 
+    ownobj_ = false; 
+  }    
+
+
+
+template <class T>
+void FITS_TArray<T>::ReadFromFits(FitsInFile& is)
 {
-
-  //  if (!fn.IsFitsImage())
-  if (!IsFitsImage())
+  if (!is.IsFitsImage())
     {
       throw PException("ReadFromFits: the fits file seems not to be an image");
     }
-  //  int dimension = fn.nbDimOfImage();
-  int dimension = nbDimOfImage();
+  int dimension = is.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] = dimOfImageAxes()[k];
+  for (int k=0; k< dimension; k++) siz[k] = is.dimOfImageAxes()[k];
   if(dobj_ == NULL)
-    dobj_ = new TArray<T>(dimension,siz);
+    {
+      dobj_ = new TArray<T>(dimension,siz);
+      ownobj_ = true;
+    }
   else
     dobj_->ReSize(dimension,siz);
   
   delete [] siz;
-  //  if (dobj_->Size() != fn.nbOfImageData() )
-  if (dobj_->Size() != nbOfImageData() )
+  if (dobj_->Size() != is.nbOfImageData() )
   {
     cout << " total size of TArray: " << dobj_->Size() << endl;
-    cout << " total size from fits file: " << nbOfImageData() << endl;
+    cout << " total size from fits file: " << is.nbOfImageData() << endl;
       throw PException("ReadFromFits: size conflict");
   }
   // On lit le tableau
-  //  fn.GetSingleColumn( dobj_->Data(),dobj_->Size());
-  GetSingleColumn( dobj_->Data(),dobj_->Size());
+  is.GetSingleColumn( dobj_->Data(),dobj_->Size());
 
 }
 
 
-  template <class T>
-void FITS_TArray<T>::WriteToFits()  
+template <class T>
+void FITS_TArray<T>::WriteToFits(FitsOutFile& os)  
 {
   if(dobj_ == NULL) return;
@@ -130 +133 @@
     }
   cout << " nombre total d'elements a copier " << nbels << endl;
-  //  fn.makeHeaderImageOnFits(type, nbdim, naxisn);
-  makeHeaderImageOnFits(type, nbdim, naxisn);
+  os.makeHeaderImageOnFits(type, nbdim, naxisn);
   if (!dobj_->IsPacked()) 
     {
@@ -144 +146 @@
       
     }
-  //  fn.putImageToFits(nbels, dobj_->Data());
-  putImageToFits(nbels, dobj_->Data());
+  os.putImageToFits(nbels, dobj_->Data());
   
   delete [] naxisn;