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

Timestamp:

Sep 19, 2000, 5:08:16 PM (25 years ago)

Author:

ansari

Message:

amelioration lecture ligne a ligne

File:

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

trunk/SophyaExt/FitsIOServer/fitsfile.cc

@@ -21 +21 @@
 
 
-void FitsIOHandler::Write(char flnm[], string WriteMode) 
-
-{
-
-  FitsOutFile of(flnm,  WriteMode);
+void FitsIOHandler::Write(char flnm[]) 
+
+{
+  FitsOutFile of(flnm, unknown);
   Write(of);
 }
@@ -366 +365 @@
   return  taille_des_chaines_[index];
 }
-void FitsInFile::GetBinTabLine(int NoLine, double* ddata, float* fdata, int* idata, char ** cdata) 
+void  FitsInFile::GetBinTabLine(int NoLine, double* ddata, float* fdata, int* idata, char ** cdata) 
 {
   int status= 0;
@@ -396 +395 @@
         case 'S' :
           fits_read_col(fptr_,TSTRING,ncol+1,NoLine+1,1,1,cnull,&cdata[ccount++],&anull,&status);
+          break;
+        }
+      if (status)
+        {
+          ResetStatus(status);
+          break;
+        }
+    }
+}
+
+void   FitsInFile::GetBinTabLine(long NoLine,  BnTblLine& ligne) 
+{
+  int status= 0;
+  int    anull;
+  double dnull= 0.;
+  float fnull= 0.;
+  int inull= 0;
+  char* cnull= "";
+  int dcount = 0.;
+  int fcount = 0.;
+  int icount = 0;
+  int ccount =0;
+  int ncol;
+  long nels=1;
+  for (ncol=0; ncol<nbcols_; ncol++)
+    {
+      switch (types_[ncol])
+        { 
+        case 'D' :
+          fits_read_col(fptr_,TDOUBLE,ncol+1,NoLine+1,1,1,&dnull,&ligne.ddata_[dcount++],&anull,&status);
+            break;
+        case 'E' :
+          fits_read_col(fptr_,TFLOAT,ncol+1,NoLine+1,1,1,&fnull,&ligne.fdata_[fcount++],&anull,&status);
+          break;
+        case 'I' :
+          fits_read_col(fptr_,TINT,ncol+1,NoLine+1,1,1,&inull,&ligne.idata_[icount++],
+                        &anull,&status);
+          break;
+        case 'S' :
+          char* chaine = new char[taille_des_chaines_[ccount]];
+          fits_read_col(fptr_,TSTRING,ncol+1,NoLine+1,1,1,cnull,&chaine,&anull,&status);
+          ligne.cdata_[ccount++] = string(chaine);
           break;
         }
@@ -827 +868 @@
 FitsOutFile::FitsOutFile()
 {
-  InitNull();
-}
-
-FitsOutFile::FitsOutFile(char flnm[], string WriteMode)
+  InitNull(); 
+}
+
+FitsOutFile::FitsOutFile(char flnm[], WriteMode wrm)
 {
 
@@ -841 +882 @@
   if( status )
     {
+
+      switch (wrm)
+        {
       // si on veut ecrire a la fin de ce fichier
-      if (WriteMode == string("append"))
-        {
+        case append :
           status = 0;
           fits_open_file(&fptr_,flnm,READWRITE,&status);
@@ -856 +899 @@
           fits_movabs_hdu(fptr_,hdunum_,&hdutype,&status);
           if( status ) printerror( status,":FitsFile::WriteF : erreur movabs");
-        }
-      else 
-        if (WriteMode == string("clear")) 
+          break;
+       
+        case clear :
           {
             status = 0;
@@ -867 +910 @@
             strcat(newname, flnm);
             fits_create_file(&fptr_,newname,&status);
+            delete [] newname;
             if (status)
               {
@@ -872 +916 @@
                 printerror(status, "unable to open file, supposed to exist");
               }
-            else  cout << " file " << flnm << " will be overwrited " << endl;
-              
+            else  cout << "  WARNING : file " << flnm << " is overwritten " << endl;
+            break;
           }
-        else 
-          if  (WriteMode == string("unknown")) printerror(status, " file seems already to exist");
-
-          else  printerror(status, "open file failed");
+        case unknown : 
+          printerror(status, " file seems already to exist");
+          break;
       
+        }
     }
 }
@@ -954 +998 @@
 
 
-void FitsOutFile::makeHeaderBntblOnFits( char* fieldType, char** Noms, int nentries, int tfields, DVList &dvl, char* extname, vector<int> taille_des_chaines) 
+void FitsOutFile::makeHeaderBntblOnFits( string fieldType, vector<string> Noms, int nentries, int tfields, DVList &dvl, string extname, vector<int> taille_des_chaines) 
 { 
   int status = 0;
   long nrows;
-  if (strlen(fieldType) != tfields)
-    {
-      cout << " nombre de champs :" << tfields << "nombre de types: " << strlen(fieldType) << endl;
+  if (fieldType.length() != tfields)
+    {
+      cout << " nombre de champs :" << tfields << "nombre de types: " << fieldType.length() << endl;
       throw ParmError("FitsFile:: fields and types don't match");
 
@@ -1002 +1046 @@
           strcat(format,largeur);
         }
-      ttype[k]= new char[FLEN_VALUE];
-      strcpy(ttype[k],Noms[k]);
+      ttype[k] =  const_cast<char*>(Noms[k].c_str());
       tform[k]= new char[FLEN_VALUE];
       strcpy(tform[k],format);
     }
-  // value of the EXTNAME keyword
-  char extn[FLEN_VALUE];
-  strncpy(extn,extname,FLEN_VALUE);
+  char* extn = const_cast<char*>(extname.c_str());
 
   // create a new empty binary table onto the FITS file
@@ -1023 +1064 @@
   for(ii = 0; ii < tfields; ii++)
     {
-      delete [] ttype[ii];
       delete [] tform[ii];
     }
@@ -1031 +1071 @@
   // write supplementary keywords
   addKeywordsOfDVList(dvl);
-
 }
 
@@ -1134 +1173 @@
   if( status )  printerror( status,"erreur ecriture du fichier fits" );
 }
+
+void FitsOutFile::putBinTabLine(int NoLine, double* ddata, float* fdata, int* idata, char ** cdata) const
+{
+  int status= 0;
+  int    anull;
+  int dcount = 0.;
+  int fcount = 0.;
+  int icount = 0;
+  int ccount =0;
+  int ncol;
+  long nels=1;
+  int nbcols;
+  fits_get_num_cols(fptr_, &nbcols,&status);
+  for (ncol=0; ncol<nbcols; ncol++)
+    {
+      int code; 
+      long repeat, width;
+      fits_get_coltype(fptr_, ncol+1, &code, &repeat,&width, &status);
+      switch (code)
+        { 
+        case TDOUBLE :
+          fits_write_col(fptr_,TDOUBLE,ncol+1,NoLine+1,1,1, &ddata[dcount++] ,&status);
+            break;
+        case TFLOAT :
+          fits_write_col(fptr_,TFLOAT,ncol+1,NoLine+1,1,1, &fdata[fcount++] ,&status);
+          break;
+        case TINT :
+          fits_write_col(fptr_,TINT,ncol+1,NoLine+1,1,1, &idata[icount++] ,&status);
+          break;
+        case TLONG :
+          fits_write_col(fptr_,TINT,ncol+1,NoLine+1,1,1, &idata[icount++] ,&status);
+          break;
+        case TSHORT :
+          fits_write_col(fptr_,TINT,ncol+1,NoLine+1,1,1, &idata[icount++] ,&status);
+          break;
+        case TSTRING :
+          fits_write_col(fptr_,TSTRING,ncol+1,NoLine+1,1,1, &cdata[ccount++] ,&status);
+          break;
+        }
+      if (status)
+        {
+          cout << " WARNING : unknown type (putBinTabLine) : on fits file= " << code << " (FITS code) " << endl;
+          status = 0;
+          break;
+        }
+    }
+}
+
 
 void  FitsOutFile::DVListIntoPrimaryHeader(DVList& dvl) const