Changeset 33566

Timestamp:

Mar 17, 2012, 3:21:00 PM (14 years ago)

Author:

eugene

Message:

used named values for masks, more info in verbosity

Location:

branches/eam_branches/ipp-20111122/Ohana/src/relastro

Files:

• include/relastro.h (modified) (1 diff)
• src/FitChip.c (modified) (3 diffs)
• src/ImageOps.c (modified) (2 diffs)
• src/UpdateChips.c (modified) (1 diff)

branches/eam_branches/ipp-20111122/Ohana/src/relastro/include/relastro.h

@@ -20 +20 @@
 
 typedef enum {TARGET_NONE, TARGET_SIMPLE, TARGET_CHIPS, TARGET_MOSAICS, TARGET_HIGH_SPEED, TARGET_MERGE_SOURCE, TARGET_UPDATE_OBJECTS, TARGET_UPDATE_OFFSETS, TARGET_LOAD_OBJECTS} FitTarget;
+
+typedef enum {
+  MARK_MEAS_DEFAULT  = 0x0000,
+  MARK_TOO_FEW_MEAS  = 0x0001,
+  MARK_NAN_POS_ERROR = 0x0002,
+  MARK_NAN_MAG_ERROR = 0x0004,
+  MARK_BIG_MAG_ERROR = 0x0008,
+  MARK_BIG_OFFSET    = 0x0010,
+} MeasurementMask;
 
 typedef struct {

branches/eam_branches/ipp-20111122/Ohana/src/relastro/src/FitChip.c

@@ -27 +27 @@
       if (raw[i].mask) continue;
       if (isnan(raw[i].dMag)) { 
-        raw[i].mask |= 0x0004; 
+        raw[i].mask |= MARK_NAN_MAG_ERROR; 
         continue; 
       }
       if (raw[i].dMag > SIGMA_LIM) { 
-        raw[i].mask |= 0x0008; 
+        raw[i].mask |= MARK_BIG_MAG_ERROR; 
         continue; 
       } // is this redundant with ImageOps.c:915?
@@ -39 +39 @@
       dR = hypot (dL, dM);
       if (dR > dRmax) {
-        raw[i].mask |= 0x0010;
+        raw[i].mask |= MARK_BIG_OFFSET;
         continue;
       }
@@ -114 +114 @@
   for (i = 0; i < Nmatch; i++) {
     if (!raw[i].mask) continue;
-    if (raw[i].mask & 0x01) nMask1 ++;
-    if (raw[i].mask & 0x02) nMask2 ++;
-    if (raw[i].mask & 0x04) nMask3 ++;
-    if (raw[i].mask & 0x08) nMask4 ++;
-    if (raw[i].mask & 0x10) nMask5 ++;
+    if (raw[i].mask & MARK_TOO_FEW_MEAS ) nMask1 ++;
+    if (raw[i].mask & MARK_NAN_POS_ERROR) nMask2 ++;
+    if (raw[i].mask & MARK_NAN_MAG_ERROR) nMask3 ++;
+    if (raw[i].mask & MARK_BIG_MAG_ERROR) nMask4 ++;
+    if (raw[i].mask & MARK_BIG_OFFSET   ) nMask5 ++;
   }
 
   GetScatterRawRef(&dLsigFull, &dMsigFull, &dRsigFull, &NstatFull, raw, ref, Nmatch, SIGMA_LIM);
-  GetScatterRawRef(&dLsig, &dMsig, &dRsig, &Nstat, raw, ref, Nmatch, IMFIT_SYS_SIGMA_LIM);
+  GetScatterRawRef(&dLsig,     &dMsig,     &dRsig,     &Nstat,     raw, ref, Nmatch, IMFIT_SYS_SIGMA_LIM);
 
   int Nm = 0;

branches/eam_branches/ipp-20111122/Ohana/src/relastro/src/ImageOps.c

@@ -181 +181 @@
   }
 
-  for (i = 0; VERBOSE2 && (i < Nimage); i++) {
+  for (i = 0; VERBOSE && (i < Nimage); i++) {
     name = GetPhotcodeNamebyCode (image[i].photcode);
-    fprintf (stderr, "image "OFF_T_FMT" has "OFF_T_FMT" measures (%s, %s)\n",  i,  N_onImage[i],
+    fprintf (stderr, "image "OFF_T_FMT" (%d, %s) has "OFF_T_FMT" of %d measures (%s, %s)\n",  i,  image[i].imageID, image[i].name, N_onImage[i], image[i].nstar,
              ohana_sec_to_date(image[i].tzero), name);
   }
@@ -607 +607 @@
     // an object with only one detection provides no information about the image calibration
     // XXX this is already taken care of in bcatalog
-    raw[i].mask = 0x0000;
+    raw[i].mask = MARK_MEAS_DEFAULT;
     if (catalog[c].average[n].Nmeasure <= SRC_MEAS_TOOFEW) {
-      raw[i].mask |= 0x0001;
+      raw[i].mask |= MARK_TOO_FEW_MEAS;
     }
     if (!finite(measure[0].dR) || !finite(measure[0].dD)) {
-      raw[i].mask |= 0x0002;
+      raw[i].mask |= MARK_NAN_POS_ERROR;
     }
     raw[i].Nmeas = catalog[c].average[n].Nmeasure; // record so we can check how well connected an image is

branches/eam_branches/ipp-20111122/Ohana/src/relastro/src/UpdateChips.c

@@ -62 +62 @@
     // fprintf (stderr, "image "OFF_T_FMT" : Nstars: "OFF_T_FMT"\n",  i,  Nraw);
     if (!FitChip (raw, ref, Nraw, &image[i])) {
-      if (VERBOSE) fprintf (stderr, "reject fit for image %s ("OFF_T_FMT") : Nstars: "OFF_T_FMT"\n", image[i].name,  i,  Nraw);
+      if (VERBOSE) fprintf (stderr, "reject fit for image %s ("OFF_T_FMT") : Nstars: "OFF_T_FMT" of %d\n", image[i].name,  i,  Nraw, image[i].nstar);
 
       // restore status quo ante