Changeset 1334 in Sophya for trunk/SophyaExt/FitsIOServer/fitsfile.h

Timestamp:

Nov 15, 2000, 4:29:11 PM (25 years ago)

Author:

ansari

Message:

modifs returns de autoreader

File:

• trunk/SophyaExt/FitsIOServer/fitsfile.h (modified) (6 diffs)

trunk/SophyaExt/FitsIOServer/fitsfile.h

@@ -55 +55 @@
 
    enum FitsExtensionType {
+     FitsExtensionType_NULL,
      FitsExtensionType_IMAGE,
      FitsExtensionType_ASCII_TBL,
-     FitsExtensionType_BINARY_TBL
+     FitsExtensionType_BINARY_TBL,
+     FitsExtensionType_EOF,
+     FitsExtensionType_ERROR
    };
    enum FitsDataType {
@@ -81 +84 @@
    static  void printerror(int&) ;
    static  void printerror(int&,char* texte) ;
-   inline void  InitNull() {fptr_ = NULL; hdutype_= 0; hdunum_ = 0; 
+   inline void  InitNull() {fptr_ = NULL; hdutype_= FitsExtensionType_NULL; hdunum_ = 0; 
    fits_status_ = 0; imageOnPrimary_ = true;}
    fitsfile *fptr_;     /**<  pointer to the FITS file, defined in fitsio.h */
-   int hdutype_;        /**<  image or bintable ? */
+   FitsExtensionType hdutype_;        /**<  image or bintable ? */
    int hdunum_;         /**<   index of header to be read/written */
    int fits_status_;    /**< last status returned by fitsio library. updated only by several methods */
@@ -102 +105 @@
 
    static int  NbBlocks(char flnm[]);
+   int  NbBlocks();
    static void GetBlockType(char flnm[], int hdunum, FitsExtensionType& typeOfExtension, int& naxis, vector<int>& naxisn, FitsDataType& dataType, DVList& dvl  );
    void        ReadHeader(int hdunum);
@@ -126 +130 @@
 
 /*! \return true if the current header  corresponds to a FITS image extension */
-inline bool IsFitsImage() const { return (hdutype_ == IMAGE_HDU);}
+inline bool IsFitsImage() const { return (hdutype_ == FitsExtensionType_IMAGE);}
 
 
@@ -152 +156 @@
 
 /*! \return true if the current header  corresponds to a FITS ASCII or BINTABLE extension */
-inline bool IsFitsTable() const {return (hdutype_ == ASCII_TBL || hdutype_ == BINARY_TBL);}
+inline bool IsFitsTable() const {return (hdutype_ == FitsExtensionType_ASCII_TBL || hdutype_ == FitsExtensionType_BINARY_TBL);}
 
 
@@ -176 +180 @@
 ////////////////////////////////////////////////////////
 
+/*! \return true if the current header  is beyond the maximum */
+inline bool IsFitsEOF() const {return (hdutype_ == FitsExtensionType_EOF);}
+/*! \return true if the current header  is incorrect, following a cfitsio, movavs error */
+inline bool IsFitsERROR() const {return (hdutype_ == FitsExtensionType_ERROR);}
+
   int     NbColsFromFits() const;
   int     NentriesFromFits(int nocol) const;