Changeset 23199 for branches/cnb_branches/cnb_branch_20090215/Ohana

Timestamp:

Mar 5, 2009, 11:24:29 AM (17 years ago)

Author:

beaumont

Message:

sync with mainline

Location:

branches/cnb_branches/cnb_branch_20090215

Files:

• . (modified) (1 prop)
• Ohana/Makefile.in (modified) (3 diffs)
• Ohana/src/addstar/include/skycells.h (modified) (3 diffs)
• Ohana/src/addstar/src/args_skycells.c (modified) (2 diffs)
• Ohana/src/addstar/src/sky_tessalation.c (modified) (3 diffs)

branches/cnb_branches/cnb_branch_20090215/Ohana/Makefile.in

@@ -75 +75 @@
         mkdir -p $(DESTLIB)
         mkdir -p $(DESTBIN)
-        for i in $(LIBS); do make $$i.install || exit; done
+        for i in $(LIBS); do make $$i.install || exit 1; done
         chmod +x ohana-config
         cp -f ohana-config $(DESTBIN)/
@@ -83 +83 @@
 
 all:
-        make libs || exit
-        for i in $(PROGRAM); do make $$i || exit; done
+        make libs || exit 1
+        for i in $(PROGRAM); do make $$i || exit 1; done
 
 extras:
-        for i in $(EXTRAS); do make $$i || exit; done
+        for i in $(EXTRAS); do make $$i || exit 1; done
 
 pantasks:
-        make libs || exit
-        cd src/opihi; make pclient.install && exit
-        cd src/opihi; make pcontrol.install && exit
-        cd src/opihi; make pantasks.install && exit
+        make libs || exit 1
+        cd src/opihi; make pclient.install && exit 1
+        cd src/opihi; make pcontrol.install && exit 1
+        cd src/opihi; make pantasks.install && exit 1
 
 mana:
         make libs
         make kapa2.install
-        cd src/opihi; make mana.install && exit
+        cd src/opihi; make mana.install && exit 1
 
 dvoshell:
         make libs
         make kapa2.install
-        cd src/opihi; make dvo.install && exit
+        cd src/opihi; make dvo.install && exit 1
 
 clean:
         @if [ "$(ARCH)" = "" ]; then echo ""; echo " *** please define ARCH ***"; echo; exit 1; fi
-        for i in $(LIBS); do make $$i.clean || exit; done
-        for i in $(PROGRAM); do make $$i.clean || exit; done
-        for i in $(EXTRAS); do make $$i.clean || exit; done
+        for i in $(LIBS); do make $$i.clean || exit 1; done
+        for i in $(PROGRAM); do make $$i.clean || exit 1; done
+        for i in $(EXTRAS); do make $$i.clean || exit 1; done
         @rm -f `find . -name .mana`
         @rm -f `find . -name .dvo`
@@ -116 +116 @@
 dist:
         @if [ "$(ARCH)" = "" ]; then echo ""; echo " *** please define ARCH ***"; echo; exit 1; fi
-        for i in $(LIBS); do make $$i.dist || exit; done
-        for i in $(PROGRAM); do make $$i.dist || exit; done
+        for i in $(LIBS); do make $$i.dist || exit 1; done
+        for i in $(PROGRAM); do make $$i.dist || exit 1; done
         @echo -n -e "\0033]0; *** Ohana: done $@ *** \0007" \
 
 install:
         @if [ "$(ARCH)" = "" ]; then echo ""; echo " *** please define ARCH ***"; echo; exit 1; fi
-        for i in $(LIBS); do make $$i.install || exit; done
-        for i in $(PROGRAM); do make $$i.install || exit; done
+        for i in $(LIBS); do make $$i.install || exit 1; done
+        for i in $(PROGRAM); do make $$i.install || exit 1; done
         @echo -n -e "\0033]0; *** Ohana: done $@ *** \0007" \
 
 install.extras:
-        for i in $(EXTRAS); do make $$i.install || exit; done
+        for i in $(EXTRAS); do make $$i.install || exit 1; done
         @echo -n -e "\0033]0; *** Ohana: done $@ *** \0007" \
 

branches/cnb_branches/cnb_branch_20090215/Ohana/src/addstar/include/skycells.h

@@ -12 +12 @@
 # include <glob.h>
 
-enum {SQUARES, TRIANGLES, LOCAL};
+enum {SQUARES, TRIANGLES, LOCAL, RINGS};
 enum {TETRAHEDRON, CUBE, OCTOHEDRON, DODECAHEDRON, ICOSAHEDRON};
 
@@ -67 +67 @@
 double SCALE;
 double PADDING;
+double CELLSIZE;
 int    LEVEL;
 
@@ -84 +85 @@
 int          sky_tessellation               PROTO((FITS_DB *db, int level, int Nmax, int mode, double scale));
 int          sky_tessellation_init          PROTO((double scale));
+
 int          sky_tessellation_local         PROTO((FITS_DB *db, int level, int Nmax));
 int          sky_tessellation_triangles     PROTO((FITS_DB *db, int level, int Nmax));
 int          sky_tessellation_squares       PROTO((FITS_DB *db, int level, int Nmax));
+int          sky_tessellation_rings         PROTO((FITS_DB *db, int level, int Nmax));
+
 int          sky_triangle_to_image          PROTO((Image *image, SkyTriangle *triangle));
 int          sky_triangle_to_rectangle      PROTO((SkyRectangle *image, SkyTriangle *triangle));
+
 int          sky_rectangle_local            PROTO((SkyRectangle *rectangle));
 int          sky_subdivide_image            PROTO((Image *output, SkyRectangle *input, int Nx, int Ny));
 int          sky_triangle_coords            PROTO((SkyTriangle *triangle));
+
+SkyRectangle *sky_rectangle_ring            PROTO((float dec, float dDEC, int *nring));
+
 SkyTriangle *sky_divide_triangles           PROTO((SkyTriangle *in, int *ntriangles));
 SkyTriangle *sky_base_triangles             PROTO((int *ntriangles));

branches/cnb_branches/cnb_branch_20090215/Ohana/src/addstar/src/args_skycells.c

@@ -35 +35 @@
       MODE = LOCAL;
     }
+    if (!strcasecmp (argv[N], "rings")) {
+      MODE = RINGS;
+    }
     remove_argument (N, &argc, argv);
   }
@@ -140 +143 @@
 
   LEVEL = 8;
-  if ((MODE != LOCAL) && (N = get_argument (argc, argv, "-level"))) {
-    remove_argument (N, &argc, argv);
-    LEVEL = strtol (argv[N], &ptr, 10);
-    remove_argument (N, &argc, argv);
-    if ((*ptr != 0) || (LEVEL < 0)) {
-      fprintf (stderr, "-level requires an integer (>= 0) argument\n");
+  if ((MODE == SQUARES) || (MODE == TRIANGLES)) {
+    if ((N = get_argument (argc, argv, "-level"))) {
+      remove_argument (N, &argc, argv);
+      LEVEL = strtol (argv[N], &ptr, 10);
+      remove_argument (N, &argc, argv);
+      if ((*ptr != 0) || (LEVEL < 0)) {
+        fprintf (stderr, "-level requires an integer (>= 0) argument\n");
+        help ();
+      }  
+    }
+  }
+
+  CELLSIZE = 4.0;
+  if ((MODE == RINGS) && (N = get_argument (argc, argv, "-cellsize"))) {
+    remove_argument (N, &argc, argv);
+    CELLSIZE = strtod (argv[N], &ptr);
+    if ((*ptr != 0) || (CELLSIZE < 0.0)) {
+      fprintf (stderr, "-level requires a floating-point argument\n");
       help ();
     }  
+    remove_argument (N, &argc, argv);
   }
 

branches/cnb_branches/cnb_branch_20090215/Ohana/src/addstar/src/sky_tessalation.c

@@ -11 +11 @@
   sky_tessellation_init (scale);
 
-  if (mode == SQUARES) {
-    sky_tessellation_squares (db, level, Nmax);
-    return TRUE;
-  }
-
-  if (mode == TRIANGLES) {
-    sky_tessellation_triangles (db, level, Nmax);
-    return TRUE;
-  }
-
-  if (mode == LOCAL) {
-    sky_tessellation_local (db, level, Nmax);
-    return TRUE;
+  switch (mode) {
+    case SQUARES:
+      sky_tessellation_squares (db, level, Nmax);
+      return TRUE;
+    case TRIANGLES:
+      sky_tessellation_triangles (db, level, Nmax);
+      return TRUE;
+    case LOCAL:
+      sky_tessellation_local (db, level, Nmax);
+      return TRUE;
+    case RINGS:
+      sky_tessellation_rings (db, level, Nmax);
+      return TRUE;
+    default:
+      break;
   }
 
@@ -222 +224 @@
 
   free (image);
+  return (TRUE);
+}
+
+// the RINGS tessellation uses the declination zones proposed by Tamas Budavari
+// we generate projects on uniform rings of constant dec height
+int sky_tessellation_rings (FITS_DB *db, int level, int Nmax) {
+
+  int j, nDEC, Nimage, Nring;
+  float dec, dDEC;
+  SkyRectangle *ring;
+  Image *image;
+
+  // The tessellation has one input parameter: the approximate cell size.  Starting with
+  // the cell size, determine the optimal projection cell height (dDEC) that results in an
+  // integer number of dec zones between -90 and +90
+
+  nDEC = 180.0 / CELLSIZE;
+  dDEC = 180.0 / nDEC;
+
+  // generate the a collection of rectangles for each ring
+  for (dec = -90.0 + 0.5*dDEC; dec < +90.0; dec += dDEC) {
+
+    ring = sky_rectangle_ring (dec, dDEC, &Nring);
+
+    // subdivide each image (Nx x Ny subcells)
+    Nimage = NX_SUB*NY_SUB*Nring;
+    ALLOCATE (image, Image, Nimage);
+    for (j = 0; j < Nring; j++) {
+      // convert the SkyRectangles to Images for output
+      sky_subdivide_image (&image[j*NX_SUB*NY_SUB], &ring[j], NX_SUB, NY_SUB);
+    }
+
+    /* add the new images and save */
+    dvo_image_addrows (db, image, Nimage);
+    SetProtect (TRUE);
+    dvo_image_update (db, VERBOSE);
+    SetProtect (FALSE);
+    dvo_image_clear_vtable (db);
+    
+    free (ring);
+    free (image);
+  }    
   return (TRUE);
 }
@@ -480 +524 @@
 
   return (TRUE);
+}
+
+// define the parameters of a single sky projection center
+SkyRectangle *sky_rectangle_ring (float dec, float dDEC, int *nring) {
+
+  int i, nRA, NX, NY;
+  float dRA, decLower;
+  SkyRectangle *ring;
+
+  // 'dec' is a guess at the center of the cell; in fact, we need to choose decLower and
+  // decUpper to ensure complete overlap of the cells
+
+  // we can determine the 'lower' bound (bound closest to the equator):
+  decLower = (dec > 0.0) ? dec - 0.5*dDEC : dec + 0.5*dDEC;
+
+  // Subdivide the 'lower' bound into an integer number of segments:
+  nRA = cos(dec*RAD_DEG) * 360.0 / CELLSIZE; // CELLSIZE is a projection size
+  dRA = 360.0 / nRA;                         // dRA is a size in RA degrees
+
+  // I think we need to return the value of dec for the next ring, but I am not sure...
+
+  ALLOCATE (ring, SkyRectangle, nRA);
+
+  for (i = 0; i < nRA; i++) {
+    memset (&ring[i], 0, sizeof(SkyRectangle));
+    memset (&ring[i].coords, 0, sizeof(Coords));
+    ring[i].coords.crval1 = i*dRA;
+    ring[i].coords.crval2 = dec;
+
+    ring[i].coords.pc1_1 = +1.0;
+    ring[i].coords.pc1_2 = +0.0;
+    ring[i].coords.pc2_1 = -0.0;
+    ring[i].coords.pc2_2 = +1.0;
+  
+    // range values are in projected degrees
+    NX = cos(dec*RAD_DEG) * dRA  * 3600.0 / SCALE;
+    NY =                    dDEC * 3600.0 / SCALE;
+
+    // crpix1,crpix2 is the projection center
+    ring[i].coords.crpix1 = 0.5*NX;
+    ring[i].coords.crpix2 = 0.5*NY;
+
+    ring[i].coords.cdelt1 = SCALE / 3600.0;
+    ring[i].coords.cdelt2 = SCALE / 3600.0;
+
+    strcpy (ring[i].coords.ctype, "DEC--TAN");
+
+    ring[i].NX = NX;
+    ring[i].NY = NY;
+    ring[i].photcode = 1; // this needs to be set more sensibly
+
+
+    fprintf (stderr, "%f %f  : %f %f\n", 
+             ring[i].coords.crval1, ring[i].coords.crval2, 
+             ring[i].coords.crpix1, ring[i].coords.crpix2);
+  }
+
+  *nring = nRA;
+  return (ring);
 }