Changeset 75

Timestamp:

May 15, 2003, 11:22:51 PM (23 years ago)

Author:

eugene

Message:

altpath, TYPE/MODE const cleanup

Location:

trunk/Ohana/src/imregister/src

Files:

• detsearch.c (modified) (5 diffs)
• imregister.c (modified) (4 diffs)
• imsort.c (modified) (4 diffs)
• imstatreg.c (modified) (5 diffs)

trunk/Ohana/src/imregister/src/detsearch.c

@@ -1 +1 @@
 # include "imregister.h"
 # include "detrend.h"
-static char *version = "detsearch $Revision: 3.0 $";
+static char *version = "detsearch $Revision: 3.1 $";
 
 int main (int argc, char **argv) {
@@ -13 +13 @@
   args (argc, argv);
 
+  if (output.Criteria) PrintCriteria ();
+        
   status = load_db ();
   if (!status) {
@@ -18 +20 @@
     exit (0);
   }
-  if (!output.Modify && !output.Delete) close_db ();
+  if (!output.Modify && !output.Delete && !output.Altpath) close_db ();
   
   match = MatchCriteria (&Nmatch);          /* match basic criteria */
@@ -24 +26 @@
   match = CloseCriteria (match, &Nmatch);   /* reduce matches based on closeness */
 
-  if (output.Criteria) PrintCriteria ();
-        
   if (output.Select) {
     match = UniqueSubset (match, &Nmatch);
@@ -35 +35 @@
   }
 
+  if (output.Altpath) SetAltpath (match, Nmatch);
   if (output.Modify) ModifySubset (match, Nmatch);
   if (output.Delete) DeleteSubset (match, Nmatch);

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

@@ -1 +1 @@
 # include "imregister.h"
 # include "imreg.h"
-static char *version = "imregister $Revision: 3.1 $";
+static char *version = "imregister $Revision: 3.2 $";
 
 int main (int argc, char **argv) {
@@ -15 +15 @@
   /* define new entries (pimage, Nnew) */
   switch (image[0].mode) {
-  case MODE_CUBE:
+  case M_CUBE:
     Nnew = image[0].ccd + 1;
     ALLOCATE (pimage, RegImage, Nnew);
@@ -23 +23 @@
       pimage[i] = image[0]; 
       pimage[i].ccd = i - 1;
-      pimage[i].mode = MODE_SLICE;
+      pimage[i].mode = M_SLICE;
       pimage[i].obstime += *dtime*pimage[i].ccd;
     }
     break;
-  case MODE_MEF:
+  case M_MEF:
     Nnew = image[0].ccd;
     ALLOCATE (pimage, RegImage, Nnew);
@@ -35 +35 @@
     }
     break;
-  case MODE_SPLIT:
-  case MODE_SINGLE:
+  case M_SPLIT:
+  case M_SINGLE:
     Nnew = 1;
     pimage = &image[0];

trunk/Ohana/src/imregister/src/imsort.c

@@ -1 +1 @@
 # include "imregister.h"
 # include "imreg.h"
-static char *version = "imsort $Revision: 3.1 $";
+static char *version = "imsort $Revision: 3.2 $";
 
 int main (int argc, char **argv) {
@@ -15 +15 @@
   /* define new entries (pimage, Nnew) */
   switch (image[0].mode) {
-  case MODE_CUBE:
+  case M_CUBE:
     Nnew = image[0].ccd + 1;
     ALLOCATE (pimage, RegImage, Nnew);
@@ -23 +23 @@
       pimage[i] = image[0]; 
       pimage[i].ccd = i - 1;
-      pimage[i].mode = MODE_SLICE;
+      pimage[i].mode = M_SLICE;
       pimage[i].obstime += *dtime*pimage[i].ccd;
     }
     break;
-  case MODE_MEF:
+  case M_MEF:
     Nnew = image[0].ccd;
     ALLOCATE (pimage, RegImage, Nnew);
@@ -35 +35 @@
     }
     break;
-  case MODE_SPLIT:
-  case MODE_SINGLE:
+  case M_SPLIT:
+  case M_SINGLE:
     Nnew = 1;
     pimage = &image[0];

trunk/Ohana/src/imregister/src/imstatreg.c

@@ -1 +1 @@
 # include "imregister.h"
 # include "imreg.h"
-static char *version = "imstatreg $Revision: 3.2 $";
+static char *version = "imstatreg $Revision: 3.3 $";
 
 int main (int argc, char **argv) {
@@ -7 +7 @@
   RegImage *image;
   float *dtime;
-  int i, *match, Nmatch, status, child;
+  int i, *match, Nmatch, status, child, Nentry;
   char *TempDB, *LogFile;
+  FILE *f;
 
   get_version (argc, argv, version);
@@ -15 +16 @@
   if (CLIENT) imregclient (argv[1], argv[2], argv[3]);
 
+  /* create db.log and db.bfr */
   ALLOCATE (TempDB, char, strlen (ImageDB) + 10);
   sprintf (TempDB, "%s.bfr", ImageDB);
+  ALLOCATE (LogFile, char, strlen (ImageDB) + 10);
+  sprintf (LogFile, "%s.log", ImageDB);
 
   SetSignals ();
@@ -33 +37 @@
 
   /* redirect stderr, stdout to logfile */
-  ALLOCATE (LogFile, char, strlen (ImageDB) + 10);
-  sprintf (LogFile, "%s.log", ImageDB);
-  tmpfd = freopen (LogFile, "w", stderr);
-  if (tmpfd == (FILE *) NULL) 
-    fprintf (LogFile, "can't open log file %s, writing to stderr\n", LogFile);
+  f = freopen (LogFile, "w", stderr);
+  if (f == (FILE *) NULL) 
+    fprintf (stderr, "can't open log file %s, writing to stderr\n", LogFile);
   else 
-    stderr = tmpfd;
-  tmpfd = freopen (LogFile, "w", stdout);
-  if (tmpfd == (FILE *) NULL) 
-    fprintf (LogFile, "can't open log file %s, writing to stderr\n", LogFile);
+    stderr = f;
+  f = freopen (LogFile, "w", stdout);
+  if (f == (FILE *) NULL) 
+    fprintf (stderr, "can't open log file %s, writing to stderr\n", LogFile);
   else 
-    stdout = tmpfd;
+    stdout = f;
 
-    /* start loop */
+  /* start loop */
   while (1) {
 
-    fflush (stderr);
-    fflush (stdout);
     set_db (TempDB);
     status = load_db ();
     if (!status) {
       fprintf (stderr, "temporary database is empty\n");
-      close_db (); sleep (60); continue;
+      close_db (); 
+      fflush (stderr);
+      fflush (stdout);
+      sleep (60); 
+      continue;
     }
     image = get_images (&Nentry);
@@ -79 +83 @@
     unlink (TempDB);
     clearlockfile2 (TempDB, -1, LCK_HARD, &status);
+    fflush (stderr);
+    fflush (stdout);
     sleep (60);
   }
 }
-
-