Changeset 23352 for branches/cnb_branches/cnb_branch_20090301/Ohana

Timestamp:

Mar 17, 2009, 12:08:50 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/Makefile.in (modified) (3 diffs)
• Ohana/src/addrefs (deleted)
• Ohana/src/addspphot (deleted)
• Ohana/src/addstar/doc/ps1.tessellation.tamas.pdf (copied) (copied from trunk/Ohana/src/addstar/doc/ps1.tessellation.tamas.pdf )
• Ohana/src/addstar/include/skycells.h (modified) (3 diffs)
• Ohana/src/addstar/src/args_skycells.c (modified) (2 diffs)
• Ohana/src/addstar/src/get2mass_full.c (modified) (10 diffs)
• Ohana/src/addstar/src/sky_tessalation.c (modified) (3 diffs)
• Ohana/src/libdummy (deleted)
• Ohana/src/libdvo (modified) (1 prop)
• Ohana/src/libdvo/lib (modified) (1 prop)
• Ohana/src/libfits/lib (modified) (1 prop)
• Ohana/src/libkapa/lib (modified) (1 prop)
• Ohana/src/libohana/lib (modified) (1 prop)
• Ohana/src/libohana/src/CommOps.c (modified) (1 diff)
• Ohana/src/libtap/lib (modified) (1 prop)
• Ohana/src/opihi/dimm/Analysis.c (modified) (1 diff)
• Ohana/src/opihi/dimm/Makefile (modified) (2 diffs)
• Ohana/src/opihi/dimm/analysis.c (deleted)
• Ohana/src/opihi/dimm/camera.c (deleted)
• Ohana/src/opihi/dimm/camera_cmds.c (copied) (copied from trunk/Ohana/src/opihi/dimm/camera_cmds.c ) (1 prop)
• Ohana/src/opihi/dimm/telescope.c (deleted)
• Ohana/src/opihi/dimm/telescope_cmds.c (copied) (copied from trunk/Ohana/src/opihi/dimm/telescope_cmds.c ) (1 prop)
• Ohana/src/opihi/lib (modified) (1 prop)
• Ohana/src/opihi/pantasks/CheckTasks.c (modified) (1 diff)
• Ohana/src/opihi/pantasks/task_threads.c (modified) (2 diffs)
• Ohana/src/opihi/pcontrol/CheckIdleHost.c (modified) (3 diffs)

branches/cnb_branches/cnb_branch_20090301/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_20090301/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_20090301/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_20090301/Ohana/src/addstar/src/get2mass_full.c

@@ -1 +1 @@
 # include "addstar.h"
 # include "2mass.h"
+
+// XXX check to see if desired output format is PS1_V1 or later?  (use 16bit version if not?)
 
 // fill in the data for a JHK triplet star.  takes a pointer to the start of the line the
@@ -171 +173 @@
 
   switch (qual) {
-    case 'X': star[0].measure.photFlags |= 0x0000; break;
-    case 'U': star[0].measure.photFlags |= 0x0001; break;
-    case 'F': star[0].measure.photFlags |= 0x0002; break;
-    case 'E': star[0].measure.photFlags |= 0x0003; break;
-    case 'A': star[0].measure.photFlags |= 0x0004; break;
-    case 'B': star[0].measure.photFlags |= 0x0005; break;
-    case 'C': star[0].measure.photFlags |= 0x0006; break;
-    case 'D': star[0].measure.photFlags |= 0x0007; break;
+    case 'A': star[0].measure.photFlags |= 0x00000001; break; // was: 0x0004
+    case 'B': star[0].measure.photFlags |= 0x00000002; break; // was: 0x0005
+    case 'C': star[0].measure.photFlags |= 0x00000004; break; // was: 0x0006
+    case 'D': star[0].measure.photFlags |= 0x00000008; break; // was: 0x0007
+    case 'E': star[0].measure.photFlags |= 0x00000010; break; // was: 0x0003
+    case 'F': star[0].measure.photFlags |= 0x00000020; break; // was: 0x0002
+    case 'U': star[0].measure.photFlags |= 0x00000040; break; // was: 0x0001
+    case 'X': star[0].measure.photFlags |= 0x00000080; break; // was: 0x0000
     default: 
       fprintf (stderr, "error!\n");
@@ -189 +191 @@
 
   switch (qual) {
-    case '0': star[0].measure.photFlags |= 0x0000; break;
-    case '1': star[0].measure.photFlags |= 0x0010; break;
-    case '2': star[0].measure.photFlags |= 0x0020; break;
-    case '3': star[0].measure.photFlags |= 0x0030; break;
-    case '4': star[0].measure.photFlags |= 0x0040; break;
-    case '6': star[0].measure.photFlags |= 0x0050; break;
-    case '9': star[0].measure.photFlags |= 0x0060; break;
+    case '0': star[0].measure.photFlags |= 0x00000100; break; // was: 0x0000 
+    case '1': star[0].measure.photFlags |= 0x00000200; break; // was: 0x0010 
+    case '2': star[0].measure.photFlags |= 0x00000400; break; // was: 0x0020 
+    case '3': star[0].measure.photFlags |= 0x00000800; break; // was: 0x0030 
+    case '4': star[0].measure.photFlags |= 0x00001000; break; // was: 0x0040 
+    case '6': star[0].measure.photFlags |= 0x00002000; break; // was: 0x0050 
+    case '9': star[0].measure.photFlags |= 0x00004000; break; // was: 0x0060 
     default: 
       fprintf (stderr, "error!\n");
@@ -206 +208 @@
 
   switch (qual) {
-    case 'p': star[0].measure.photFlags |= 0x0000; break;
-    case 'c': star[0].measure.photFlags |= 0x0100; break;
-    case 'd': star[0].measure.photFlags |= 0x0200; break;
-    case 's': star[0].measure.photFlags |= 0x0300; break;
-    case 'b': star[0].measure.photFlags |= 0x0400; break;
-    case '0': star[0].measure.photFlags |= 0x0500; break;
+    case 'p': star[0].measure.photFlags |= 0x00010000; break; // was: 0x0000
+    case 'c': star[0].measure.photFlags |= 0x00020000; break; // was: 0x0100
+    case 'd': star[0].measure.photFlags |= 0x00040000; break; // was: 0x0200
+    case 's': star[0].measure.photFlags |= 0x00080000; break; // was: 0x0300
+    case 'b': star[0].measure.photFlags |= 0x00010000; break; // was: 0x0400
+    case '0': star[0].measure.photFlags |= 0x00020000; break; // was: 0x0500
     default: 
       fprintf (stderr, "error!\n");
@@ -222 +224 @@
 
   switch (qual) {
-    case '0': star[0].measure.photFlags &= ~0x0008; break;
-    case '1': star[0].measure.photFlags &= ~0x0008; break;
-    default:  star[0].measure.photFlags |=  0x0008; break;
+    case '0': star[0].measure.photFlags &= ~0x00300000; break; // was: ~0x0008
+    case '1': star[0].measure.photFlags |=  0x00100000; break; // was: ~0x0008
+    default:  star[0].measure.photFlags |=  0x00200000; break; // was:  0x0008
   }      
   return (TRUE);
@@ -232 +234 @@
 
   switch (qual) {
-    case '0': star[0].measure.photFlags &= ~0x0080; break;
-    case '1': star[0].measure.photFlags &= ~0x0080; break;
-    default:  
-      star[0].measure.photFlags |= 0x0080; 
+    case '0': star[0].measure.photFlags &= ~0x00c00000; break; // was: ~0x0080 
+    case '1': star[0].measure.photFlags |=  0x00400000; break; // was: ~0x0080 
+    default:  star[0].measure.photFlags |=  0x00800000;        // was:  0x0080
       star[0].measure.extNsigma = 100.0;
       break;
@@ -245 +246 @@
 
   switch (qual) {
-    case '0': star[0].measure.photFlags &= ~0x0800; break;
-    case '1': star[0].measure.photFlags &= ~0x0800; break;
-    default:  star[0].measure.photFlags |=  0x0800; break;
+    case '0': star[0].measure.photFlags &= ~0x03000000; break; // was: ~0x0800
+    case '1': star[0].measure.photFlags |=  0x01000000; break; // was: ~0x0800
+    default:  star[0].measure.photFlags |=  0x02000000; break; // was:  0x0800
   }      
   return (TRUE);
@@ -255 +256 @@
 
   switch (qual) {
-    case '0': star[0].measure.photFlags &= ~0x1000; break;
-    case '1': star[0].measure.photFlags &= ~0x1000; break;
-    default:  star[0].measure.photFlags |=  0x1000; break;
+    case '0': star[0].measure.photFlags &= ~0x0c000000; break; // was: ~0x1000
+    case '1': star[0].measure.photFlags |=  0x04000000; break; // was: ~0x1000
+    default:  star[0].measure.photFlags |=  0x08000000; break; // was:  0x1000
   }      
   return (TRUE);
@@ -265 +266 @@
 
   switch (qual) {
-    case '0': star[0].measure.photFlags &= ~0x2000; break;
-    case '1': star[0].measure.photFlags |=  0x2000; break;
+    case '0': star[0].measure.photFlags &= ~0x10000000; break; // was: ~0x2000
+    case '1': star[0].measure.photFlags |=  0x10000000; break; // was:  0x2000
     default:  abort();
   }      
@@ -272 +273 @@
 }
 
+// unused photFlags:
+// 0x0000.8000
+// 0x0004.0000
+// 0x0008.0000
+// 0x2000.0000
+// 0x4000.0000
+// 0x8000.0000

branches/cnb_branches/cnb_branch_20090301/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
+
+  // in fact, we place a single image on each pole, so the real range of dec is 180.0 - CELLSIZE:
+
+  nDEC = (180.0 - CELLSIZE) / CELLSIZE;
+  dDEC = (180.0 - CELLSIZE) / nDEC;
+  nDEC += 2;
+
+  // a test
+  // for (dec = 0.0 + 0.5*dDEC; dec < +90.0; dec += dDEC) {
+
+  // generate the a collection of rectangles for each ring
+  for (dec = -90.0; dec < +90.0 + 0.5*dDEC; dec += dDEC) {
+
+    ring = sky_rectangle_ring (dec, dDEC, &Nring);
+    if (!ring) continue;
+
+    // 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 +531 @@
 
   return (TRUE);
+}
+
+// define the parameters of a single sky projection center
+SkyRectangle *sky_rectangle_ring (float dec, float dDEC, int *nring) {
+
+  int i, NX, NY, nRA;
+  SkyRectangle *ring;
+  float theta, dRA;
+
+  // '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):
+  float decLower = (dec > 0.0) ? dec - 0.5*dDEC : dec + 0.5*dDEC;
+
+  // solve for actual cellsize (\theta):  tan(\delta_{n+1} - \theta/2) = tan(\delta_n + \theta/2)cos(\alpha_n / 2)
+  float decUpper = (dec > 0.0) ? dec + dDEC : dec - dDEC;
+
+  if (fabs(dec) + 0.5*dDEC > 90.0) {
+    // onPole = TRUE;
+    theta = dDEC;
+    nRA = 1;
+    dRA = theta / cos(decLower*RAD_DEG); // make a square at the pole
+  } else {
+    // onPole = FALSE;
+    // Subdivide the 'lower' bound into an integer number of segments:
+    nRA = cos(RAD_DEG*decLower) * 360.0 / CELLSIZE; // CELLSIZE is a projection size
+    dRA = 360.0 / nRA;                         // dRA is a size in RA degrees == \alpha_n
+
+    // tan(decUpper - theta/2) = tan(dec + theta/2) cos(dRA / 2);
+
+    // we solve this equation for theta (fairly ugly: expand the tangents into sin/cos, expand the 
+    // sum-of-angle sine and cosine, multiply through, convert via half-angle formulae and write 
+    // as a quadratic expression in sine(theta/2)
+  
+    float sd1 = sin(RAD_DEG*decUpper);
+    float cd1 = cos(RAD_DEG*decUpper);
+    float sd2 = sin(RAD_DEG*dec);
+    float cd2 = cos(RAD_DEG*dec);
+    float   k = cos(RAD_DEG*dRA/2.0);
+
+    float c1 =  (sd1*cd2 + sd2*cd1)*(1.0 - k);
+    float c2 =  (sd1*cd2 - sd2*cd1)*(1.0 + k);
+    float c3 = -(sd1*sd2 + cd1*cd2)*(1.0 + k); 
+
+    float A = SQ(c3) + SQ(c2);
+    float B = 2*c1*c3;
+    float C = SQ(c1) - SQ(c2);
+
+    float arg = SQ(B) - 4.0*A*C;
+
+    float root;
+
+    if (dec >= 0.0) {
+      root = (-B + sqrt (arg)) / (2.0*A);
+      theta = +DEG_RAD*asin(root);
+    } else {
+      root = (-B - sqrt (arg)) / (2.0*A);
+      theta = -DEG_RAD*asin(root);
+    }
+
+    // the negative solution yields a negative cellsize 
+    // float root2 = (-B - sqrt (arg)) / (2.0*A);
+    // float theta2 = DEG_RAD*asin(root2);
+
+    // test lines:
+    // float r1 = tan(RAD_DEG*(decUpper - 0.5*theta1));
+    // float r2 = tan(RAD_DEG*(dec + 0.5*theta1));
+    // fprintf (stdout, "%f %f  %f  %f  %f %f  %f %f  %f %f %f\n", dec, decUpper, dRA, arg, root1, root2, theta1, theta2, r1, r2, k*r2);
+  }
+  fprintf (stdout, "%f %f  %f x %f (%d)\n", dec, decUpper, dRA, theta, nRA);
+
+  // 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(decLower*RAD_DEG) * dRA   * 3600.0 / SCALE;
+    NY =                         theta * 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);
 }
 

branches/cnb_branches/cnb_branch_20090301/Ohana/src/libdvo

@@ -1 @@
-lib
+

@@ -1 @@
-lib
+

branches/cnb_branches/cnb_branch_20090301/Ohana/src/libdvo/lib

@@ -1 @@
-*.linux
-*.lin64
-*.sol
-*.sun
-*.sid
-*.hp
-*.irix
-*.darwin.dylib
-*.darwin_x86.dylib
+*.a
+*.so

@@ -1 @@
-*.linux
-*.lin64
-*.sol
-*.sun
-*.sid
-*.hp
-*.irix
-*.darwin.dylib
-*.darwin_x86.dylib
+*.a
+*.so

branches/cnb_branches/cnb_branch_20090301/Ohana/src/libfits/lib

@@ -1 @@
-*.linux
-*.lin64
-*.sol
-*.sun
-*.sid
-*.hp
-*.irix
-*.darwin.dylib
-*.darwin_x86.dylib
+*.a
+*.so

@@ -1 @@
-*.linux
-*.lin64
-*.sol
-*.sun
-*.sid
-*.hp
-*.irix
-*.darwin.dylib
-*.darwin_x86.dylib
+*.a
+*.so

branches/cnb_branches/cnb_branch_20090301/Ohana/src/libkapa/lib

@@ -1 @@
-*.linux
-*.lin64
-*.sol
-*.sun
-*.sid
-*.hp
-*.irix
-*.darwin.dylib
-*.darwin_x86.dylib
+*.a
+*.so

@@ -1 @@
-*.linux
-*.lin64
-*.sol
-*.sun
-*.sid
-*.hp
-*.irix
-*.darwin.dylib
-*.darwin_x86.dylib
+*.a
+*.so

branches/cnb_branches/cnb_branch_20090301/Ohana/src/libohana/lib

@@ -1 @@
-*.linux
-*.lin64
-*.sol
-*.sun
-*.sid
-*.hp
-*.irix
-*.darwin.dylib
-*.darwin_x86.dylib
+*.a
+*.so

@@ -1 @@
-*.linux
-*.lin64
-*.sol
-*.sun
-*.sid
-*.hp
-*.irix
-*.darwin.dylib
-*.darwin_x86.dylib
+*.a
+*.so

branches/cnb_branches/cnb_branch_20090301/Ohana/src/libohana/src/CommOps.c

@@ -14 +14 @@
     return (status);
   }
+  // fprintf (stderr, "resp: %s\n", command.buffer);
 
   /* buffer contains an EOL NULL, we can just sscan it */

branches/cnb_branches/cnb_branch_20090301/Ohana/src/libtap/lib

@@ -1 @@
-*.linux
-*.lin64
-*.sol
-*.sun
-*.sid
-*.hp
-*.irix
-*.darwin.dylib
-*.darwin_x86.dylib
+*.a
+*.so

@@ -1 @@
-*.linux
-*.lin64
-*.sol
-*.sun
-*.sid
-*.hp
-*.irix
-*.darwin.dylib
-*.darwin_x86.dylib
+*.a
+*.so

branches/cnb_branches/cnb_branch_20090301/Ohana/src/opihi/dimm/Analysis.c

@@ -86 +86 @@
         }
 
+/* find contiguous trigger pixels in row from starting point */
+
+int fillrow (float *buffer, int Nx, int offset, int sx, int *xs, int *xe) {
+
+  trigger = FALSE;
+  for (i = sx, pix = offset + i; buffer[pix] && (i < Nx); i++, pix++) {
+    addpix (pix);
+    buffer[pix] = 0;
+    trigger = TRUE;
+    *xe = i;
+  }
+  for (i = sx - 1, pix = offset + i; (i >= 0) && buffer[pix]; i--, pix--) {
+    addpix (pix);
+    buffer[pix] = 0;
+    trigger = TRUE;
+    *xs = i;
+  }
+  return (trigger);
+}
+
+static int Npix = 0;
+static int *Pix = (int *) NULL;
+
+addpix (int pix) {
+  Npix ++;
+  if (Pix == (int *) NULL) {
+    ALLOCATE (Pix, int, MAX (1, Npix));
+  } else {
+    REALLOCATE (Pix, int, MAX (1, Npix));
+  }    
+  Pix[Npix - 1] = pix;
+}
+
+clearpix () {
+  Npix = 0;
+  REALLOCATE (Pix, int, 1);
+}
+
+statpix (double *x, double *y, float *buffer, int Nx) {
+
+  int X, Y;
+  double Sx, Sy, So;
+
+  So = Sx = Sy = 0;
+  for (i = 0; i < Npix; i++) {
+    Y = pix / Nx;
+    X = pix % Nx;
+    So += buffer[pix];
+    Sx += X * buffer[pix];
+    Sy += Y * buffer[pix];
+  }
+  *x = Sx / So;
+  *y = Sy / So;
+}
+
+/* find stars: 
+   - binarize @ threshold
+   - find all contiguous blobs
+   - find geom center of each blob
+*/
+
+
+
+/*
+
+.....................
+....x................
+...xxx...............
+..........xxx..........
+.........xx..........
+.....................
+.....................
+.....................
+.....................
+.....................
+
+
+ */
+
 # endif
 

branches/cnb_branches/cnb_branch_20090301/Ohana/src/opihi/dimm/Makefile

@@ -26 +26 @@
 $(SRC)/init.$(ARCH).o                   \
 $(SRC)/dimm.$(ARCH).o                   \
-$(SRC)/camera.$(ARCH).o         \
+$(SRC)/camera_cmds.$(ARCH).o            \
 $(SRC)/findstars.$(ARCH).o              \
-$(SRC)/telescope.$(ARCH).o   \
+$(SRC)/telescope_cmds.$(ARCH).o   \
 $(SRC)/version.$(ARCH).o
 
@@ -64 +64 @@
 .PHONY: dimm
 
-# are these used or replaced?
-# $(SRC)/analysis.$(ARCH).o             \
+# these have not been finished: should be used for analysis of the extracted images
 # $(SRC)/Analysis.$(ARCH).o            \
 # $(SRC)/Image.$(ARCH).o                \

branches/cnb_branches/cnb_branch_20090301/Ohana/src/opihi/pantasks/CheckTasks.c

@@ -48 +48 @@
     // add random offset between 0 and 5% of exec_period
     // XXX this should be optional
-    fuzz = 0.05*task[0].exec_period*drand48() + 1e-6*task[0].last.tv_usec; 
+    fuzz = 0.1*task[0].exec_period*drand48();
     task[0].last.tv_usec = 1e6*(fuzz - (int)fuzz);
     task[0].last.tv_sec += (int) fuzz;

branches/cnb_branches/cnb_branch_20090301/Ohana/src/opihi/pantasks/task_threads.c

@@ -2 +2 @@
 
 /** things related to CheckTasks **/
+void ResetTaskTimers ();
 
 static int CheckTasksRun = FALSE;
 
 void CheckTasksSetState (int state) {
+  if (state && !CheckTasksRun) {
+    ResetTaskTimers ();
+  }
   CheckTasksRun = state;
 }
@@ -51 +55 @@
 // timeout.  this enforces a certain granularity in the task creation, but prevents the task
 // thread from driving the load up to silly levels.
+
+// reset all of the task timers, with a bit of fuzz.  this is called 
+// whenever we transition from 'stop' to 'run'
+void ResetTaskTimers () {
+
+  Task *task;
+  struct timeval now;
+  float fuzz;
+
+  // get the current time
+  gettimeofday (&now, NULL);
+
+  // check all tasks
+  while ((task = NextTask ()) != NULL) {
+    task[0].last.tv_usec = now.tv_usec;
+    task[0].last.tv_sec  = now.tv_sec;
+
+    // add random offset between 0 and 10% of exec_period
+    // XXX this should be optional
+    fuzz = task[0].exec_period*drand48();
+    task[0].last.tv_usec += 1e6*(fuzz - (int)fuzz);
+    task[0].last.tv_sec += (int) fuzz;
+
+    // gprint (GP_LOG, "fuzz: %f, last: %d %d\n", fuzz, task[0].last.tv_sec, task[0].last.tv_usec);
+  }
+  return;
+}

branches/cnb_branches/cnb_branch_20090301/Ohana/src/opihi/pcontrol/CheckIdleHost.c

@@ -40 +40 @@
     host[0].job = (struct Job *) job;
 
-    if (logfile) fprintf (logfile, "start needhost %s (job host %s) : %s\n", host[0].hostname, job[0].hostname, job[0].argv[0]);
+    // if (logfile) fprintf (logfile, "start needhost %s (job host %s) : %s\n", host[0].hostname, job[0].hostname, job[0].argv[0]);
 
     /* take the job off the stack and unlock the stack */
@@ -60 +60 @@
     host[0].job = (struct Job *) job;
 
-    if (logfile) fprintf (logfile, "start wanthost %s (job host %s) : %s\n", host[0].hostname, job[0].hostname, job[0].argv[0]);
+    // if (logfile) fprintf (logfile, "start wanthost %s (job host %s) : %s\n", host[0].hostname, job[0].hostname, job[0].argv[0]);
 
     /* take the job off the stack and unlock the stack */
@@ -78 +78 @@
     host[0].job = (struct Job *) job;
 
-    if (logfile) fprintf (logfile, "start  anyhost %s (job host %s) : %s\n", host[0].hostname, job[0].hostname, job[0].argv[0]);
+    // if (logfile) fprintf (logfile, "start  anyhost %s (job host %s) : %s\n", host[0].hostname, job[0].hostname, job[0].argv[0]);
 
     /* take the job off the stack and unlock the stack */

@@ -1 @@
-lib
+

@@ -1 @@
-*.linux
-*.lin64
-*.sol
-*.sun
-*.sid
-*.hp
-*.irix
-*.darwin.dylib
-*.darwin_x86.dylib
+*.a
+*.so

@@ -1 @@
-*.linux
-*.lin64
-*.sol
-*.sun
-*.sid
-*.hp
-*.irix
-*.darwin.dylib
-*.darwin_x86.dylib
+*.a
+*.so

@@ -1 @@
-*.linux
-*.lin64
-*.sol
-*.sun
-*.sid
-*.hp
-*.irix
-*.darwin.dylib
-*.darwin_x86.dylib
+*.a
+*.so

@@ -1 @@
-*.linux
-*.lin64
-*.sol
-*.sun
-*.sid
-*.hp
-*.irix
-*.darwin.dylib
-*.darwin_x86.dylib
+*.a
+*.so

@@ -1 @@
-*.linux
-*.lin64
-*.sol
-*.sun
-*.sid
-*.hp
-*.irix
-*.darwin.dylib
-*.darwin_x86.dylib
+*.a
+*.so