Changeset 34342 for trunk/Ohana/src/opihi/cmd.astro

Timestamp:

Aug 23, 2012, 10:04:31 AM (14 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20120805

Location:

trunk/Ohana/src/opihi

Files:

• . (modified) (1 prop)
• cmd.astro (modified) (1 prop)
• cmd.astro/Makefile (modified) (1 diff)
• cmd.astro/csystem.c (modified) (4 diffs)
• cmd.astro/getcoords.c (copied) (copied from branches/eam_branches/ipp-20120805/Ohana/src/opihi/cmd.astro/getcoords.c )
• cmd.astro/init.c (modified) (2 diffs)

trunk/Ohana/src/opihi/cmd.astro/Makefile

@@ -43 +43 @@
 $(SRC)/galsectors.$(ARCH).o        \
 $(SRC)/galprofiles.$(ARCH).o       \
+$(SRC)/getcoords.$(ARCH).o         \
 $(SRC)/elliprofile.$(ARCH).o       \
 $(SRC)/ringflux.$(ARCH).o          \

trunk/Ohana/src/opihi/cmd.astro/csystem.c

@@ -11 +11 @@
   CoordTransform *transform;
 
-  if (argc != 5) {
-    gprint (GP_ERR, "USAGE: csystems [C/G/E/H] [C/G/E/H] X Y\n");
-    return (FALSE);
-  }
+  if (argc != 5) goto syntax;
 
   switch (argv[1][0]) {
@@ -20 +17 @@
     case 'G': input = COORD_GALACTIC; break;
     case 'E': input = COORD_ECLIPTIC; break;
-    default: abort();
+    default: goto syntax;
   }
 
@@ -27 +24 @@
     case 'G': output = COORD_GALACTIC; break;
     case 'E': output = COORD_ECLIPTIC; break;
-    default: abort();
+    default: goto syntax;
   }
 
@@ -66 +63 @@
   return (TRUE);
 
+syntax:
+  gprint (GP_ERR, "USAGE: csystems [C/G/E/H] [C/G/E/H] X Y\n");
+  return (FALSE);
 }

trunk/Ohana/src/opihi/cmd.astro/init.c

@@ -29 +29 @@
 int galradius               PROTO((int, char **));
 int galradbins              PROTO((int, char **));
+int getcoords               PROTO((int, char **));
 int elliprofile             PROTO((int, char **));
 int ringflux                PROTO((int, char **));
@@ -86 +87 @@
   {1, "galradius",   galradius,    "generate radial vectors with interpolation along paths"},
   {1, "galradbins",  galradbins,   "generate radial vectors with interpolation along paths"},
+  {1, "getcoords",   getcoords,    "generate images containing the RA,DEC coord for each pixel"},
   {1, "elliprofile", elliprofile,  "generate radial vectors with interpolation along paths"},
   {1, "ringflux",    ringflux,     "mean flux in a ring"},