Changeset 1231 in Sophya for trunk/SophyaExt/FitsIOServer/fitsfile.cc

Timestamp:

Oct 12, 2000, 4:47:37 PM (25 years ago)

Author:

ansari

Message:

Modifs cosmetiques + introduction des operateurs << et >> sur

FitsOut/InFile - Reza 12/10/2000

File:

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

trunk/SophyaExt/FitsIOServer/fitsfile.cc

@@ -129 +129 @@
 
 {
-  FitsOutFile of(flnm, unknown);
+  FitsOutFile of(flnm, FitsFile::unknown);
   Write(of);
 }
@@ -208 +208 @@
 }
 
-FitsInFile::FitsInFile(char flnm[])
+FitsInFile::FitsInFile(string const & flnm)
+{
+    InitNull();
+   int status = 0;
+   fits_open_file(&fptr_,flnm.c_str(),READONLY,&status);
+   if( status ) printerror( status );
+}
+
+FitsInFile::FitsInFile(const char * flnm)
 {
     InitNull();
@@ -250 +258 @@
 }
 
-void FitsInFile::GetBlockType(char flnm[], int hdunum, string& typeOfExtension, int& naxis, vector<int>& naxisn, string& dataType, DVList& dvl )
+void FitsInFile::GetBlockType(char flnm[], int hdunum, FitsExtensionType& typeOfExtension, int& naxis, vector<int>& naxisn, FitsDataType& dataType, DVList& dvl )
 {
   int status = 0;
@@ -262 +270 @@
   if(hdutype == IMAGE_HDU) 
     {
-      typeOfExtension = "IMAGE";
+      typeOfExtension = FitsExtensionType_IMAGE;
       int bitpix;
       GetImageParameters (fileptr, bitpix, naxis, naxisn);
-      if(bitpix == DOUBLE_IMG) dataType = "double";
+      if(bitpix == DOUBLE_IMG) dataType = FitsDataType_double;
       else
-        if(bitpix == FLOAT_IMG) dataType = "float";
+        if(bitpix == FLOAT_IMG) dataType = FitsDataType_float;
         else
-          if(bitpix == LONG_IMG || bitpix == SHORT_IMG ) dataType = "int";
+          if(bitpix == LONG_IMG || bitpix == SHORT_IMG ) dataType = FitsDataType_int;
           else 
             {
@@ -289 +297 @@
         if(hdutype == ASCII_TBL)
           {
-            typeOfExtension = "ASCII_TBL"; 
-            dataType = "ASCII";
+            typeOfExtension = FitsExtensionType_ASCII_TBL; 
+            dataType = FitsDataType_ASCII;
           }
         else
           {
-            typeOfExtension = "BINARY_TBL";
-            if(types[0] == 'D') dataType = "double";
+            typeOfExtension = FitsExtensionType_BINARY_TBL;
+            if(types[0] == 'D') dataType = FitsDataType_double;
             else
-              if(types[0] == 'E') dataType = "float";
+              if(types[0] == 'E') dataType = FitsDataType_float;
               else
-                if(types[0] == 'I' ) dataType = "int";
+                if(types[0] == 'I' ) dataType = FitsDataType_int;
                 else
-                  if(types[0] == 'S' ) dataType = "char*";
+                  if(types[0] == 'S' ) dataType = FitsDataType_char;
                   else 
                     {
@@ -1093 +1101 @@
 
    */
-FitsOutFile::FitsOutFile(char flnm[], WriteMode wrm)
-{
-
+
+FitsOutFile::FitsOutFile(string const & flnm, WriteMode wrm)
+{
   InitNull();
+  openoutputfitsfile(flnm.c_str(), wrm);
+}
+
+FitsOutFile::FitsOutFile(const char * flnm, WriteMode wrm)
+{
+  InitNull();
+  openoutputfitsfile(flnm, wrm);
+}
+
+void FitsOutFile::openoutputfitsfile(const char * flnm, WriteMode wrm)
+{
   int status = 0;