Changeset 41340 for trunk/Ohana/src/opihi/mana/deimos_mkslit.c

Timestamp:

Apr 16, 2020, 1:54:47 PM (6 years ago)

Author:

tdeboer

Message:

revert to working Ohana build

File:

• trunk/Ohana/src/opihi/mana/deimos_mkslit.c (modified) (7 diffs)

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

@@ -7 +7 @@
   // input parameters:
   //   slit profile response : vector of fractional flux vs x-coord
-  //   trace_ref,trace_blu   : spline fit of slit central x pos vs y-coord
-  //   flux (optional)       : vector of input signal vs y-coord
-  //   sky  (optional)       : vector of input signal vs y-coord
-  //   fluxbins (optional)   : size of output image in y-direction
-  //   NOTE: one of flux, sky, or fluxbins must be defined
-
-  // output : buff (an image with Nx defined by profile and Ny defined
-  //                by flux, sky, or fluxbins)
+  //   trace                 : spline fit of slit central x pos vs y-coord
+  //   flux                  : vector of input signal vs y-coord
 
   int N;
 
-  Vector *profile   = NULL;
-  Vector *flux      = NULL;
-  Vector *sky       = NULL;
-  Spline *trace_red = NULL;
-  Spline *trace_blu = NULL;
-  Buffer *buff      = NULL;
+  Vector *profile = NULL;
+  Vector *flux    = NULL;
+  Vector *sky     = NULL;
+  Spline *trace   = NULL;
+  Buffer *buff    = NULL;
 
   // user-specified flux value (otherwise assumed to be 1)
@@ -47 +40 @@
   }
 
-  // either flux or fluxbins must be specified to define output size
-  int profilebins = 0;
-  if ((N = get_argument (argc, argv, "-profilebins"))) {
-    remove_argument (N, &argc, argv);
-    profilebins = atoi (argv[N]);
-    remove_argument (N, &argc, argv);
-  }
-
-  // for a red vs blu spline, we need to specify the split point
-  // XXX this is REALLY ad-hoc for Deimos.  not sure how to make
-  // this more generic (need to define the ranges somewhere)
-  int redlimit = 4096;
-  if ((N = get_argument (argc, argv, "-redlimit"))) {
-    remove_argument (N, &argc, argv);
-    redlimit = atoi (argv[N]);
-    remove_argument (N, &argc, argv);
-  }
-
-  if (argc != 5) {
-    gprint (GP_ERR, "USAGE: deimos mkslit (profile) (trace_red) (trace_blu) (buffer) [-flux vector] [-fluxbins N] [-sky vector]\n");
+  if (argc != 4) {
+    gprint (GP_ERR, "USAGE: deimos mkslit (profile) (trace) (buffer) [-flux vector] [-fluxbins N] [-sky vector]\n");
     return FALSE;
   }
@@ -76 +51 @@
 
   // XXX I probably should rename FindSpline as SelectSpline and give it the same behavior
-  if ((profile   = SelectVector (argv[1], OLDVECTOR, TRUE)) == NULL) return (FALSE);
-  if ((trace_red = FindSpline (argv[2])) == NULL) return (FALSE);
-  if ((trace_blu = FindSpline (argv[3])) == NULL) return (FALSE);
-  if ((buff      = SelectBuffer (argv[4], ANYBUFFER, TRUE)) == NULL) return (FALSE);
+  if ((profile = SelectVector (argv[1], OLDVECTOR, TRUE)) == NULL) return (FALSE);
+  if ((trace   = FindSpline (argv[2])) == NULL) return (FALSE);
+  if ((buff    = SelectBuffer (argv[3], ANYBUFFER, TRUE)) == NULL) return (FALSE);
 
   // define the output window
-  // if no profile half-width is specified, use supplied profile 
-  int Nx = profilebins ? 2*profilebins + 1 : 2*profile[0].Nelements + 1;
+  int Nx = 2*profile[0].Nelements + 1;
   int Ny = flux ? flux[0].Nelements : fluxbins;
   
@@ -100 +73 @@
 
     // evaluate the trace spline at this y-coord to find the x-coord offset of the profile center
-    Spline *trace = (iy < redlimit) ? trace_red : trace_blu;
     float dx = spline_apply_dbl (trace->xk, trace->yk, trace->y2, trace->Nknots, iy);
     
@@ -118 +90 @@
 
       // set the sky in the entire window 
-      out[ix + iy*Nx] = NAN;
+      out[ix + iy*Nx] = sky ? sky->elements.Flt[iy] : 0.0;
 
       // equivalent coord in the profile:
@@ -126 +98 @@
 
       // a default value:
-      float vsky = sky ? sky->elements.Flt[iy] : 0.0;
       float vout = NAN;
 
@@ -150 +121 @@
       if (flux) vout *= flux->elements.Flt[iy];
 
-      out[ix + iy*Nx] = vsky + vout;
+      out[ix + iy*Nx] += vout;
     }
   }