Changeset 2455

Timestamp:

Nov 24, 2004, 2:00:46 PM (22 years ago)

Author:

eugene

Message:

minor cleanup

Location:

trunk/Ohana/src/imregister/src

Files:

• imphotsearch.c (modified) (5 diffs)
• imregtable.c (modified) (2 diffs)

trunk/Ohana/src/imregister/src/imphotsearch.c

@@ -2 +2 @@
 
 static char PhotError[] = "unknown";
-static char *version = "imphotsearch $Revision: 1.2 $";
+static char *version = "imphotsearch $Revision: 1.3 $";
 
 main (int argc, char **argv) {
@@ -15 +15 @@
   Image *image;
   int PhotCodeSelect, Nin;
+  int CodeSelect, Code;
   char *FitsOutput, *NameSelect;
   int NameSelectLength;
@@ -54 +55 @@
     remove_argument (N, &argc, argv);
     NameSelectLength = strlen (NameSelect);
+  }
+
+  /* string in image name */
+  CodeSelect = FALSE;
+  if (N = get_argument (argc, argv, "-code")) {
+    CodeSelect = TRUE;
+    remove_argument (N, &argc, argv);
+    Code = atoi (argv[N]);
+    remove_argument (N, &argc, argv);
   }
 
@@ -135 +145 @@
     if (PhotCodeSelect && (image[i].source != PHOTCODE)) continue;
     if ((NameSelect != (char *) NULL) && (strncasecmp (image[i].name, NameSelect, NameSelectLength))) continue;
+    if (CodeSelect && (image[i].code != Code)) continue;
 
     index[Nin] = i;
@@ -154 +165 @@
       if (photstr == (char *) NULL) photstr = PhotError;
       
-      fprintf (stdout, "%s %s %s  %7.4f %7.4f  %7.4f %d\n", image[i].name, photstr, timestr, 
-               0.001*image[i].Mcal, 0.001*image[i].dMcal, 0.001*image[i].secz, image[i].nstar); 
+      fprintf (stdout, "%s %s %s  %7.4f %7.4f  %7.4f %5d %02x\n", image[i].name, photstr, timestr, 
+               0.001*image[i].Mcal, 0.001*image[i].dMcal, 0.001*image[i].secz, image[i].nstar, image[i].code); 
       free (timestr);
     }

trunk/Ohana/src/imregister/src/imregtable.c

@@ -1 +1 @@
 # include "imregister.h"
 # include "imreg.h"
-static char *version = "imregtable $Revision: 3.2 $";
+static char *version = "imregtable $Revision: 3.3 $";
 
 int main (int argc, char **argv) {
@@ -27 +27 @@
   table.header = &theader;
   if (!fits_read_header (infile, &header))                   escape (UNLOCK, "can't open file header");
-  if (!fits_read_matrix (infile, &matrix, &header))          escape (UNLOCK, "can't open file matrix");
+  if (!fits_read_matrix (infile, &matrix))                   escape (UNLOCK, "can't open file matrix");
   if (!fits_read_ftable  (infile, &table, "IMAGE_DATABASE")) escape (UNLOCK, "can't open file table");