Changeset 1721 in Sophya

Timestamp:

Oct 23, 2001, 3:20:57 PM (24 years ago)

Author:

aubourg

Message:

ints/long...

File:

• trunk/ArchTOIPipe/Kernel/fitstoirdr.cc (modified) (5 diffs)

trunk/ArchTOIPipe/Kernel/fitstoirdr.cc

@@ -43 +43 @@
     fits_report_error(stderr, fstatus);
     fits_unlock();
-    exit (-1); // $CHECK EA: normallement ca devrait etre un "throw"
+    throw IOExc("fitsio error");
   }
   
@@ -130 +130 @@
        << firstSn << endl;
 
-  double* tabdata = new double[getNOut()]; // $CHECK EA: pas terrible le new never deleted
-  uint_8* tabflag = new uint_8[getNOut()]; // $CHECK EA: pas terrible le new never deleted
-
-  for (int i=0; i<nrows; i++) {  // $CHECK EA: vaut mieux mettre long que int
+  double* tabdata = new double[getNOut()]; 
+  uint_8* tabflag = new uint_8[getNOut()]; 
+
+  for (long i=0; i<nrows; i++) {  
     int anyNul;
     double y;
@@ -139 +139 @@
     fits_read_col_dbl(fptr,1,i+1,1,1,0,&y,&anyNul,&fstatus);
     //fits_unlock();
-    int sn = (int) (y+.1); // $CHECK EA: vaut mieux mettre long que int SURTOUT POUR SNUM
+    long sn = (long) (y+.1); 
     TOIManager* mgr = TOIManager::getManager();
     if (sn > mgr->getRequestedEnd()) {fits_unlock(); break;}
@@ -171 +171 @@
   }
   //fits_unlock();
+  delete[] tabflag;
+  delete[] tabdata;
   cout << "reader done reading... " << pthread_self() << endl;
 }
@@ -214 +216 @@
      if(fstatus!=0) {
        fits_report_error(stderr,fstatus);
-       // $CHECK EA: attention j'ai mis un throw OK avec ca ?
        throw RangeCheckError("FITSTOIReader::run2: Error Reading Fits file\n");
      }