Changeset 1703 in Sophya for trunk

Timestamp:

Oct 17, 2001, 5:38:16 PM (24 years ago)

Author:

lemeur

Message:

lecture de spheres fits, sans NSIDE ni LASTPIX

Location:

trunk/SophyaExt/FitsIOServer

Files:

• fitsfile.cc (modified) (6 diffs)
• fitsfile.h (modified) (1 diff)
• fitsspherehealpix.cc (modified) (1 diff)

trunk/SophyaExt/FitsIOServer/fitsfile.cc

@@ -187 +187 @@
   cout << " erreur:: " << texte << endl;
   throw IOExc("FitsFile:: error FITSIO status");
+}
+void FitsFile::printerrorAndContinue(int& status, char* texte) 
+  //*****************************************************/
+  //* Print out cfitsio error messages and exit program */
+  //*****************************************************/
+{
+  // print out cfitsio error messages and exit program 
+  // print error report  
+     fits_report_error(stderr, status);
+  cout << " erreur:: " << texte << endl;
+  //  throw IOExc("FitsFile:: error FITSIO status");
 }
 
@@ -322 +333 @@
   if (hdunum<0) 
     {
-      throw PException(" FITS_AutoReader::ReadObject : hdu number must be not negative");
+      throw PException(" FitsInFile::ReadHeader : hdu number must be not negative");
     }
   if (hdunum != 0 ) hdunum_ = hdunum;
@@ -835 +846 @@
       fits_read_col(fptr_,TDOUBLE,NoCol+1,1,1,nels,&dnull,valeurs,
                             &anull,&status);
-      if( status ) printerror( status,"erreur lecture de colonne" );
-      
+      if( status )
+        {
+          printerrorAndContinue( status,"erreur lecture de colonne" );
+        }
     }
 
@@ -872 +885 @@
       fits_read_col(fptr_,TFLOAT,NoCol+1,1,1,nels,&fnull,valeurs,
                             &anull,&status);
-      if( status ) printerror( status,"erreur lecture de colonne" );
+      if( status ) printerrorAndContinue( status,"erreur lecture de colonne" );
     }
 
@@ -907 +920 @@
       fits_read_col(fptr_,TINT,NoCol+1,1,1,nels,&inull,valeurs,
                             &anull,&status);
-      if( status ) printerror( status,"erreur lecture de colonne" );
+      if( status ) printerrorAndContinue( status,"erreur lecture de colonne" );
     }
 
@@ -938 +951 @@
       fits_read_col(fptr_,TSTRING,NoCol+1,frow,felem,nels,cnull,valeurs,
                     &anull,&status);
-      if( status ) printerror( status,"erreur lecture de colonne" );
+      if( status ) printerrorAndContinue( status,"erreur lecture de colonne" );
     }
 

trunk/SophyaExt/FitsIOServer/fitsfile.h

@@ -113 +113 @@
    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;}

trunk/SophyaExt/FitsIOServer/fitsspherehealpix.cc

@@ -188 +188 @@
       else
         {
-           throw IOExc("FITS_SphereHEALPix:: No NSIDE nor LASTPIX on file");
+          //      dvl.Print();
+          // int naxis2 = dvl.GetI("NAXIS2");
+          // if (naxis2 > 0 ) 
+          //  {
+          nside = sqrt((double)(nbentries/12));
+              // }
+              // else
+              //  throw IOExc("FITS_SphereHEALPix:: No NSIDE nor LASTPIX nor NAXIS2 on file");
         }
     }