Changeset 40655 for trunk

Timestamp:

Mar 29, 2019, 5:10:03 AM (7 years ago)

Author:

eugene

Message:

progress on deimos

Location:

trunk/Ohana/src/opihi/mana

Files:

• Makefile (modified) (1 diff)
• deimos.c (modified) (2 diffs)
• deimos_arclines.c (added)
• deimos_fitalt.c (added)
• deimos_mkmodel.c (modified) (3 diffs)
• deimos_mkobj.c (modified) (1 diff)

trunk/Ohana/src/opihi/mana/Makefile

@@ -26 +26 @@
 $(SRC)/deimos_getobj.$(ARCH).o \
 $(SRC)/deimos_fitobj.$(ARCH).o \
+$(SRC)/deimos_fitalt.$(ARCH).o \
 $(SRC)/deimos_mkalt.$(ARCH).o \
 $(SRC)/deimos_mkmodel.$(ARCH).o \
+$(SRC)/deimos_arclines.$(ARCH).o \
 $(SRC)/findrowpeaks.$(ARCH).o 
 

trunk/Ohana/src/opihi/mana/deimos.c

@@ -7 +7 @@
 int deimos_getobj (int argc, char **argv);
 int deimos_fitobj (int argc, char **argv);
+int deimos_fitalt (int argc, char **argv);
+int deimos_arclines (int argc, char **argv);
 
 static Command deimos_commands[] = {
   {1, "fitobj", deimos_fitobj, "fit for object parameters"},
+  {1, "fitalt", deimos_fitalt, "fit for object parameters using LMM"},
   {1, "getobj", deimos_getobj, "determine crude object parameters"},
   {1, "mkobj", deimos_mkobj, "make a full object image"},
@@ -15 +18 @@
   {1, "mkslit", deimos_mkslit, "make a slit image"},
   {1, "fitslit", deimos_fitslit, "fit slit image to observed slit flux"},
+  {1, "arclines", deimos_arclines, "detect arclines using LSF and STILT"},
 };
 

trunk/Ohana/src/opihi/mana/deimos_mkmodel.c

@@ -37 +37 @@
   ALLOCATE (kernel, float, Nx*Ny);
   Nkernel_pix = Nx*Ny;
-  fprintf (stderr, "allocating %d pixels (%d,%d)\n", Nkernel_pix, Nx, Ny);
+  // fprintf (stderr, "allocating %d pixels (%d,%d)\n", Nkernel_pix, Nx, Ny);
 
   // XXX use Xref not Nx/2?
@@ -53 +53 @@
     int pix;
     pix = ix + (dyi + Nkernel_y2 + 0)*Nx;
-    fprintf (stderr, "%d, %d, %d -- ", ix, (dyi + Nkernel_y2 + 0), pix);
+    // fprintf (stderr, "%d, %d, %d -- ", ix, (dyi + Nkernel_y2 + 0), pix);
     myAssert (pix < Nkernel_pix, "oops (make_kernel 1)");
     kernel[pix] = 1.0 - dyf;
 
     pix = ix + (dyi + Nkernel_y2 + 1)*Nx;
-    fprintf (stderr, "%d, %d, %d -- ", ix, (dyi + Nkernel_y2 + 1), pix);
+    // fprintf (stderr, "%d, %d, %d -- ", ix, (dyi + Nkernel_y2 + 1), pix);
     myAssert (pix < Nkernel_pix, "oops (make_kernel 2)");
     kernel[pix] = dyf;
-    fprintf (stderr, ": %f %f\n", kernel[ix + (dyi + Nkernel_y2 + 0)*Nx], kernel[ix + (dyi + Nkernel_y2 + 1)*Nx]);
+    // fprintf (stderr, ": %f %f\n", kernel[ix + (dyi + Nkernel_y2 + 0)*Nx], kernel[ix + (dyi + Nkernel_y2 + 1)*Nx]);
   }
 }
@@ -85 +85 @@
 
 // generate a subimage of the full model for the range row - row + Ny
-// obj,sky,bck are vectors of the full length of the model (ie, not sub-vectors)
+// obj,sky,bck are subset vectors corresponding to the range row to row+Ny
 float *deimos_make_model (opihi_flt *obj, opihi_flt *sky, opihi_flt *bck, Vector *psf, Vector *profile, Spline *trace, int Nx, int Ny, int row) {
 

trunk/Ohana/src/opihi/mana/deimos_mkobj.c

@@ -260 +260 @@
       myAssert (Nkpix_i < Nkpix, "oops");
       kernel[Nkpix_i] = dyf;
-      fprintf (stderr, "%d, %d: %f %f\n", ix, (dyi + Nyk2), kernel[ix + (dyi + Nyk2 + 0)*Nx], kernel[ix + (dyi + Nyk2 + 1)*Nx]);
+      // fprintf (stderr, "%d, %d: %f %f\n", ix, (dyi + Nyk2), kernel[ix + (dyi + Nyk2 + 0)*Nx], kernel[ix + (dyi + Nyk2 + 1)*Nx]);
     }
   }