Changeset 3167 in Sophya for trunk/SophyaExt/FitsIOServer/fitsinoutfile.cc

Timestamp:

Feb 2, 2007, 6:46:47 PM (19 years ago)

Author:

ansari

Message:

Passage a la version ll (LONGLONG) des routines fits , cmv+Reza 02/02/2007

File:

• trunk/SophyaExt/FitsIOServer/fitsinoutfile.cc (modified) (9 diffs)

trunk/SophyaExt/FitsIOServer/fitsinoutfile.cc

@@ -337 +337 @@
   if (CurrentHDU() != 1) return false;
   int naxis = 2;
-  long naxes[2];
+  LONGLONG naxes[2];
   GetImageHDUInfo(naxis, naxes);
   if ((naxis == 0) &&  (NbHDUs() > 1)) {
@@ -347 +347 @@
 
 /*-- Methode --*/
-void FitsInOutFile::CreateImageHDU(int bitpix, int naxis, long* naxes)
-{
-  int status = 0;
-  fits_create_img(fptr_, bitpix, naxis, naxes, &status);
+void FitsInOutFile::CreateImageHDU(int bitpix, int naxis, LONGLONG* naxes)
+{
+  int status = 0;
+  fits_create_imgll(fptr_, bitpix, naxis, naxes, &status);
   FitsCheckStatus(status,"FitsInOutFile::CreateImageHDU() Error: ");
   return;
@@ -361 +361 @@
    Rc : return the image type (bitpix) 
  */
-int FitsInOutFile::GetImageHDUInfo(int& naxis, long* naxes) const
+int FitsInOutFile::GetImageHDUInfo(int& naxis, LONGLONG* naxes) const
 {
   int status = 0;
   int maxdim = naxis;
   int bitpix = 0;
-  fits_get_img_param(fptr_, maxdim, &bitpix, &naxis, naxes, &status);
+  fits_get_img_paramll(fptr_, maxdim, &bitpix, &naxis, naxes, &status);
   FitsCheckStatus(status, "FitsInOutFile::GetImageHDUInfo() Error: ");
   return bitpix;
@@ -372 +372 @@
 
 /*-- Methode --*/
-long FitsInOutFile::GetNbRows()  const
-{
-  int status = 0;
-  long nbrow = 0;
-  fits_get_num_rows(FitsPtr() , &nbrow, &status);
+LONGLONG FitsInOutFile::GetNbRows()  const
+{
+  int status = 0;
+  LONGLONG nbrow = 0;
+  fits_get_num_rowsll(FitsPtr() , &nbrow, &status);
   FitsCheckStatus(status, "FitsInOutFile::GetNbRows() Error: " );
   return nbrow;
@@ -466 +466 @@
 long FitsInOutFile::GetColInfo(vector<string> & colnames, 
                                  vector<int> & coltypes,
-                                 vector<long> & repcnt,
-                                 vector<long> & width)
+                                 vector<LONGLONG> & repcnt,
+                                 vector<LONGLONG> & width)
 {
 
@@ -478 +478 @@
 
   int colnum, typecode;
-  long repeat, colw;
+  LONGLONG repeat, colw;   // $CHECK$ LONGLONG ???
   int ncols = 0;
   char colname[128];  // longueur max d'un nom de colonne
@@ -493 +493 @@
     }
     int sta2 = 0;
-    fits_get_coltype(FitsPtr(), colnum, &typecode, &repeat, &colw, &sta2);
+    fits_get_coltypell(FitsPtr(), colnum, &typecode, &repeat, &colw, &sta2); // $CHECK$ LONGLONG ???fits_get_coltypell
     FitsCheckStatus(sta2, "FitsInOutFile::GetColInfo() Error(2): ");
 
@@ -608 +608 @@
   CheckFitsPtr(FitsPtr()); 
   char keyname[FLEN_KEYWORD], comm[FLEN_COMMENT], sval[FLEN_VALUE];
-  long lval;
+  LONGLONG lval;
   double dval;
   string s;
@@ -621 +621 @@
   case MuTyV::MTVInteger :
     lval = mtv.GetIntPart();
-    fits_write_key(FitsPtr(), TLONG, keyname, &lval, comm, &status);
+    fits_write_key(FitsPtr(), TLONGLONG, keyname, &lval, comm, &status);
     break;
   case MuTyV::MTVFloat :