Changeset 39377 for trunk/Ohana/src/relphot

Timestamp:

Feb 23, 2016, 4:53:15 PM (10 years ago)

Author:

eugene

Message:

clean up names for average object flags; add some additional flags for astrometry

Location:

trunk/Ohana/src/relphot/src

Files:

• ImageOps.c (modified) (1 diff)
• MosaicOps.c (modified) (2 diffs)
• StarOps.c (modified) (4 diffs)
• initialize.c (modified) (1 diff)
• relphot_images.c (modified) (1 diff)
• relphot_objects.c (modified) (1 diff)
• setMrelCatalog.c (modified) (1 diff)
• setMrelFinal.c (modified) (1 diff)

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

@@ -772 +772 @@
   if (PoorImages) {
     IMAGE_BAD = ID_IMAGE_PHOTOM_POOR | ID_IMAGE_PHOTOM_FEW | ID_IMAGE_PHOTOM_SKIP;
-    STAR_BAD  = ID_STAR_POOR | ID_STAR_FEW;
+    STAR_BAD  = ID_OBJ_POOR | ID_OBJ_FEW;
     MEAS_BAD  = ID_MEAS_NOCAL | ID_MEAS_POOR_PHOTOM | ID_MEAS_SKIP_PHOTOM | ID_MEAS_AREA;
   }

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

@@ -1036 +1036 @@
   if (PoorImages) {
     IMAGE_BAD = ID_IMAGE_PHOTOM_POOR | ID_IMAGE_PHOTOM_FEW | ID_IMAGE_PHOTOM_SKIP;
-    STAR_BAD  = ID_STAR_POOR | ID_STAR_FEW;
+    STAR_BAD  = ID_OBJ_POOR | ID_OBJ_FEW;
     MEAS_BAD  = ID_MEAS_NOCAL | ID_MEAS_POOR_PHOTOM | ID_MEAS_SKIP_PHOTOM | ID_MEAS_AREA;
   }
@@ -1351 +1351 @@
   if (PoorImages) {
     IMAGE_BAD = ID_IMAGE_PHOTOM_POOR | ID_IMAGE_PHOTOM_FEW | ID_IMAGE_PHOTOM_SKIP;
-    STAR_BAD  = ID_STAR_POOR | ID_STAR_FEW;
+    STAR_BAD  = ID_OBJ_POOR | ID_OBJ_FEW;
     MEAS_BAD  = ID_MEAS_NOCAL | ID_MEAS_POOR_PHOTOM | ID_MEAS_SKIP_PHOTOM | ID_MEAS_AREA;
   }

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

@@ -756 +756 @@
       if (N < Nminmeas) { /* too few measurements */
         // fprintf (f, "%10.6f %10.6f %d %d %d\n", catalog[Nc].averageT[j].R, catalog[Nc].averageT[j].D, catalog[Nc].measureT[catalog[Nc].averageT[j].measureOffset].imageID, N, STAR_TOOFEW); 
-        catalog[Nc].secfilt[Nsecfilt*j+Nsec].flags |= ID_STAR_FEW;
+        catalog[Nc].secfilt[Nsecfilt*j+Nsec].flags |= ID_OBJ_FEW;
         if (Ncode == 0) {
           results->Ncode ++;
@@ -764 +764 @@
         continue;
       } else {
-        catalog[Nc].secfilt[Nsecfilt*j+Nsec].flags &= ~ID_STAR_FEW;
+        catalog[Nc].secfilt[Nsecfilt*j+Nsec].flags &= ~ID_OBJ_FEW;
       } 
 
@@ -1108 +1108 @@
         mark = (dM > MaxScatter) || (isnan(Mchisq)) || (Mchisq > MaxChisq);
         if (mark) {
-          catalog[i].secfilt[Nsecfilt*j+Nsec].flags |= ID_STAR_POOR;
+          catalog[i].secfilt[Nsecfilt*j+Nsec].flags |= ID_OBJ_POOR;
           Ndel ++;
           if (dM > MaxScatter)   { Nscat ++; }
@@ -1114 +1114 @@
           if (Mchisq > MaxChisq) { Nchi ++; }
         } else {
-          catalog[i].secfilt[Nsecfilt*j+Nsec].flags &= ~ID_STAR_POOR;
+          catalog[i].secfilt[Nsecfilt*j+Nsec].flags &= ~ID_OBJ_POOR;
         }
         Nave ++;

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

@@ -32 +32 @@
 
   IMAGE_BAD = ID_IMAGE_PHOTOM_POOR | ID_IMAGE_PHOTOM_FEW | ID_IMAGE_PHOTOM_SKIP;
-  STAR_BAD  = ID_STAR_POOR | ID_STAR_FEW;
+  STAR_BAD  = ID_OBJ_POOR | ID_OBJ_FEW;
   MEAS_BAD  = ID_MEAS_NOCAL | ID_MEAS_POOR_PHOTOM | ID_MEAS_SKIP_PHOTOM | ID_MEAS_AREA;
 

trunk/Ohana/src/relphot/src/relphot_images.c

@@ -90 +90 @@
       int star_toofew;
 
-      // until we finish the grid analysis, do not reject stars out-of-hand based on ID_STAR_FEW
+      // until we finish the grid analysis, do not reject stars out-of-hand based on ID_OBJ_FEW
       // XXX this is kind of poor: need to have a better distinctions about STAR_BAD in setMrel vs getMrel
       star_toofew = STAR_TOOFEW;
       STAR_TOOFEW = 0;
       for (i = 0; i < NGRID; i++) {
-        STAR_BAD = ID_STAR_POOR;
+        STAR_BAD = ID_OBJ_POOR;
         setMrel  (catalog, Ncatalog, flatcorr);
-        STAR_BAD  = ID_STAR_POOR | ID_STAR_FEW;
+        STAR_BAD  = ID_OBJ_POOR | ID_OBJ_FEW;
         setMgrid (catalog, flatcorr);
       }
-      STAR_BAD  = ID_STAR_POOR | ID_STAR_FEW;
+      STAR_BAD  = ID_OBJ_POOR | ID_OBJ_FEW;
       STAR_TOOFEW = star_toofew;
     }

trunk/Ohana/src/relphot/src/relphot_objects.c

@@ -63 +63 @@
       Nsecfilt = catalog.Nsecfilt;
 
-      DVOAverageFlags astromBits = 
-        ID_STAR_FIT_AVE   | 
-        ID_STAR_FIT_PM    | 
-        ID_STAR_FIT_PAR   | 
-        ID_STAR_USE_AVE   | 
-        ID_STAR_USE_PM    | 
-        ID_STAR_USE_PAR   |
-        ID_STAR_NO_ASTROM ; 
+      DVOAverageFlags photomBits = 
+        ID_OBJ_EXT             | // extended in our data (eg, PS)
+        ID_OBJ_EXT_ALT         | // extended in external data (eg, 2MASS)
+        ID_OBJ_GOOD            | // good-quality measurement in our data (eg,PS)
+        ID_OBJ_GOOD_ALT        | // good-quality measurement in  external data (eg, 2MASS)
+        ID_OBJ_GOOD_STACK      | // good-quality object in the stack (> 1 good stack)
+        ID_OBJ_BEST_STACK      | // the primary stack measurement are the best measurements
+        ID_OBJ_SUSPECT_STACK   | // suspect object in the stack (> 1 good or suspect stack, < 2 good)
+        ID_OBJ_BAD_STACK;        // good-quality object in the stack (> 1 good stack)
       
       for (j = 0; j < catalog.Naverage; j++) {
-        catalog.average[j].flags &= astromBits; // reset all except astrometry bits
+        catalog.average[j].flags &= ~photomBits; // reset all except astrometry bits
         catalog.average[j].psfQF     = NAN;     // reset (will be re-calculated here)
         catalog.average[j].psfQFperf = NAN;     // reset (will be re-calculated here)

trunk/Ohana/src/relphot/src/setMrelCatalog.c

@@ -351 +351 @@
     int Nranking = magStatsByRanking (&results->psfData[Nsec], psfstats);
     if (Nranking < Nminmeas) { 
-      secfilt[Nsec].flags |= ID_STAR_FEW;
+      secfilt[Nsec].flags |= ID_OBJ_FEW;
     } else {
       secfilt[Nsec].M    = psfstats->mean;

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

@@ -104 +104 @@
   if (!simpleAverage) setMcalOutput (catalog, 1, flatcorr);
 
-  /* clear ID_STAR_POOR, ID_STAR_FEW values before writing ??? */
+  /* clear ID_OBJ_POOR, ID_OBJ_FEW values before writing ??? */
   /* ID_MEAS_NOCAL is an internal bit, so it should be cleared */
   // XXX eventually: move these internal flags to an internal-only catalog->FOO element (like found)
   for (i = 0; i < catalog[0].Naverage; i++) {
-    catalog[0].average[i].flags &= ~ID_STAR_FEW;
-    catalog[0].average[i].flags &= ~ID_STAR_POOR;
+    catalog[0].average[i].flags &= ~ID_OBJ_FEW;
+    catalog[0].average[i].flags &= ~ID_OBJ_POOR;
     off_t j;
     for (j = 0; j < Nsecfilt; j++) {
-        catalog[0].secfilt[i*Nsecfilt+j].flags &= ~ID_STAR_FEW; 
-        catalog[0].secfilt[i*Nsecfilt+j].flags &= ~ID_STAR_POOR; 
+        catalog[0].secfilt[i*Nsecfilt+j].flags &= ~ID_OBJ_FEW; 
+        catalog[0].secfilt[i*Nsecfilt+j].flags &= ~ID_OBJ_POOR; 
     }
     off_t m = catalog[0].average[i].measureOffset;