Changeset 1175 in Sophya for trunk/SophyaExt

Timestamp:

Sep 1, 2000, 5:22:58 PM (25 years ago)

Author:

ansari

Message:

suppression delete fptr_ , fait par cfitsio

Location:

trunk/SophyaExt/FitsIOServer

Files:

• fitsfile.cc (modified) (7 diffs)
• fitsfile.h (modified) (3 diffs)

trunk/SophyaExt/FitsIOServer/fitsfile.cc

@@ -10 +10 @@
 void   FitsIOHandler::Read(char flnm[],int hdunum)
 {
-  //  FitsInFile ifts(flnm, hdunum);
   FitsInFile ifts(flnm);
   Read(ifts, hdunum);
@@ -16 +15 @@
 void FitsIOHandler::Read(FitsInFile& is, int hdunum) 
 {
-  if (hdunum == 0)  is.moveToFollowingHeader();
-  else is.ReadFInit(hdunum);
+    if (hdunum == 0)  is.moveToFollowingHeader();
+   else is.ReadFInit(hdunum);
   ReadFromFits(is);
 }
@@ -41 +40 @@
 {
   int status = 0;
-  if( fptr_ != NULL)
+    if( fptr_ != NULL)
     {
       fits_close_file(fptr_,&status);
-      delete fptr_;
-    }
-  if( status )  printerror( status );
+      // je ne fais pas      delete fptr_, c'est la lib. fitsio qui a fait 
+      // new...
+    }
+   if( status )  printerror( status );
 }
 
@@ -95 +95 @@
 FitsInFile::FitsInFile(char flnm[])
 {
-  InitNull();
-  int status = 0;
-  fits_open_file(&fptr_,flnm,READONLY,&status);
-  if( status ) printerror( status );
-  //  ReadFInit(flnm, hdunum);
+    InitNull();
+   int status = 0;
+   fits_open_file(&fptr_,flnm,READONLY,&status);
+   if( status ) printerror( status );
 }
 
@@ -105 +104 @@
 void FitsInFile::InitNull()
 {
+  
   bitpix_ = 0;
   naxis_ = 0;
@@ -115 +115 @@
   taille_des_chaines_.clear();
   dvl_.Clear();
+  
+  
 }
 
@@ -677 +679 @@
   char **ttype = new char*[nbcols];
   int ii;
+  // 
+  //
   for (ii=0; ii < nbcols; ii++) ttype[ii]=new char[FLEN_VALUE];
   int nfound;

trunk/SophyaExt/FitsIOServer/fitsfile.h

@@ -64 +64 @@
 
 */ 
-  void   Read(char flnm[],int hdunum= 2);
+  void   Read(char flnm[],int hdunum= 0);
 /*!
 this method is called from inherited objects : 
@@ -109 +109 @@
 public:
 
-  FitsFile() { InitNull();};
+FitsFile() 
+{ 
+ InitNull();
+};
   virtual ~FitsFile();
 
@@ -125 +128 @@
    static  void printerror(int&) ;
    static  void printerror(int&,char* texte) ;
-   inline void InitNull() { fptr_= NULL; hdutype_= 0; hdunum_ = 1; 
+   inline void InitNull() {fptr_ = NULL; hdutype_= 0; hdunum_ = 1; 
    fits_status_ = 0;}