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

Timestamp:

Nov 16, 2001, 11:26:58 AM (24 years ago)

Author:

lemeur

Message:

mises a jour pour ELDESTINO

File:

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

trunk/SophyaExt/FitsIOServer/fitsfile.h

@@ -105 +105 @@
    inline void firstImageOnPrimaryHeader(bool choice) {imageOnPrimary_=choice;}
    inline int currentHeaderIndex() {return hdunum_;}
-   inline fitsfile* fitsfilePtr() {return fptr_;}
  
 
  protected:
 
-   void         ResetStatus(int& status) ; 
-   static  void printerror(int&) ;
-   static  void printerror(int&,char* texte) ;
-   static  void printerrorAndContinue(int& status, char* texte);
-   inline void  InitNull() {fptr_ = NULL; hdutype_= FitsExtensionType_NULL; hdunum_ = 0; 
-   fits_status_ = 0; imageOnPrimary_ = true;}
+void         ResetStatus(int& status) ; 
+static  void printerror(int&) ;
+static  void printerror(int&,char* texte) ;
+static  void printerrorAndContinue(int& status, char* texte);
+inline void  InitNull() 
+  {
+    fptr_ = NULL; 
+    hdutype_= FitsExtensionType_NULL; 
+    hdunum_ = 0; 
+    fits_status_ = 0; imageOnPrimary_ = true;
+  }
+inline fitsfile* fitsfilePtr() const {return fptr_;}
+
+
+
    fitsfile *fptr_;     /**<  pointer to the FITS file, defined in fitsio.h */
    FitsExtensionType hdutype_;        /**<  image or bintable ? */
@@ -145 +153 @@
   inline const DVList& DVListFromFits() const { return dvl_;}
 
+  void GetKeywordsFromHeader (int hdunum, list<FitsKeyword>& mots_cles) const;
+
+
   DVList  DVListFromPrimaryHeader() const;
   void    moveToFollowingHeader();
@@ -179 +190 @@
 /*! \return data type of the current IMAGE extension */
 inline FitsFile::FitsDataType ImageType() const {return imageDataType_;}
+
 
 
@@ -237 +249 @@
 
 void InitNull();
-void getHeader();
+void getHeaderWithSophyaObject();
 static void KeywordsIntoDVList(fitsfile* fileptr, DVList& dvl, int hdunum); 
 static  void GetImageParameters (fitsfile* fileptr,FitsDataType& dataType,int& naxis,vector<int>& naxisn);