Changeset 1819 in Sophya

Timestamp:

Dec 18, 2001, 12:12:08 AM (24 years ago)

Author:

aubourg

Message:

nouveau xastro

File:

• trunk/ArchTOIPipe/TestPipes/quickmap.cc (modified) (6 diffs)

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.2 2001-11-30 21:08:36 aubourg Exp $
+// $Id: quickmap.cc,v 1.3 2001-12-17 23:12:08 aubourg Exp $
 
 #include <stdlib.h>
@@ -75 +75 @@
     cout << "  | | typcoord    " 
          <<  ((input.pointing.typcoord & TypCoordGal) ? "G" : "E") 
-         <<  ((input.pointing.typcoord & TypCoordHD) ? "H" : 
-              (input.pointing.typcoord & TypCoordDD) ? "D" : "R") << "\n";
+         <<  ((input.pointing.typcoord & TypCoord1H) ? "H" : 
+              (input.pointing.typcoord & TypCoord1D) ? "D" : "R") 
+         <<  ((input.pointing.typcoord & TypCoord1C) ? "C" : "L")
+         <<  ((input.pointing.typcoord & TypCoord2H) ? "H" : 
+              (input.pointing.typcoord & TypCoord2D) ? "D" : "R") 
+         <<  ((input.pointing.typcoord & TypCoord2C) ? "C" : "L")
+         << "\n";
     cout << "  | signal\n";
     cout << "  | | fname       " << input.signal.fname << "\n";
@@ -85 +90 @@
     cout << "  | typcoord      " 
          <<  ((output.typcoord & TypCoordGal) ? "G" : "E") 
-         <<  ((output.typcoord & TypCoordHD) ? "H" : 
-              (input.pointing.typcoord & TypCoordDD) ? "D" : "R")  << "\n";
+         <<  "\n";
     cout << "  | typmap        " << output.typmap << "\n";
     if (output.typmap == "healpix") {
@@ -186 +190 @@
   bool indd  = DOMHasOption(doc, "/input/pointing/degdeg");
   bool inrr  = DOMHasOption(doc, "/input/pointing/radian");
+  bool iscolat = DOMHasOption(doc, "/input/pointing/colat");
   if (inhd) {
-    prefs.input.pointing.typcoord |= TypCoordHD;
+    prefs.input.pointing.typcoord |= TypCoord1H|TypCoord2D;
   } else if (indd) {
-    prefs.input.pointing.typcoord |= TypCoordDD;
+    prefs.input.pointing.typcoord |= TypCoord1D|TypCoord2D;
   } else if (inrr) {
-    prefs.input.pointing.typcoord |= TypCoordRR;
+    prefs.input.pointing.typcoord |= TypCoord1R|TypCoord2R;
   } else if (prefs.input.pointing.typcoord & TypCoordEq) {
-    prefs.input.pointing.typcoord |= TypCoordHD;
+    prefs.input.pointing.typcoord = TypCoordEqStd;
   } else {
-    prefs.input.pointing.typcoord |= TypCoordDD;
+    prefs.input.pointing.typcoord = TypCoordGalStd;
+  }
+  if (iscolat) {
+    prefs.input.pointing.typcoord |= TypCoord2C;
   }
 
@@ -210 +218 @@
   bool outrr  = DOMHasOption(doc, "/output/radian");
   if (outhd) {
-    prefs.output.typcoord |= TypCoordHD;
+    prefs.output.typcoord |= TypCoord1H | TypCoord2D;
   } else if (outdd) {
-    prefs.output.typcoord |= TypCoordDD;
+    prefs.output.typcoord |= TypCoord1D | TypCoord2D;
   } else if (outrr) {
-    prefs.output.typcoord |= TypCoordRR;
+    prefs.output.typcoord |= TypCoord1R | TypCoord2R;
   } else if (prefs.output.typcoord & TypCoordEq) {
-    prefs.output.typcoord |= TypCoordHD;
+    prefs.output.typcoord = TypCoordEqStd;
   } else {
-    prefs.output.typcoord |= TypCoordDD;
+    prefs.output.typcoord |= TypCoordGalStd;
   } 
 
@@ -283 +291 @@
   }
   
-  TOI2GMap toi2m(map,wmap); toi2m.SetIsColat();
+  TOI2Map toi2m(map,wmap);
 
   toi2m.SetEquinox(2000.);
   toi2m.SetCoorIn((TypAstroCoord) prefs.input.pointing.typcoord);
-  toi2m.SetCoorOut((TypAstroCoord) prefs.output.typcoord);
+  toi2m.SetCoorMap((TypAstroCoord) prefs.output.typcoord);
 
   TOISegmented * toicoord1in = new TOISegmented(prefs.input.pointing.coord1);