Changeset 2450

Timestamp:

Nov 24, 2004, 1:46:23 PM (22 years ago)

Author:

eugene

Message:

cleanups

Location:

trunk/Ohana/src/imregister/detrend

Files:

• args.detsearch.c (modified) (2 diffs)
• imdef.c (modified) (2 diffs)
• output.c (modified) (1 diff)
• unique.c (modified) (1 diff)

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

@@ -266 +266 @@
   }
  
-  output.Altpath = FALSE;
+  output.Altpath = NONE;
   if (N = get_argument (argc, argv, "-altpath")) {
     if (output.Delete) {
@@ -273 +273 @@
     }
     remove_argument (N, &argc, argv);
-    output.Altpath = TRUE;
+    if (!strcasecmp (argv[N], "add")) output.Altpath = ADD;
+    if (!strcasecmp (argv[N], "delete")) output.Altpath = DELETE;
+    if (!strcasecmp (argv[N], "update")) output.Altpath = UPDATE;
+    if (!output.Altpath) { 
+      fprintf (stderr, "invalid -altpath option\n");
+      exit (1);
+    }
+    remove_argument (N, &argc, argv);
   }
 

trunk/Ohana/src/imregister/detrend/imdef.c

@@ -44 +44 @@
   }
 
-  /* modes: a special case */
-  if (descriptor[0].type == T_MODES) {
-    descriptor[0].mode      = M_MODES;
-    descriptor[0].CCD       = Nccd;
-    descriptor[0].CCDSelect = TRUE;
-  }
-
   /* identify MODE (MEF / SPLIT)  */
   descriptor[0].mode = M_SPLIT;
@@ -63 +56 @@
       fprintf (stderr, "warning: NEXTEND != Nccd (%d, %d)\n", Nextend, Nccd);
     }      
+  }
+
+  /* modes: a special case */
+  if (descriptor[0].type == T_MODES) {
+    descriptor[0].mode      = M_MODES;
+    descriptor[0].CCD       = Nccd;
+    descriptor[0].CCDSelect = TRUE;
   }
 

trunk/Ohana/src/imregister/detrend/output.c

@@ -219 +219 @@
     filtstr = filterhash[MIN (MAX (detdata[i].filter, 0), NFILTER - 1)];
 
-    if (detdata[i].mode == M_SPLIT) {
+    if ((detdata[i].mode == M_SPLIT) && (detdata[i].ccd >= -1) && (detdata[i].ccd < Nccd)) {
       ccdstr   = ccds[detdata[i].ccd];
     } else {

trunk/Ohana/src/imregister/detrend/unique.c

@@ -96 +96 @@
 
   if (crit[0].tstart  > image[0].tstop) return (FALSE);
-  if (crit[0].tstop   < image[0].tstop) return (FALSE);
+  if (crit[0].tstop   < image[0].tstart) return (FALSE);
 
   /* we have overlapping time ranges.  set crit[0] to have the