Changeset 2369 in Sophya

Timestamp:

Apr 24, 2003, 3:22:26 PM (22 years ago)

Author:

aubourg

Message:

PIOlib I/O

Location:

trunk/ArchTOIPipe

Files:

• Kernel/Makefile.in (modified) (1 diff)
• Kernel/piotoirdr.cc (modified) (3 diffs)
• Kernel/piotoirdr.h (modified) (3 diffs)
• Kernel/piotoiwtr.cc (added)
• Kernel/piotoiwtr.h (added)
• TestPipes/Makefile.in (modified) (2 diffs)
• TestPipes/fits2piotoi.cc (added)
• TestPipes/piotoi2fits.cc (added)

trunk/ArchTOIPipe/Kernel/Makefile.in

@@ -57 +57 @@
 
 ifeq ($(USE_PIOLIB),1)
-  PIOFILES := piotoirdr.cc
+  PIOFILES := piotoirdr.cc piotoiwtr.cc
 else
   PIOFILES :=

trunk/ArchTOIPipe/Kernel/piotoirdr.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: piotoirdr.cc,v 1.3 2003-04-01 13:27:48 aubourg Exp $
+// $Id: piotoirdr.cc,v 1.4 2003-04-24 13:22:26 aubourg Exp $
 
 #include "piotoirdr.h"
@@ -61 +61 @@
              pioGroup);
 
-  // On recupere un tableau de beginIndex, mais si on en croit
-  // la doc, dans un groupe, tout le monde a les memes bornes, donc
-  // on peut lire le premier ?
-
-  snBegin = beginIndex[0];
-  snEnd   = endIndex[0];
+  // On recupere un tableau de beginIndex, il faut retrouver celui qui nous concerne
+  for (int i=0; i<nbTOI; i++) {
+    cout << toiName[i] << endl;
+    if (object == toiName[i]) {
+      snBegin = beginIndex[i];
+      snEnd   = endIndex[i];
+      cout << snBegin << " " << snEnd << endl;
+      break;
+    }
+  }
 
   PIOFreeInfoTOI(flgName,
@@ -115 +119 @@
     fits_lock();
     PIODeleteTOI(data, pioGroup);
-    if (flags != NULL) PIODeleteFLG(flags, pioGroup);
+    //    if (flags != NULL) PIODeleteFLG(flags, pioGroup); // PB !
     fits_unlock();
   }

trunk/ArchTOIPipe/Kernel/piotoirdr.h

@@ -5 +5 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: piotoirdr.h,v 1.1 2003-02-24 09:18:01 aubourg Exp $
+// $Id: piotoirdr.h,v 1.2 2003-04-24 13:22:26 aubourg Exp $
 
 #ifndef PIOTOIRDR_H
@@ -15 +15 @@
 
 #include "HL2_PIOLIB/PIOLib.h"
-//  #include "HL2_PIOLIB/PIOCpp.h"  // BUGGY !! Ne marche pas !!!
 
 /* Missing from PIO headers... */
+extern "C" {
 PIOErr PIOFreeInfoTOI(
                       PIOSTRING       *FLGname,
@@ -37 +37 @@
                     PIOGroup *MyGroup /* Input : opened group reference */
                     );
-
+}
 /* End missing */
 

trunk/ArchTOIPipe/TestPipes/Makefile.in

@@ -53 +53 @@
 CPPFLAGS    :=  $(CPPFLAGS) @cfitsincdir@ @pioincdir@ -I. -I.. -DANSI -I$(srcdir)/../Kernel -I$(srcdir)/../Processors -I$(srcdir)/../ProcWSophya -I$(srcdir)/..
 
-ifeq ($USE_PIOLIB,1)
-  PIOLIBS := @piolibdir@ -lpiolib
+ifeq ($(USE_PIOLIB),1)
+  PIOLIBS := -L@piolibdir@ -lpiolib
 else
   PIOLIBS :=
@@ -62 +62 @@
 ifeq ($(USE_SOPHYA),1)
 #  LDLIBS=-L.. -latsop -latkern -latproc @cfitslibdir@ -lcfitsio $(PIOLIBS) $(LIBS) 
-  LDLIBS=-L.. -latsop -latkern -latproc $(LIBS)
+  LDLIBS=-L.. -latsop -latkern -latproc $(PIOLIBS) $(LIBS)
   LIBDEPS=../libatsop.a ../libatkern.a ../libatproc.a
 else