Changeset 34070

Timestamp:

Jun 25, 2012, 3:05:25 PM (14 years ago)

Author:

eugene

Message:

change of averaging rules. PASS 2: use stack mags if present; PASS 3 accept bad *and* outlier values

Location:

branches/eam_branches/ipp-20120601/Ohana/src/relphot/src

Files:

• StarOps.c (modified) (3 diffs)
• setMrelFinal.c (modified) (3 diffs)

branches/eam_branches/ipp-20120601/Ohana/src/relphot/src/StarOps.c

@@ -354 +354 @@
       int Next = 0;
       int haveSynth = FALSE;
+      int haveStack = FALSE;
 
       int forceSynth = FALSE;
@@ -413 +414 @@
             }
           }
+          // gpc1 stack data
+          if ((catalog[Nc].measure[m].photcode >= 11000) && (catalog[Nc].measure[m].photcode <= 11400)) {
+            if (pass < 2) continue;
+            haveStack = TRUE;
+          }
+
           // count extended detections for 2MASS (XXX NOTE hardwired photcodes 2011, 2012, 2013)
           if ((catalog[Nc].measure[m].photcode >= 2011) && (catalog[Nc].measure[m].photcode <= 2013)) {
@@ -494 +501 @@
       int Nminmeas = isSetMrelFinal ? 1 : STAR_TOOFEW + 1;
 
+      if (haveStack && (N > 1)) {
+        fprintf (stderr, "multiple stack values for %10.6f %10.6f\n", catalog[Nc].averageT[j].R, catalog[Nc].averageT[j].D);
+      }
+
       // when performing the grid analysis, STAR_TOOFEW should be set to 1;
       if (N < Nminmeas) { /* too few measurements */

branches/eam_branches/ipp-20120601/Ohana/src/relphot/src/setMrelFinal.c

@@ -166 +166 @@
 
   /* allow measures from images marked POOR and FEW */
-  if (pass >= 2) IMAGE_BAD = ID_IMAGE_PHOTOM_NOCAL;
+  if (pass >= 3) IMAGE_BAD = ID_IMAGE_PHOTOM_NOCAL;
   
   /* allow measures marked as outliers (POOR) and off image region (AREA) */
-  if (pass >= 2) {
+  if (pass >= 3) {
     MEAS_BAD = ID_MEAS_NOCAL | ID_MEAS_SKIP_PHOTOM;
   } else {
@@ -233 +233 @@
         }
 
-        // PASS 3 : accept bad measurements (eg, SAT, CR)
+        // PASS 3 : accept bad measurements (eg, SAT, CR), internal outliers
         if (pass < 3) {
           if (catalog[0].measure[m].photFlags & code->photomBadMask) goto skip;
@@ -241 +241 @@
         }
         
-        // PASS 2 : internal outliers accepted
+        // PASS 2 : accept stack measurements
 
         // PASS 1 : accept poor measurements as well (eg, POOR FIT, etc)