Changeset 1836 in Sophya for trunk/ArchTOIPipe/Kernel/fitstoirdr.cc

Timestamp:

Dec 21, 2001, 6:00:40 PM (24 years ago)

Author:

aubourg

Message:

bug quand non implicit

File:

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

trunk/ArchTOIPipe/Kernel/fitstoirdr.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: fitstoirdr.cc,v 1.25 2001-12-17 23:11:28 aubourg Exp $
+// $Id: fitstoirdr.cc,v 1.26 2001-12-21 17:00:40 aubourg Exp $
 
 #include "fitstoirdr.h"
@@ -227 +227 @@
  //////// Read data and put into pipe
  long ideb=-1,ifin=-1;
- for(long i=0; i<nrows; i++) {
+ for(long i=0; i<nrows; i+=Buff_Sz) {
 
    // faut-il lire dans le fichier fits ?
-   if(i<ideb || i>ifin) {
+   if(i<ideb || i>ifin) { // Toujours vrai avec le += Buff_Sz
      ideb = i;
      ifin = ideb+Buff_Sz-1;
@@ -248 +248 @@
        fits_lock();
        fits_read_col_dbl(fptr,1,ideb+1,1,n,0,samplenum,&anyNul,&fstatus);
-       if (ideb+implicitSNStart > mgr->getRequestedEnd() 
-           || (forcedMaxIn > 0 && ideb+implicitSNStart > forcedMaxIn)) {
+       if (samplenum[0] > mgr->getRequestedEnd() 
+           || (forcedMaxIn > 0 && samplenum[0] > forcedMaxIn)) {
          fits_unlock();
          break;
        }
-       if (ifin+implicitSNStart < mgr->getRequestedBegin()
-           || (forcedMinIn > 0 && ifin+implicitSNStart < forcedMinIn)) {
+       if (samplenum[n-1] < mgr->getRequestedBegin()
+           || (forcedMinIn > 0 && samplenum[n-1] < forcedMinIn)) {
          fits_unlock();
          continue;