Changeset 2382 in Sophya for trunk/ArchTOIPipe

Timestamp:

May 16, 2003, 3:40:09 PM (22 years ago)

Author:

aubourg

Message:

avec flags

Location:

trunk/ArchTOIPipe/Kernel

Files:

• Makefile.in (modified) (1 diff)
• piotoirdr.cc (modified) (4 diffs)

trunk/ArchTOIPipe/Kernel/Makefile.in

@@ -65 +65 @@
            fitstoirdr.cc fitstoiwtr.cc asciitoiwtr.cc \
            toisegment.cc toiseqbuff.cc cgt.cc \
+           ring.cc \
            fitsringwtr.cc fitsringrdr.cc $(PIOFILES)
 

trunk/ArchTOIPipe/Kernel/piotoirdr.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: piotoirdr.cc,v 1.4 2003-04-24 13:22:26 aubourg Exp $
+// $Id: piotoirdr.cc,v 1.5 2003-05-16 13:40:09 aubourg Exp $
 
 #include "piotoirdr.h"
@@ -92 +92 @@
     double* data;
     uint_8*   flags = NULL;
+    PIOBYTE**  pioflags = NULL;
     fits_lock();
     PIOLONG n = PIOReadTOI((void**) &data,
@@ -99 +100 @@
                            pioGroup);
     if (flagdef != "") {
-      PIOLONG nf = PIOReadFLG((PIOLONG**)&flags,   // dangereux ?
-                              const_cast<char*>(flagdef.c_str()),
-                              command,
-                              pioGroup);
+      PIOLONG nf = PIOReadFLGObjectMask(pioflags,
+                                       const_cast<char*>(flagdef.c_str()),
+                                       command,
+                                       pioGroup);
       if (nf != n) {
-        cerr << "*** PIO Error, inconsistent read, data " << n << " flags " << nf << endl;
+        cerr << "*** PIO Error, inconsistent read, data " << n << " flags " 
+             << nf << endl;
         abort();
       }
+      flags = new uint_8[nf];
+      for (int i=0; i<nf; i++) flags[i] = pioflags[i];
+      PIODeleteFLG(pioflags, pioGroup);
     }
     fits_unlock();
@@ -120 +125 @@
     PIODeleteTOI(data, pioGroup);
     //    if (flags != NULL) PIODeleteFLG(flags, pioGroup); // PB !
+    if (flags != NULL) delete[] flags;
     fits_unlock();
   }