Changeset 23290

Timestamp:

Mar 12, 2009, 8:54:43 AM (17 years ago)

Author:

eugene

Message:

remove duplicate analysis.c; rename telescope.c and camera.c to avoid case-collisions

Location:

trunk/Ohana/src/opihi/dimm

Files:

• Analysis.c (modified) (1 diff)
• Makefile (modified) (2 diffs)
• analysis.c (deleted)
• camera_cmds.c (moved) (moved from trunk/Ohana/src/opihi/dimm/camera.c )
• telescope_cmds.c (moved) (moved from trunk/Ohana/src/opihi/dimm/telescope.c )

trunk/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
 

trunk/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                \