Changeset 42166 for branches/eam_branches/ipp-20220316/Ohana/src/opihi

Timestamp:

Apr 8, 2022, 5:04:42 PM (4 years ago)

Author:

eugene

Message:

merge changes from trunk (UKIRT addstar, relphot mods, dvomerge mods, ippCheck work, mlayer

Location:

branches/eam_branches/ipp-20220316

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi (modified) (1 prop)
• Ohana/src/opihi/cmd.data/Makefile (modified) (1 diff)
• Ohana/src/opihi/cmd.data/create.c (modified) (4 diffs)
• Ohana/src/opihi/cmd.data/init.c (modified) (2 diffs)
• Ohana/src/opihi/cmd.data/mlayer.c (copied) (copied from trunk/Ohana/src/opihi/cmd.data/mlayer.c )
• Ohana/src/opihi/cmd.data/mslice.c (modified) (1 diff)
• Ohana/src/opihi/cmd.data/write_vectors.c (modified) (2 diffs)
• Ohana/src/opihi/lib.shell/VectorIO.c (modified) (1 diff)

branches/eam_branches/ipp-20220316/Ohana/src/opihi/cmd.data/Makefile

@@ -106 +106 @@
 $(SRC)/mget3d.$(ARCH).o         \
 $(SRC)/mslice.$(ARCH).o         \
+$(SRC)/mlayer.$(ARCH).o         \
 $(SRC)/minterpolate.$(ARCH).o   \
 $(SRC)/medimage.$(ARCH).o       \

branches/eam_branches/ipp-20220316/Ohana/src/opihi/cmd.data/create.c

@@ -3 +3 @@
 int create (int argc, char **argv) {
   
-  int i, N, INT;
+  int i, N;
   opihi_flt start, end, delta;
   Vector *vec;
@@ -34 +34 @@
   }
 
-  INT = FALSE;
+  int INT = FALSE;
   if ((N = get_argument (argc, argv, "-int"))) {
     INT = TRUE;
@@ -40 +40 @@
   }
 
-  if ((argc != 5) && (argc != 4)) {
-    gprint (GP_ERR, "USAGE: create vector start end [delta] [-int]\n");
-    gprint (GP_ERR, " -int : resulting vector is integer type (delta must be integer)\n");
-    gprint (GP_ERR, " -str : resulting vector is string type (only give number of elements)\n");
-    return (FALSE);
+  int EMPTY = FALSE;
+  if ((N = get_argument (argc, argv, "-empty"))) {
+    EMPTY = TRUE;
+    remove_argument (N, &argc, argv);
   }
 
+  if (!EMPTY && (argc != 5) && (argc != 4)) goto usage;
+  if (EMPTY && (argc != 2)) goto usage;
+
   if ((vec = SelectVector (argv[1], ANYVECTOR, TRUE)) == NULL) return (FALSE);
+  if (EMPTY) {
+    ResetVector (vec, (INT ? OPIHI_INT : OPIHI_FLT), 0);
+    return TRUE;
+  }
 
   delta = 1;
@@ -91 +97 @@
 
   return (TRUE);
+
+ usage:
+  gprint (GP_ERR, "USAGE: create vector start end [delta] [-int]\n");
+  gprint (GP_ERR, " -int : resulting vector is integer type (delta must be integer)\n");
+  gprint (GP_ERR, " -str : resulting vector is string type (only give number of elements)\n");
+  gprint (GP_ERR, "OR: create vector -empty (creates vector of length zero)\n");
+  return (FALSE);
 }

branches/eam_branches/ipp-20220316/Ohana/src/opihi/cmd.data/init.c

@@ -97 +97 @@
 int mget3d           PROTO((int, char **));
 int mslice           PROTO((int, char **));
+int mlayer           PROTO((int, char **));
 int minterp          PROTO((int, char **));
 int medimage_command PROTO((int, char **));
@@ -296 +297 @@
   {1, "mget3d",       mget3d,           "extract a vector from a 3D image"},
   {1, "mslice",       mslice,           "extract an image plane from a 3D image"},
+  {1, "mlayer",       mlayer,           "insert an image plane into a 3D image"},
   {1, "imget",        mget,             "extract a vector from an image"},
   {1, "minterp",      minterp,          "interpolate image pixels"},

branches/eam_branches/ipp-20220316/Ohana/src/opihi/cmd.data/mslice.c

@@ -31 +31 @@
   if (argc != 4) {
     gprint (GP_ERR, "USAGE: mslice <input> <output> plane [-x,-y,-z]\n");
+    gprint (GP_ERR, "  extract 2D image from 3D cube (opposite of mlayer)\n");
     gprint (GP_ERR, "  -z is default\n");
     return (FALSE);

branches/eam_branches/ipp-20220316/Ohana/src/opihi/cmd.data/write_vectors.c

@@ -102 +102 @@
   if (argc < 3) {
     gprint (GP_ERR, "USAGE: write [options] file vector vector ...\n");
-    gprint (GP_ERR, "OPTIONS: [-header] [-append] [-f \"format\"] [-fits NAME] [-csv] [-h,--help]\n");
+    gprint (GP_ERR, "OPTIONS: [-header [buf]] [-append] [-f \"format\"] [-fits NAME] [-csv] [-h,--help]\n");
     return (FALSE);
   }
@@ -289 +289 @@
  usage:
     gprint (GP_ERR, "USAGE: write [options] file vector vector ...\n");
-    gprint (GP_ERR, "OPTIONS: [-header] [-append] [-f \"format\"] [-fits NAME] [-csv] [-h,--help]\n\n");
+    gprint (GP_ERR, "OPTIONS: [-header [buf]] [-append] [-f \"format\"] [-fits NAME] [-csv] [-h,--help]\n\n");
 
     gprint (GP_ERR, "OPTIONS: \n");
-    gprint (GP_ERR, "  -header : add a descriptive header line to ascii or csv output\n");
+    gprint (GP_ERR, "  -header : add a descriptive header line to ascii or csv output (see below for FITS)\n");
     gprint (GP_ERR, "  -append : write to the end of the existing file\n");
     gprint (GP_ERR, "  -fits NAME : write a fits table (extention name is NAME, column names match vector names)\n");

branches/eam_branches/ipp-20220316/Ohana/src/opihi/lib.shell/VectorIO.c

@@ -267 +267 @@
 }
   
-static char *rawkeywords[] = {"SIMPLE", "BITPIX", "NAXIS", "PCOUNT", "GCOUNT", "EXTEND", "EXTNAME", "BSCALE", "BZERO", "TFIELDS", "TFORM", "TZERO", "TSCAL", "        ", NULL};
+static char *rawkeywords[] = {"SIMPLE", "BITPIX", "NAXIS", "PCOUNT", "GCOUNT", "EXTEND", "EXTNAME", "BSCALE", "BZERO", "TFIELDS", "TFORM", "TTYPE", "TZERO", "TSCAL", "        ", NULL};
 
 // write a set of vectors to a FITS file (vectors names become fits column names)