Changeset 687 in Sophya

Timestamp:

Dec 15, 1999, 3:40:39 PM (26 years ago)

Author:

ansari

Message:

correction pour lecture de valeurs indefinies

File:

• trunk/SophyaExt/FitsIOServer/fitsioserver.cc (modified) (8 diffs)

trunk/SophyaExt/FitsIOServer/fitsioserver.cc

@@ -389 +389 @@
       //DBG      cout << " found " << npixels << " pixels" << endl;
       //DBG      cout << " expected " << sph.NbPixels() << endl;
-      if (nside <= 0 ) 
+      if (nside <= 0 )  
         {
           cout<<" FITSIOSERVER: no resolution parameter on fits file "<<endl;
@@ -406 +406 @@
       //        }
     }
-  //  cout << " fin relecture debut transfert" << endl;
-  for (int j = 0; j < sph.NbPixels(); j++) sph(j)= (float)r_4tab_[j];
+  for (int j = 0; j < sph.NbPixels(); j++) 
+    {
+      sph(j)= (float)r_4tab_[j];
+    }
 }
 void FitsIoServer::load(SphereGorski<double>& sph, char flnm[], int hdunum) 
@@ -1396 +1398 @@
   if (naxis >=2) nelements*=naxes[1];
   if (naxis == 3)  nelements*=naxes[2];
-  int anynull;
-  r_8 dnullval=0.;
-  r_4 fnullval=0.;
+  int anynull=0;
+  r_8 dnullval=DOUBLENULLVALUE;
+  r_4 fnullval=FLOATNULLVALUE;
   int_4 inullval=0;
   // on laisse a fits le soin de convertir le type du tableau lu vers
@@ -1428 +1430 @@
                     &anynull, &status);
       //SHV: remove useless print...
-      //for (int kk=0; kk<nelements; kk++) cout << r_4tab_[kk] << endl;
+      //      for (int kk=0; kk<nelements; kk++) cout << r_4tab_[kk] << endl;
+      cout << " anynull= " << anynull << endl;
       if( status )  printerror( status );
       break;
@@ -1572 +1575 @@
   //cout << " width : " << width << endl;
   fits_read_key_lng(fptr, "LASTPIX", &lastpix, comment, &status);
-  if( status )  printerror( status," mot cle LASTPIX" );
+  int IsLASTPIX=1;
+  if( status ) 
+    { 
+      IsLASTPIX=0;
+      printerror( status," mot cle LASTPIX" );
+    }
 
   long nelements= nrows*repeat;
-  if (nelements!=lastpix+1) 
-    {
-      cout << " erreur sur longueur du vecteur " << endl;
-      cout << " nelements= " << nelements << " lastpix+1=" << lastpix+1 << endl;
-    }
   npixels=nelements;
+  if (IsLASTPIX == 1) 
+    {
+      if (nelements!=lastpix+1) 
+        {
+          cout << " probleme sur longueur du vecteur " << endl;
+          cout << " nb elements prevu = " << nelements << " lastpix+1=" << lastpix+1 << endl;
+          npixels=lastpix+1;
+        }
+    }
   int anynull;
-  r_8 dnullval=0.;
-  r_4 fnullval=0.;
+  r_8 dnullval=DOUBLENULLVALUE;
+  r_4 fnullval=FLOATNULLVALUE;
   int_4 inullval=0;
   // on laisse a fits le soin de convertir le type du tableau lu vers
@@ -1598 +1610 @@
       if (r_8tab_ != NULL) { delete [] r_8tab_;  r_8tab_ = NULL; }
       r_8tab_=new r_8[ npixels];
-      fits_read_col(fptr, TDOUBLE, 1, 1, 1, nelements,  &dnullval, 
+      fits_read_col(fptr, TDOUBLE, 1, 1, 1, npixels,  &dnullval, 
                     r_8tab_, 
                     &anynull, &status);
@@ -1611 +1623 @@
         }
       if (r_4tab_ != NULL) { delete [] r_4tab_;  r_4tab_ = NULL; }
-      r_4tab_=new r_4[nelements];
-      fits_read_col(fptr, TFLOAT, 1, 1, 1, nelements,  &fnullval, 
+      r_4tab_=new r_4[npixels];
+      fits_read_col(fptr, TFLOAT, 1, 1, 1, npixels,  &fnullval, 
                     r_4tab_, &anynull, &status);
       if( status )  printerror( status,"probleme dans lecture du tableau de floats" );
@@ -1625 +1637 @@
         }
       if (i_4tab_ != NULL) { delete [] i_4tab_;  i_4tab_ = NULL; }
-      i_4tab_=new int_4[nelements];
-      fits_read_col(fptr, TLONG, 1, 1, 1, nelements,  &inullval, 
+      i_4tab_=new int_4[npixels];
+      fits_read_col(fptr, TLONG, 1, 1, 1, npixels,  &inullval, 
                     i_4tab_, &anynull, &status);
       //fits_read_img(fptr, TINT, 1, nelements,  &inullval, i_4tab_,