Changeset 1136 in Sophya for trunk/SophyaExt/FitsIOServer/fitsntuple.h

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/fitsntuple.h (modified) (6 diffs)

trunk/SophyaExt/FitsIOServer/fitsntuple.h

@@ -4 +4 @@
 #ifndef FITSNTuple_SEEN
 #define FITSNTuple_SEEN
+#include "machdefs.h"
 #include "ntuple.h"
 #include "anydataobj.h"
@@ -14 +15 @@
 // pout NTuple 
 ////////////////////////////////////////////////////////////////
-class  FITS_NTuple : public FitsFile  
+class  FITS_NTuple : public FitsIOHandler  
 {
 
@@ -24 +25 @@
  FITS_NTuple(NTuple* obj); 
 virtual ~FITS_NTuple();
- void Read(char inputfile[],int hdunum=2);
+
+virtual   AnyDataObj* DataObj() { return(dobj_); }
+virtual   void        SetDataObj(AnyDataObj & o) 
+  {   
+    NTuple* po = dynamic_cast<  NTuple* >(& o); 
+    if (po == NULL) return;
+    if (ownobj_ && dobj_) delete dobj_;  
+    dobj_ = po; 
+    ownobj_ = false; 
+  }    
+
+
 /*!
 fill the XNTuple only with lines from firstLine-th to (firstLine+numberOfLines-1)-th of the FITS-file inputfile.
@@ -31 +43 @@
 */
  void ReadLines(char inputfile[],int firstLine, int numberOfLines,int hdunum=2);
-void Write(char outputfile[], bool OldFile=false);
+
 inline operator NTuple() { return(*dobj_); }
 inline NTuple * getObj() { return(dobj_); }
@@ -38 +50 @@
 
   // implementation de FitsFile
-//virtual void ReadFromFits(FitsFile& fn);
-virtual void ReadFromFits();
-virtual void WriteToFits();
-
-float*  getColFromObj(int colNr);
+virtual void ReadFromFits(FitsInFile& is);
+virtual void WriteToFits(FitsOutFile& os) ;
 
  private : 
 
-inline void InitNull()
-   {
-     fistLineToBeRead_= -1;
-     numberOfLinesToBeRead_= -1;
-     column_ = NULL;
-   }
+inline void InitNull() { fistLineToBeRead_= -1; numberOfLinesToBeRead_= -1;}
 
 
@@ -59 +63 @@
   int fistLineToBeRead_;
   int numberOfLinesToBeRead_;
-  float* column_;
 };
 //////////////////////////////////////////////////////////////////