Changeset 1712 in Sophya for trunk/ArchTOIPipe/Kernel

Timestamp:

Oct 19, 2001, 4:43:25 PM (24 years ago)

Author:

aubourg

Message:

pb flags uint_8/long

Location:

trunk/ArchTOIPipe/Kernel

Files:

• fitstoirdr.cc (modified) (2 diffs)
• fitstoiwtr.cc (modified) (1 diff)

trunk/ArchTOIPipe/Kernel/fitstoirdr.cc

@@ -128 +128 @@
        << firstSn << endl;
 
+  double* tabdata = new double[getNOut()];
+  uint_8* tabflag = new uint_8[getNOut()]; 
+
   for (int i=0; i<nrows; i++) {
     int anyNul;
@@ -133 +136 @@
     fits_lock();
     fits_read_col_dbl(fptr,1,i+1,1,1,0,&y,&anyNul,&fstatus);
-    fits_unlock();
+    //fits_unlock();
     int sn = (int) (y+.1);
     TOIManager* mgr = TOIManager::getManager();
-    if (sn > mgr->getRequestedEnd()) break;
-    if (sn < mgr->getRequestedBegin()) continue;
+    if (sn > mgr->getRequestedEnd()) {fits_unlock(); break;}
+    if (sn < mgr->getRequestedBegin()) {fits_unlock(); continue;}
     // if (sn < mgr->getRequestedBegin()+10) cout << "rdr out " << sn << endl;
     for (int k=0; k<getNOut(); k++) {
       int j = colsinput[k].first;
       if ( !checkOutputTOIIndex(k) )  continue;  // Reza - Si TOI non connecte
-      fits_lock();
+      //fits_lock();
       fits_read_col_dbl(fptr,j+1,i+1,1,1,0,&y,&anyNul,&fstatus);
+      tabdata[k] = y;
       long flg = 0;
       if (colsinput[k].second) {
         fits_read_col_lng(fptr,j+2,i+1,1,1,0,&flg,&anyNul,&fstatus);
       }
-      fits_unlock();
-      putData(k, sn, y, flg);
+      tabflag[k] = flg;
+      //      fits_unlock();
+      //putData(k, sn, y, flg);
     }
-/*    if (i%50==0)  {
-      fits_unlock();
+    fits_unlock();
+    for (int k=0; k<getNOut(); k++) {
+      putData(k, sn, tabdata[k], tabflag[k]);
+    }
+    /*     if (i%50==0)  {
+      // fits_unlock();
       sched_yield();
-      fits_lock();
-    }*/
+      //fits_lock();
+      }*/
     totnscount++;
   }

trunk/ArchTOIPipe/Kernel/fitstoiwtr.cc

@@ -141 +141 @@
         fits_write_col_dbl(fptr, p.first+1, fitsLine, 1, 1, tabdata+i, &fstatus);
         if (p.second) {
-          fits_write_col_lng(fptr, p.first+2, fitsLine, 1, 1, tabflagl+i, &fstatus);
+          long f = tabflag[i];
+          fits_write_col_lng(fptr, p.first+2, fitsLine, 1, 1, &f, &fstatus);
+          //      fits_write_col_lng(fptr, p.first+2, fitsLine, 1, 1, tabflagl+i, &fstatus);
         } 
         if (fstatus != 0) {