Changeset 17201

Timestamp:

Mar 28, 2008, 3:35:27 PM (18 years ago)

Author:

eugene

Message:

split measure flags into photom and astrom

Location:

trunk/Ohana/src

Files:

• opihi/dvo/dbExtractAverages.c (modified) (1 diff)
• opihi/dvo/extract.c (modified) (1 diff)
• relphot/src/ImageOps.c (modified) (1 diff)
• relphot/src/MosaicOps.c (modified) (1 diff)
• relphot/src/StarOps.c (modified) (1 diff)
• relphot/src/bcatalog.c (modified) (2 diffs)
• relphot/src/initialize.c (modified) (1 diff)
• relphot/src/setMrelFinal.c (modified) (5 diffs)

trunk/Ohana/src/opihi/dvo/dbExtractAverages.c

@@ -197 +197 @@
       for (i = 0; i < average[0].Nm; i++) {
         if (field->photcode->code != GetPhotcodeEquivCodebyCode (measure[i].photcode)) continue;
-        if (measure[i].flags & (ID_MEAS_POOR | ID_MEAS_SKIP)) continue;
+        if (measure[i].flags & (ID_MEAS_POOR_PHOTOM | ID_MEAS_SKIP_PHOTOM)) continue;
         value ++;
       }

trunk/Ohana/src/opihi/dvo/extract.c

@@ -357 +357 @@
           for (k = 0; k < catalog.average[i].Nm; k++, m++) {
             if (code[0].code != GetPhotcodeEquivCodebyCode (catalog.measure[m].photcode)) continue;
-            if (catalog.measure[m].photcode & (ID_MEAS_POOR | ID_MEAS_SKIP)) continue;
+            if (catalog.measure[m].photcode & (ID_MEAS_POOR_PHOTOM | ID_MEAS_SKIP_PHOTOM)) continue;
             Ncode ++;
           }

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

@@ -239 +239 @@
     IMAGE_BAD = ID_IMAGE_POOR | ID_IMAGE_FEW | ID_IMAGE_SKIP;
     STAR_BAD  = ID_STAR_POOR | ID_STAR_FEW;
-    MEAS_BAD  = ID_MEAS_NOCAL | ID_MEAS_POOR | ID_MEAS_SKIP | ID_MEAS_AREA;
+    MEAS_BAD  = ID_MEAS_NOCAL | ID_MEAS_POOR_PHOTOM | ID_MEAS_SKIP_PHOTOM | ID_MEAS_AREA;
   }
   return;

trunk/Ohana/src/relphot/src/MosaicOps.c

@@ -389 +389 @@
     IMAGE_BAD = ID_IMAGE_POOR | ID_IMAGE_FEW | ID_IMAGE_SKIP;
     STAR_BAD  = ID_STAR_POOR | ID_STAR_FEW;
-    MEAS_BAD  = ID_MEAS_NOCAL | ID_MEAS_POOR | ID_MEAS_SKIP | ID_MEAS_AREA;
+    MEAS_BAD  = ID_MEAS_NOCAL | ID_MEAS_POOR_PHOTOM | ID_MEAS_SKIP_PHOTOM | ID_MEAS_AREA;
   }
   return (TRUE);

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

@@ -328 +328 @@
       for (k = 0; k < N; k++) {
         if (fabs (list[k] - stats.median) > Ns*stats.sigma) {
-          catalog[i].measure[ilist[k]].dbFlags |= ID_MEAS_POOR;
+          catalog[i].measure[ilist[k]].dbFlags |= ID_MEAS_POOR_PHOTOM;
           Ndel ++;
         }

trunk/Ohana/src/relphot/src/bcatalog.c

@@ -71 +71 @@
       }
 
-      subcatalog[0].measure[Nmeasure].dbFlags &= ~ID_MEAS_SKIP;
+      subcatalog[0].measure[Nmeasure].dbFlags &= ~ID_MEAS_SKIP_PHOTOM;
       subcatalog[0].measure[Nmeasure]        = catalog[0].measure[offset];
       subcatalog[0].measure[Nmeasure].averef = Naverage;
@@ -77 +77 @@
         subcatalog[0].measure[Nmeasure].Mcal = 0;
         subcatalog[0].measure[Nmeasure].dbFlags &= 0xff00;
-        subcatalog[0].measure[Nmeasure].dbFlags &= ~ID_MEAS_POOR;
+        subcatalog[0].measure[Nmeasure].dbFlags &= ~ID_MEAS_POOR_PHOTOM;
         subcatalog[0].measure[Nmeasure].dbFlags &= ~ID_MEAS_AREA;
         subcatalog[0].measure[Nmeasure].dbFlags &= ~ID_MEAS_NOCAL;

trunk/Ohana/src/relphot/src/initialize.c

@@ -25 +25 @@
   IMAGE_BAD = ID_IMAGE_POOR | ID_IMAGE_FEW | ID_IMAGE_SKIP;
   STAR_BAD  = ID_STAR_POOR | ID_STAR_FEW;
-  MEAS_BAD  = ID_MEAS_NOCAL | ID_MEAS_POOR | ID_MEAS_SKIP | ID_MEAS_AREA;
+  MEAS_BAD  = ID_MEAS_NOCAL | ID_MEAS_POOR_PHOTOM | ID_MEAS_SKIP_PHOTOM | ID_MEAS_AREA;
 
   if (SHOW_PARAMS) {

trunk/Ohana/src/relphot/src/setMrelFinal.c

@@ -28 +28 @@
         catalog[0].measure[m].Mcal = 0;
         catalog[0].measure[m].dbFlags &= 0xff00;
-        catalog[0].measure[m].dbFlags &= ~ID_MEAS_POOR;
-        catalog[0].measure[m].dbFlags &= ~ID_MEAS_SKIP;
+        catalog[0].measure[m].dbFlags &= ~ID_MEAS_POOR_PHOTOM;
+        catalog[0].measure[m].dbFlags &= ~ID_MEAS_SKIP_PHOTOM;
         catalog[0].measure[m].dbFlags &= ~ID_MEAS_AREA;
         catalog[0].measure[m].dbFlags &= ~ID_MEAS_NOCAL;
@@ -47 +47 @@
     skip_measurements (catalog, i);       /* set ID_MEAS_SKIP for measures to be skipped */
     setMrelOutput  (catalog, 1, FALSE);   /* set Mrel using all measures not skipped */
-    clean_measures (catalog, 1, TRUE);    /* mark outliers ID_MEAS_POOR */
+    clean_measures (catalog, 1, TRUE);    /* mark outliers ID_MEAS_POOR_PHOTOM */
     setMrelOutput  (catalog, 1, TRUE);    /* set Mrel using remaining measures */
   }
@@ -76 +76 @@
   
   /* allow measures marked as outliers (POOR) and off image region (AREA) */
-  if (pass >= 3) MEAS_BAD = ID_MEAS_NOCAL | ID_MEAS_SKIP;
+  if (pass >= 3) MEAS_BAD = ID_MEAS_NOCAL | ID_MEAS_SKIP_PHOTOM;
 
   /* mark measures which should be ignored on second pass */
@@ -88 +88 @@
 
       /* clear SKIP for all measures at first */
-      catalog[0].measure[m].dbFlags &= ~ID_MEAS_SKIP;
+      catalog[0].measure[m].dbFlags &= ~ID_MEAS_SKIP_PHOTOM;
 
       /** never use these measurements (wrong photcode, bad time range) */
@@ -129 +129 @@
 
     skip:
-      catalog[0].measure[m].dbFlags |= ID_MEAS_SKIP;
+      catalog[0].measure[m].dbFlags |= ID_MEAS_SKIP_PHOTOM;
       Nskip ++;
     }