Changeset 2860 in Sophya

Timestamp:

Dec 20, 2005, 7:25:51 PM (20 years ago)

Author:

ansari

Message:

Ajout constructeur de copie (pas parfait) pour FitsInOutFile + modifs classes FitsFile/FitsInFile/FitsOutFile pour heriter de FitsInOutFile avec constructeur a partir de FitsInOutFile - Reza 20/12/2005

Location:

trunk/SophyaExt/FitsIOServer

Files:

• fitsfile.cc (modified) (9 diffs)
• fitsfile.h (modified) (7 diffs)
• fitsinoutfile.cc (modified) (4 diffs)
• fitsinoutfile.h (modified) (2 diffs)

trunk/SophyaExt/FitsIOServer/fitsfile.cc

@@ -6 +6 @@
 #include "strutil.h"
 #include "anydataobj.h" 
-#include "fitsspherehealpix.h"
 
 /*!
@@ -281 +280 @@
 
 
-
- 
+FitsFile::FitsFile()
+  : FitsInOutFile()
+{
+  InitNull();
+}
+
+FitsFile::FitsFile(FitsInOutFile const& fios)
+  : FitsInOutFile(fios)
+{
+  InitNull();
+}
+
+
+/*RzDel 
 FitsFile::~FitsFile()
 {
-  int status = 0;
-    if( fptr_ != NULL)
-    {
-      fits_close_file(fptr_,&status);
-      // je ne fais pas      delete fptr_, c'est la lib. fitsio qui a fait 
-      // new...
-    }
-   if( status )  printerror( status );
-}
+  //  Close fait par le destructeur de FitsInOutFile - Reza , Dec 2005
+  //  int status = 0;
+  //  if( fptr_ != NULL)
+  //    fits_close_file(fptr_,&status);
+  // if( status )  printerror( status );
+}
+*/
 
 
@@ -353 +362 @@
 
 FitsInFile::FitsInFile()
+  : FitsFile()
+
 {
   InitNull();
@@ -358 +369 @@
 
 FitsInFile::FitsInFile(string const & flnm)
-{
-    InitNull();
+  : FitsFile()
+{
+  InitNull();
+  Open(flnm.c_str(), Fits_RO);
+  /*RZDEL
    int status = 0;
    fits_open_file(&fptr_,flnm.c_str(),READONLY,&status);
    if( status ) printerror( status );
+  */
 }
 
 FitsInFile::FitsInFile(const char * flnm)
-{
-    InitNull();
-   int status = 0;
+  : FitsFile()
+{
+  InitNull();
+  Open(flnm, Fits_RO);
+  /*RZDEL
+  int status = 0;
    fits_open_file(&fptr_,flnm,READONLY,&status);
    if( status ) printerror( status );
+  */
+}
+
+FitsInFile::FitsInFile(FitsInOutFile const& fios)
+  : FitsFile(fios)
+
+{
+  InitNull();
+  if (mode_ == Fits_Create)
+    throw FitsIOException("FitsInFile::FitsInFile(FitsInOutFile const& fios) newly created fits file");
 }
 
@@ -1569 +1597 @@
 
 FitsOutFile::FitsOutFile()
+  : FitsFile()
 {
   InitNull(); 
@@ -1580 +1609 @@
 
 FitsOutFile::FitsOutFile(string const & flnm, WriteMode wrm)
+  : FitsFile()
 {
   InitNull();
@@ -1586 +1616 @@
 
 FitsOutFile::FitsOutFile(const char * flnm, WriteMode wrm)
+  : FitsFile()
 {
   InitNull();
@@ -1591 +1622 @@
 }
 
+FitsOutFile::FitsOutFile(FitsInOutFile const& fios)
+  : FitsFile(fios)
+{
+  InitNull(); 
+  if (mode_ == Fits_RO)
+    throw FitsIOException("FitsOutFile::FitsOutFile(FitsInOutFile const& ) ReadOnly Fits file");
+}
+
+FitsOutFile::~FitsOutFile()
+{
+  if (dvlToPrimary_ != NULL) delete dvlToPrimary_;
+}
+
 void FitsOutFile::openoutputfitsfile(const char * flnm, WriteMode wrm)
 {
@@ -1597 +1641 @@
   // create new FITS file
   fits_create_file(&fptr_,flnm,&status);
-  if( status )
-    {
-
-      switch (wrm)
-        {
+  if( status )    {
+    switch (wrm) {
       // si on veut ecrire a la fin de ce fichier
-        case append :
+    case append :
+      status = 0;
+      fits_clear_errmsg();
+      fits_open_file(&fptr_,flnm,READWRITE,&status);
+      if( status ) {
+        cout << " error opening file: " << flnm << endl;
+        printerror(status, "failure opening a file supposed to exist");
+      }
+      else cout << " file " << flnm << " opened, new objects will be appended " << endl;
+      fits_get_num_hdus(fptr_, &hdunum_, &status);
+      int hdutype;
+      fits_movabs_hdu(fptr_,hdunum_,&hdutype,&status);
+      if( status ) { 
+        printerror( status,":FitsFile::WriteF : erreur movabs");
+        throw FitsIOException("FitsOutFile::openoutputfitsfile()/fits movabs error");
+        break;
+        
+      case clear :
+        {
           status = 0;
           fits_clear_errmsg();
-          fits_open_file(&fptr_,flnm,READWRITE,&status);
-          if( status )
-            {
-              cout << " error opening file: " << flnm << endl;
-              printerror(status, "failure opening a file supposed to exist");
-            }
-          else cout << " file " << flnm << " opened, new objects will be appended " << endl;
-          fits_get_num_hdus(fptr_, &hdunum_, &status);
-          int hdutype;
-          fits_movabs_hdu(fptr_,hdunum_,&hdutype,&status);
-          if( status ) printerror( status,":FitsFile::WriteF : erreur movabs");
-          break;
-       
-        case clear :
-          {
-            status = 0;
-            fits_clear_errmsg();
-            char* newname = new char[strlen(flnm)+2];
-            //
-            newname[0] = '!';
-            newname[1] = '\0';
-            strcat(newname, flnm);
-            fits_create_file(&fptr_,newname,&status);
-            delete [] newname;
-            if (status)
-              {
-                cout << " error opening file: " << flnm << endl;
-                printerror(status, "unable to open file, supposed to exist");
-              }
-            else  cout << "  WARNING : file " << flnm << " is overwritten " << endl;
-            break;
-          }
-        case unknown : 
-          printerror(status, " file seems already to exist");
-          break;
-      
-        }
-    }
+          char* newname = new char[strlen(flnm)+2];
+          //
+          newname[0] = '!';
+          newname[1] = '\0';
+          strcat(newname, flnm);
+          fits_create_file(&fptr_,newname,&status);
+          delete [] newname;
+          if (status) {
+            cout << " error opening file: " << flnm << endl;
+            printerror(status, "unable to open file, supposed to exist");
+            throw FitsIOException("FitsOutFile::openoutputfitsfile()/fits open Error ");
+          }
+          else  cout << "  WARNING : file " << flnm << " is overwritten " << endl;
+          break;
+        }
+      case unknown : 
+        printerror(status, " file seems already to exist");
+        throw FitsIOException("FitsOutFile::openoutputfitsfile()/fits open Error - existing file");
+        break;
+      }
+    }
+  }
+  fname_ = flnm;
+  if ( wrm == append ) mode_ = Fits_RW;
+  else mode_ = Fits_Create;
+  ownfptr = true;
 }
 

trunk/SophyaExt/FitsIOServer/fitsfile.h

@@ -4 +4 @@
 #include "ndatablock.h"
 #include "dvlist.h"
-#include "FitsIO/fitsio.h" 
+#include "fitsinoutfile.h" 
 
 #define OPENFILE    0
@@ -75 +75 @@
 
 //! Class (virtual) for managing FITS format files
- class FitsFile {
+ class FitsFile : public FitsInOutFile {
 
  public:
@@ -148 +148 @@
 
 
-   FitsFile() { InitNull(); };
-   virtual ~FitsFile();
+   FitsFile();
+   FitsFile(FitsInOutFile const& fios);
+   // RzDel virtual ~FitsFile();
    static string GetErrStatus(int status);
    inline  int   statusF() const { return fits_status_;}
@@ -169 +170 @@
 inline void  InitNull() 
   {
-    fptr_ = NULL; 
     hdutype_= FitsExtensionType_NULL; 
     hdunum_ = 0; 
@@ -177 +177 @@
 
 
-
-   fitsfile *fptr_;     /**<  pointer to the FITS file, defined in fitsio.h */
    FitsExtensionType hdutype_;        /**<  image or bintable ? */
    int hdunum_;         /**<   index of header to be read/written */
@@ -197 +195 @@
    FitsInFile(string const & flnm);
    FitsInFile(const char * flnm);
-   ~FitsInFile() { ; };
+   FitsInFile(FitsInOutFile const& fios);
+   //   virtual ~FitsInFile();
 
    static int  NbBlocks(char flnm[]);
@@ -342 +341 @@
    FitsOutFile(string const & flnm, WriteMode wrm = unknown );
    FitsOutFile(const char * flnm, WriteMode wrm = unknown );
-   ~FitsOutFile() { if (dvlToPrimary_ != NULL) delete dvlToPrimary_;};
+   FitsOutFile(FitsInOutFile const& fios);
+   virtual ~FitsOutFile();
    inline void InitNull() {dvlToPrimary_ = NULL;}
 

trunk/SophyaExt/FitsIOServer/fitsinoutfile.cc

@@ -111 +111 @@
   //  cout << " DBG - FitsInOutFile(string name= " << name << ")" << endl;
   fptr_ = NULL;
+  ownfptr = true;
   SetDef_BinTable();
   SetDef_StrColWidth();
@@ -122 +123 @@
   //  cout << " DBG - FitsInOutFile(char* name= " << name << ")" << endl;
   fptr_ = NULL;
+  ownfptr = true;
   SetDef_BinTable();
   SetDef_StrColWidth();
   Open(name, mode);
+}
+
+/*! \brief Copy constructor 
+  The fits file pointer is owned by the original object and should not be closed
+  as long as the new object is being used.
+*/
+FitsInOutFile::FitsInOutFile(FitsInOutFile const& fios)
+{
+  fptr_ = fios.fptr_;
+  fname_ = fios.fname_;
+  mode_ = fios.mode_;
+  ownfptr = false;
+  SetDef_BinTable();
+  SetDef_StrColWidth();
 }
 
@@ -177 +193 @@
   fname_ = name;
   mode_ = mode;
+  ownfptr = true;
   return;
 }
@@ -184 +201 @@
 void FitsInOutFile::Close()
 {
+  if (ownfptr == false) return;
   if (fptr_ == NULL) return;
   int status = 0;

trunk/SophyaExt/FitsIOServer/fitsinoutfile.h

@@ -82 +82 @@
                    FitsInOutFile(string const & name, FitsIOMode mode);
                    FitsInOutFile(const char* name, FitsIOMode mode);
+                   FitsInOutFile(FitsInOutFile const& fios); 
  virtual           ~FitsInOutFile();
 
@@ -191 +192 @@
  string fname_;       //  File name as passed to creator
  FitsIOMode mode_;    
+ bool ownfptr;        //  If true, owns the FitsPointer, which will be closed by the destructor
 
  // Default extension name