Changeset 27586

Timestamp:

Apr 2, 2010, 3:59:22 PM (16 years ago)

Author:

eugene

Message:

added support in relphot for a hard reference photcode (to tie down images against an external reference)

Location:

trunk/Ohana/src/relphot

Files:

• include/relphot.h (modified) (2 diffs)
• src/ImageOps.c (modified) (2 diffs)
• src/StarOps.c (modified) (1 diff)
• src/args.c (modified) (3 diffs)

trunk/Ohana/src/relphot/include/relphot.h

@@ -52 +52 @@
 
 int    VERBOSE;
+int    VERBOSE2;
 int    MOSAIC_ZEROPT;
 
@@ -84 +85 @@
 int            PhotNsec;
 int            PhotSec;
+
+PhotCode      *refPhotcode;
 
 int AreaSelect;

trunk/Ohana/src/relphot/src/ImageOps.c

@@ -193 +193 @@
   idx = getImageByID (ID);
   if (idx == -1) {
-    fprintf (stderr, "can't match detection to image?\n");
-    abort();
+    if (VERBOSE2) fprintf (stderr, "can't match detection to image?\n");
+    return;
   }
 
@@ -200 +200 @@
     status = findCCD (idx, meas, cat, measure);
     if (!status) {
-      fprintf (stderr, "failed to determine CCD for %lld, %d\n", (long long) meas, cat);
-      abort();
+      if (VERBOSE2) fprintf (stderr, "failed to determine CCD for %lld, %d\n", (long long) meas, cat);
+      return;
     }
   }

trunk/Ohana/src/relphot/src/StarOps.c

@@ -84 +84 @@
         list[N] = Msys - Mcal - Mmos - Mgrid;
         dlist[N] = MAX (catalog[i].measure[m].dM, MIN_ERROR);
+
+        if (refPhotcode) {
+          if (GetPhotcodeEquivCodebyCode(catalog[i].measure[m].photcode) == refPhotcode[0].equiv) {
+            // increase the weight by a factor of 100:
+            dlist[N] = 0.01*catalog[i].measure[m].dM;
+          }
+        }
         N++;
       }

trunk/Ohana/src/relphot/src/args.c

@@ -53 +53 @@
   }
 
-  VERBOSE = FALSE;
+  VERBOSE = VERBOSE2 = FALSE;
   if ((N = get_argument (argc, argv, "-v"))) {
     VERBOSE = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+  if ((N = get_argument (argc, argv, "-vv"))) {
+    VERBOSE2 = VERBOSE = TRUE;
     remove_argument (N, &argc, argv);
   }
@@ -205 +209 @@
   }
 
+  refPhotcode = NULL;
+  if ((N = get_argument (argc, argv, "-refcode"))) {
+    remove_argument (N, &argc, argv);
+    refPhotcode = GetPhotcodebyName (argv[N]);
+    if (!refPhotcode) {
+      fprintf (stderr, "ERROR: photcode %s not found in photcode table\n", argv[N]);
+      exit (1);
+    }
+    remove_argument (N, &argc, argv);
+  }
+
   UpdateAverages = FALSE;
   if ((N = get_argument (argc, argv, "-averages"))) {
@@ -224 +239 @@
   fprintf (stderr, "  options: \n");
   fprintf (stderr, "  -time (start) (stop)\n");
-  fprintf (stderr, "  -v\n");
+  fprintf (stderr, "  -v : verbose output\n");
+  fprintf (stderr, "  -vv : more verbose output\n");
   fprintf (stderr, "  -outroot (outroot)\n");
   fprintf (stderr, "  -plot\n");
   fprintf (stderr, "  -plotdelay (seconds)\n");
   fprintf (stderr, "  -statmode (mode)\n");
+  fprintf (stderr, "  -refcode (name) : give extra weight to this photcode\n");
   fprintf (stderr, "  -n (nloop)\n");
   fprintf (stderr, "  -reset\n");