Changeset 40817 for branches/eam_branches/ohana.20190329/src/opihi/mana/deimos_mkobj.c

Timestamp:

Jun 22, 2019, 3:34:13 PM (7 years ago)

Author:

eugene

Message:

deprecate deimos mkalt; skip nan pixels in deimos arclines; apply blue and red-chip traces to getalt, mkobj

File:

• branches/eam_branches/ohana.20190329/src/opihi/mana/deimos_mkobj.c (modified) (5 diffs)

branches/eam_branches/ohana.20190329/src/opihi/mana/deimos_mkobj.c

@@ -19 +19 @@
 
   // if any of these are not defined, they will have assumed identity values
-  Spline *slit_trace = NULL;
+  Spline *slit_trace_red = NULL;
+  Spline *slit_trace_blu = NULL;
   Spline *psf_trace  = NULL;
   Vector *profile    = NULL;
@@ -34 +35 @@
   float stilt = 0.0; // angle of the slit
 
-  if ((N = get_argument (argc, argv, "-slit-trace"))) {
-    remove_argument (N, &argc, argv);
-    if ((slit_trace = FindSpline (argv[N])) == NULL) return (FALSE);
+  // 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 ((N = get_argument (argc, argv, "-slit-trace-red"))) {
+    remove_argument (N, &argc, argv);
+    if ((slit_trace_red = FindSpline (argv[N])) == NULL) return (FALSE);
+    remove_argument (N, &argc, argv);
+  }
+  if ((N = get_argument (argc, argv, "-slit-trace-blu"))) {
+    remove_argument (N, &argc, argv);
+    if ((slit_trace_blu = FindSpline (argv[N])) == NULL) return (FALSE);
     remove_argument (N, &argc, argv);
   }
@@ -138 +154 @@
   // if we are appying a trace offset spline, we need to generate an output window which
   // is Nx + the full swing of the trace, then window back down
-  if (slit_trace) {
+  if (slit_trace_red && slit_trace_blu) {
     float dXmin = +1000;
     float dXmax = -1000;
     for (int iy = 0; iy < Ny; iy++) {
       // evaluate the trace spline at this y-coord to find the x-coord offset of the profile center
+      Spline *slit_trace = (iy < redlimit) ? slit_trace_red : slit_trace_blu;
       float dx = spline_apply_dbl (slit_trace->xk, slit_trace->yk, slit_trace->y2, slit_trace->Nknots, iy);
       dXmin = MIN (dx, dXmin);
@@ -369 +386 @@
 
   // shift pixels in x based on the trace
-  if (slit_trace) {
+  if (slit_trace_red && slit_trace_blu) {
     ALLOCATE_PTR (outTraceBuffer, char, NxBase*Ny*sizeof(float));
     float *outTrace = (float *) outTraceBuffer;
@@ -377 +394 @@
 
       // evaluate the trace spline at this y-coord to find the x-coord offset of the profile center
+      Spline *slit_trace = (iy < redlimit) ? slit_trace_red : slit_trace_blu;
       float dx = -spline_apply_dbl (slit_trace->xk, slit_trace->yk, slit_trace->y2, slit_trace->Nknots, iy);