Changeset 40865

Timestamp:

Aug 14, 2019, 9:59:19 AM (7 years ago)

Author:

eugene

Message:

moving old getobj out of the way

Location:

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

Files:

• deimos.c (modified) (2 diffs)
• deimos_getobj.v0.c (moved) (moved from branches/eam_branches/ohana.20190329/src/opihi/mana/deimos_getobj.c )
• deimos_mkobj.c (modified) (2 diffs)

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

@@ -4 +4 @@
 int deimos_fitslit (int argc, char **argv);
 int deimos_mkobj (int argc, char **argv);
-// int deimos_mkalt (int argc, char **argv); -- deprecated: mkobj adds slit vs psf traces as well as red vs blu chips
 int deimos_getobj (int argc, char **argv);
-int deimos_getalt (int argc, char **argv);
+// int deimos_getalt (int argc, char **argv);
 int deimos_fitobj (int argc, char **argv);
 int deimos_fitalt (int argc, char **argv);
@@ -14 +13 @@
 
 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, "getalt", deimos_getalt, "determine crude object parameters"},
-  {1, "mkobj", deimos_mkobj, "make a full object image"},
-//   {1, "mkalt", deimos_mkalt, "make a full object image (uses deimos_make_object, for a test)"},
-  {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"},
-  {1, "fitarc", deimos_fitarc, "fit arclamp lines"},
+  {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, "getalt",     deimos_getobj,     "determine crude object parameters"},
+  {1, "mkobj",      deimos_mkobj,      "make a full object image"},
+  {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"},
+  {1, "fitarc",     deimos_fitarc,     "fit arclamp lines"},
   {1, "fitprofile", deimos_fitprofile, "fit slit profile"},
 };

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

@@ -6 +6 @@
 
   // input parameters:
-  // * slit_trace  : spline fit of slit central x pos vs y-coord
-  // * psf_trace   : spline fit of psf central x pos vs y-coord
-  // * profile     : slit window profile (vector)
-  // * object      : vector of object flux vs y-coord 
-  // * sky         : vector of local sky signal vs y-coord
-  // * background  : vector of extra-slit background flux vs y-coord
-  // * PSF         : point-spread function vector (flux normalized, x-dir)
-  // * LSF         : sline-spread function vector (flux normalized, y-dir)
-  // * stilt       : slit tilt response : 2D kernel? 
+  // * slit_trace_red : spline fit of slit central x pos vs y-coord for red chip
+  // * slit_trace_blu : spline fit of slit central x pos vs y-coord for blu chip
+  // * psf_trace      : spline fit of psf central x pos vs y-coord
+  // * profile        : slit window profile (vector)
+  // * object         : vector of object flux vs y-coord 
+  // * sky            : vector of local sky signal vs y-coord
+  // * backgnd        : vector of extra-slit background flux vs y-coord
+  // * PSF            : point-spread function vector (flux normalized, x-dir)
+  // * LSF            : sline-spread function vector (flux normalized, y-dir)
+  // * stilt          : slit tilt response : 2D kernel? 
+
+  // * redlimit       : pixel break between red and blu chips
+  // * Nwave          : number of wavelength pixels in output image
 
   int N;
@@ -111 +115 @@
 
   if (argc != 3) {
-    gprint (GP_ERR, "USAGE: deimos mkobj (buffer) (Ncross) [-Nwave N] [-object vector] [-sky vector] [-backgnd vector] [-slit-trace spline] [-psf-trace spline] [-profile vector]\n");
-    gprint (GP_ERR, "  psf-trace : cross-dispersion shift *relative* to the slit trace\n");
-    gprint (GP_ERR, "  sky       : sky is relative to background outside slit\n");
+    gprint (GP_ERR, "USAGE: deimos mkobj (buffer) (Ncross) [-object vector] [-sky vector] [-backgnd vector] [-slit-trace-red spline] [-slit-trace-blu spline] [-psf-trace spline] [-profile vector] [-psf vector] [-lsf vector] [-stilt angle] [-Nwave Npixel] [-redlimit pixel]\n");
+    gprint (GP_ERR, "  slit_trace_red : spline fit of slit central x pos vs y-coord for red chip\n");
+    gprint (GP_ERR, "  slit_trace_blu : spline fit of slit central x pos vs y-coord for blu chip\n");
+    gprint (GP_ERR, "  psf_trace      : spline fit of psf central x pos vs y-coord\n");
+    gprint (GP_ERR, "  profile        : slit window profile (vector)\n");
+    gprint (GP_ERR, "  object         : vector of object flux vs y-coord \n");
+    gprint (GP_ERR, "  sky            : vector of local sky signal vs y-coord\n");
+    gprint (GP_ERR, "  backgnd        : vector of extra-slit background flux vs y-coord\n");
+    gprint (GP_ERR, "  PSF            : point-spread function vector (flux normalized, x-dir)\n");
+    gprint (GP_ERR, "  LSF            : sline-spread function vector (flux normalized, y-dir)\n");
+    gprint (GP_ERR, "  stilt          : slit tilt response : 2D kernel? \n");
+    gprint (GP_ERR, "  redlimit       : pixel break between red and blu chips\n");
+    gprint (GP_ERR, "  Nwave          : number of wavelength pixels in output image\n");
     return FALSE;
   }