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

Timestamp:

Nov 8, 2000, 11:02:58 AM (25 years ago)

Author:

ansari

Message:

classe FITS_AutoReader

File:

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

trunk/SophyaExt/FitsIOServer/fitsfile.h

@@ -60 +60 @@
    };
    enum FitsDataType {
+     FitsDataType_NULL,
      FitsDataType_double,
      FitsDataType_float,
      FitsDataType_int,
      FitsDataType_char,
-     FitsDataType_ASCII
+     FitsDataType_ASCII,
    };
 
@@ -72 +73 @@
    inline  int   statusF() const { return fits_status_;}
    inline void firstImageOnPrimaryHeader(bool choice) {imageOnPrimary_=choice;}
+   inline int currentHeaderIndex() {return hdunum_;}
  
 
@@ -81 +83 @@
    inline void  InitNull() {fptr_ = NULL; hdutype_= 0; hdunum_ = 0; 
    fits_status_ = 0; imageOnPrimary_ = true;}
-
    fitsfile *fptr_;     /**<  pointer to the FITS file, defined in fitsio.h */
    int hdutype_;        /**<  image or bintable ? */
@@ -102 +103 @@
    static int  NbBlocks(char flnm[]);
    static void GetBlockType(char flnm[], int hdunum, FitsExtensionType& typeOfExtension, int& naxis, vector<int>& naxisn, FitsDataType& dataType, DVList& dvl  );
-   void        ReadFInit(int hdunum);
+   void        ReadHeader(int hdunum);
  
   /*! \return a reference on a DVList containing the keywords from FITS file */
@@ -139 +140 @@
 inline int nbOfImageData() const { return nbData_; }
 
+/*! \return data type of the current IMAGE extension */
+inline FitsFile::FitsDataType ImageType() const {return imageDataType_;}
 
 
@@ -155 +158 @@
                                   vector<int>& repeat,
                                   vector<string>& noms, 
-                                  vector<char>& types,   
+                                  vector<FitsDataType>& types,   
                                   vector<int>&  taille_des_chaines);
- char   ColTypeFromFits(int nocol) const;
+ FitsDataType   ColTypeFromFits(int nocol) const;
  string ColNameFromFits(int nocol) const;
  int    ColStringLengthFromFits(int nocol) const;
@@ -188 +191 @@
 void getHeader();
 static void KeywordsIntoDVList(fitsfile* fileptr, DVList& dvl, int hdunum); 
-static  void GetImageParameters (fitsfile* fileptr,int& bitpix,int& naxis,vector<int>& naxisn);
-
- int bitpix_;          /**< fits-Image parameter */
+static  void GetImageParameters (fitsfile* fileptr,FitsDataType& dataType,int& naxis,vector<int>& naxisn);
+
+ FitsDataType imageDataType_;          /**< fits-Image parameter (bitpix)*/
  int naxis_;           /**< fits-Image parameter */
  vector<int> naxisn_;  /**< fits-Image parameters : sizes of dimensions */
@@ -198 +201 @@
  int nbcols_;          /**< Bintable parameter */
  vector<string> noms_; /**< Bintable parameter: column names */
- vector<char> types_;  /**< Bintable parameters: types of columns (D: double, E: float, I: integers,  A: char*) */
+ vector<FitsDataType> types_;  /**< Bintable parameters: types of columns (D: double, E: float, I: integers,  A: char*) */
  DVList dvl_;          /**< DVList for transferring keywords */
  vector<int>  taille_des_chaines_; /**< Bintable parameters:   length of the char* variables */