Changeset 2328 in Sophya for trunk/ArchTOIPipe/TestPipes

Timestamp:

Feb 24, 2003, 10:18:01 AM (23 years ago)

Author:

aubourg

Message:

pour piolib

Location:

trunk/ArchTOIPipe/TestPipes

Files:

• Makefile.in (modified) (3 diffs)
• quickmap.cc (modified) (13 diffs)
• quickmap_fio.cc (added)
• quickmap_p.cc (modified) (10 diffs)

trunk/ArchTOIPipe/TestPipes/Makefile.in

@@ -14 +14 @@
 
 USE_SOPHYA=@use_sophya@
+USE_PIOLIB=@use_piolib@
+
 
 MACHEROS := $(shell echo `uname`)
@@ -49 +51 @@
 
 
-CPPFLAGS    :=  $(CPPFLAGS) @cfitsincdir@ -I. -I.. -DANSI -I$(srcdir)/../Kernel -I$(srcdir)/../Processors -I$(srcdir)/../ProcWSophya -I$(srcdir)/..
+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
+else
+  PIOLIBS :=
+endif
+
 
 ifeq ($(USE_SOPHYA),1)
-#  LDLIBS=-L.. -latsop -latkern -latproc @cfitslibdir@ -lcfitsio $(LIBS) 
+#  LDLIBS=-L.. -latsop -latkern -latproc @cfitslibdir@ -lcfitsio $(PIOLIBS) $(LIBS) 
   LDLIBS=-L.. -latsop -latkern -latproc $(LIBS)
   LIBDEPS=../libatsop.a ../libatkern.a ../libatproc.a
 else
-  LDLIBS=-L.. -latkern -latproc @cfitslibdir@ -lcfitsio $(LIBS) 
+  LDLIBS=-L.. -latkern -latproc @cfitslibdir@ -lcfitsio $(PIOLIBS) $(LIBS) 
   LIBDEPS=../libatkern.a ../libatproc.a
 endif
@@ -62 +71 @@
 ifeq ($(MACHEROS),IRIX64)
  ifeq ($(CXX), g++)
-   LDLIBS=@cfitslibdir@ -lcfitsio -L /usr/lib32/
+   LDLIBS=@cfitslibdir@  -lcfitsio $(PIOLIBS) -L /usr/lib32/
  endif
  ifeq ($(CXX), CC)

trunk/ArchTOIPipe/TestPipes/quickmap.cc

@@ -1 +1 @@
 // GPH 424.1   Planck HFI-L2 Simple Map Making
 // Eric Aubourg     CEA/DAPNIA/SPP
-// $Id: quickmap.cc,v 1.3 2001-12-17 23:12:08 aubourg Exp $
+// This version is able to produce local maps as well
+// $Id: quickmap.cc,v 1.4 2003-02-24 09:18:01 aubourg Exp $
 
 #include <stdlib.h>
@@ -7 +8 @@
 #include "toi.h"
 #include "toiprocessor.h"
-#include "fitstoirdr.h"
-#include "fitstoiwtr.h"
+#include "piotoirdr.h"
 #include "toimanager.h"
 #include "toisegment.h"
@@ -38 +38 @@
     struct {
       string fname;
+      string flags;
       string coord1;  // TOI name
       string coord2;  // TOI name
@@ -44 +45 @@
     struct {
       string fname;
+      string flags;
       string toiname;
     } signal;
@@ -71 +73 @@
     cout << "  | pointing\n";
     cout << "  | | fname       " << input.pointing.fname << "\n";
+    cout << "  | | flags       " << input.pointing.flagfs << "\n";
     cout << "  | | coord1      " << input.pointing.coord1 << "\n";
     cout << "  | | coord2      " << input.pointing.coord2 << "\n";
@@ -84 +87 @@
     cout << "  | signal\n";
     cout << "  | | fname       " << input.signal.fname << "\n";
+    cout << "  | | flags       " << input.signal.flags << "\n";
     cout << "  | | toiname     " << input.signal.toiname << "\n";
     cout << "  output\n";
@@ -150 +154 @@
   return n != 0;
 }
+
 
 void parsePrefs(string prefFile, Gph424_1_Prefs& prefs) {
@@ -182 +187 @@
   
   prefs.input.pointing.fname  = DOMGetString(doc, "/input/pointing/fname");
+  if (DOMHasOption(doc, "/input/pointing/flags")) {
+    prefs.input.pointing.flags=
+      DOMGetString(doc, "/input/pointing/flags");
+  }
   prefs.input.pointing.coord1 = DOMGetString(doc, "/input/pointing/coord1","phi");
   prefs.input.pointing.coord2 = DOMGetString(doc, "/input/pointing/coord2","theta");
@@ -208 +217 @@
   prefs.input.signal.fname    = DOMGetString(doc, "/input/signal/fname");
   prefs.input.signal.toiname  = DOMGetString(doc, "/input/signal/toiname");
-
+  if (DOMHasOption(doc, "/input/signal/flags")) {
+    prefs.input.signal.flags =
+      DOMGetString(doc, "/input/signal/flags");
+  }
   prefs.output.fname          = DOMGetString(doc, "/output/fname");
   prefs.output.wfname         = DOMGetString(doc, "/output/wfname");
@@ -264 +276 @@
   TOIManager* mgr = TOIManager::getManager();
 
-  // Two input files
-
-  FITSTOIReader inPoint(prefs.input.pointing.fname);
-  FITSTOIReader inSig  (prefs.input.signal.fname);
-
-  inPoint.setImplicitSN();
-  inSig.setImplicitSN();
+  // INPUT TOIs
+
+  PIOTOIReader inPoint1(prefs.input.pointing.fname, prefs.input.pointing.coord1,
+                        prefs.input.pointing.flags);
+  PIOTOIReader inPoint2(prefs.input.pointing.fname, prefs.input.pointing.coord2,
+                        prefs.input.pointing.flags);
+  PIOTOIReader inSig   (prefs.input.signal.fname, prefs.input.signal.toiname,
+                        prefs.input.signal.flags);
+
 
   // Prepare maps for output
@@ -298 +312 @@
 
   TOISegmented * toicoord1in = new TOISegmented(prefs.input.pointing.coord1);
-  inPoint.addOutput(prefs.input.pointing.coord1,toicoord1in);
+  inPoint1.addOutput(prefs.input.pointing.coord1,toicoord1in);
   toi2m.addInput("Coord1In",toicoord1in);
 
   TOISegmented * toicoord2in = new TOISegmented(prefs.input.pointing.coord2);
-  inPoint.addOutput(prefs.input.pointing.coord2,toicoord2in);
+  inPoint2.addOutput(prefs.input.pointing.coord2,toicoord2in);
   toi2m.addInput("Coord2In",toicoord2in);
 
@@ -312 +326 @@
 
   if (prefs.snb >= 0 && prefs.sne >= 0) {
-    mgr->setRequestedSample(prefs.snb, prefs.sne);
-  }
-
-  inPoint.start();
-  inSig.start();
-  toi2m.start();
-  mgr->joinAll();
+    toi2m.setRequestedSample(prefs.snb, prefs.sne);
+  }
+
+  mgr->startAll();
+  mgr->waitForAll();
 
   // Save maps
+
+  // Huh ? Should we create a Map(group) ? Should we create a MapObject ?
+  // Should we open ? Where do we define the size ? How does this work ??
+
+  PIOCreateMAP(prefs.output.fname, 
+               prefs.output.typcoord == TypCoordGal ? "GALACTIC" : "ECLIPTIC", 
+               "RING", 
+               prefs.output.healpix_opt.nlat);
+
+  PIOGroup* mapGroup = PIOOpenMAP(prefs.output.fname,
+                                  "w");
+
+  PIOCreateMAPObject("MAP", "PIODOUBLE", mapGroup);
+
+  PIOWriteMAP(map->GetData(),
+              "MAP",
+              "PIODOUBLE",
+              "",
+              mapGroup);
+
+  PIOCreateMAPObject("WMAP", "PIODOUBLE", mapGroup);
+
+  PIOWriteMAP(wmap->GetData(),
+              "WMAP",
+              "PIODOUBLE",
+              "",
+              mapGroup);
+
+  PIOCloseMAP(mapGroup);
 
   {
@@ -329 +370 @@
       sfits << * (SphereHEALPix<r_8>*)map;
     } else if (map->TypeOfMap() == "LOCAL") {
-      sfits << * (LocalMap<r_8>*)map;
+      cout << "error, local maps not yet in PIOLib" << endl;
     } else {
       cout << "error, unknown type " << map->TypeOfMap() << endl;

trunk/ArchTOIPipe/TestPipes/quickmap_p.cc

@@ -2 +2 @@
 // Parallel version
 // Eric Aubourg     CEA/DAPNIA/SPP
-// $Id: quickmap_p.cc,v 1.4 2001-12-17 23:33:46 aubourg Exp $
+// $Id: quickmap_p.cc,v 1.5 2003-02-24 09:18:01 aubourg Exp $
 
 #include <stdlib.h>
@@ -13 +13 @@
 #include "toisegment.h"
 
+
 #include "sambainit.h"
 #include "toi2map.h"
@@ -39 +40 @@
     struct {
       string fname;
+      string flagfname;
+      vector<FlagToiDef> flags;
       string coord1;  // TOI name
       string coord2;  // TOI name
@@ -45 +48 @@
     struct {
       string fname;
+      string flagfname;
+      vector<FlagToiDef> flags;
       string toiname;
     } signal;
@@ -72 +77 @@
     cout << "  | pointing\n";
     cout << "  | | fname       " << input.pointing.fname << "\n";
+    cout << "  | | flagfname   " << input.pointing.flagfname << "\n";
+    for (int i=0; i<input.pointing.flags.size(); i++) {
+      cout << "  | | | flag      " << i << " : " << input.pointing.flags[i] << "\n";
+    }
     cout << "  | | coord1      " << input.pointing.coord1 << "\n";
     cout << "  | | coord2      " << input.pointing.coord2 << "\n";
@@ -85 +94 @@
     cout << "  | signal\n";
     cout << "  | | fname       " << input.signal.fname << "\n";
+    cout << "  | | flagfname   " << input.signal.flagfname << "\n";
+    {for (int i=0; i<input.signal.flags.size(); i++) {
+      cout << "  | | | flag      " << i << " : " << input.signal.flags[i] << "\n";
+    }}
     cout << "  | | toiname     " << input.signal.toiname << "\n";
     cout << "  output\n";
@@ -150 +163 @@
   DOM_Node n = DOMGetNode(doc, path);
   return n != 0;
+}
+
+void parseFlags(DOM_Node flagnode, vector<FlagToiDef>& flgs) {
+  DOM_Element elt = (DOM_Element&) flagnode;
+  DOM_NodeList l = elt.getElementsByTagName("flag");
+  // prepare array
+  flgs.clear();
+  flgs.insert(flgs.begin(), l.getLength(), (FlagToiDef)0);
+  for (int i = 0; i<l.getLength(); i++) {
+    DOM_Node node = l.item(i);
+    DOM_Element elt = (DOM_Element&) node;
+    DOMString scol = elt.getAttribute("column");
+    DOMString sval = elt.getAttribute("kind");
+    int col = atoi(scol.transcode());
+    int value = atoi(sval.transcode());
+    flgs[col-1] = (FlagToiDef) value;
+  }   
 }
 
@@ -183 +213 @@
   
   prefs.input.pointing.fname  = DOMGetString(doc, "/input/pointing/fname");
+  if (DOMHasOption(doc, "/input/pointing/flags")) {
+    prefs.input.pointing.flagfname =
+      DOMGetString(doc, "/input/pointing/flags/fname");
+    DOM_Node flagnode = DOMGetNode(doc, "/input/pointing/flags");
+    parseFlags(flagnode, prefs.input.pointing.flags);
+  }
   prefs.input.pointing.coord1 = DOMGetString(doc, "/input/pointing/coord1","phi");
   prefs.input.pointing.coord2 = DOMGetString(doc, "/input/pointing/coord2","theta");
@@ -209 +245 @@
   prefs.input.signal.fname    = DOMGetString(doc, "/input/signal/fname");
   prefs.input.signal.toiname  = DOMGetString(doc, "/input/signal/toiname");
-
+  if (DOMHasOption(doc, "/input/signal/flags")) {
+    prefs.input.signal.flagfname =
+      DOMGetString(doc, "/input/signal/flags/fname");
+    DOM_Node flagnode = DOMGetNode(doc, "/input/signal/flags");
+    parseFlags(flagnode, prefs.input.signal.flags);
+  }
   prefs.output.fname          = DOMGetString(doc, "/output/fname");
   prefs.output.wfname         = DOMGetString(doc, "/output/wfname");
@@ -276 +317 @@
     inPoint[i]->setImplicitSN();
     inSig[i]->setImplicitSN();
+    if (prefs.input.pointing.flagfname != "") {
+      inPoint[i]->setFlagFile(prefs.input.pointing.flagfname, prefs.input.pointing.flags);
+    }
+    if (prefs.input.signal.flagfname != "") {
+      inSig[i]->setFlagFile(prefs.input.signal.flagfname, prefs.input.signal.flags);
+    }
   }