Changeset 21508 for trunk/Ohana/src/relastro

Timestamp:

Feb 16, 2009, 11:33:52 AM (17 years ago)

Author:

eugene

Message:

merge changes from eam_branch_20090208: add PS1_V1 formats; rename average.code to flags, image.code to flags; some opihi function name clarification; drop Stars as autocode struct; rework addstar to isolate input -> Measure conversions

Location:

trunk/Ohana/src/relastro

Files:

• include/relastro.h (modified) (1 diff)
• src/MosaicOps.c (modified) (1 diff)
• src/UpdateObjects.c (modified) (1 diff)
• src/bcatalog.c (modified) (2 diffs)
• src/load_catalogs.c (modified) (1 diff)
• src/relastro_objects.c (modified) (1 diff)
• src/select_images.c (modified) (2 diffs)

trunk/Ohana/src/relastro/include/relastro.h

@@ -61 +61 @@
   short Xm;
   float secz;
-  char code;
+  char flags;
   Coords coords;
 } Mosaic; 

trunk/Ohana/src/relastro/src/MosaicOps.c

@@ -47 +47 @@
     mosaic[Nmosaic].dMcal = 0.0;
     mosaic[Nmosaic].Xm    = 0.0;
-    mosaic[Nmosaic].code  = image[i].code;
+    mosaic[Nmosaic].flags  = image[i].flags;
     mosaic[Nmosaic].secz  = image[i].secz;
     mosaic[Nmosaic].coords = image[i].coords;

trunk/Ohana/src/relastro/src/UpdateObjects.c

@@ -169 +169 @@
       // position, consider including the lower-quality detections
 
-      catalog[i].average[j].code &= ~ID_STAR_FEW;
+      catalog[i].average[j].flags &= ~ID_STAR_FEW;
 
       // XXX add the parallax factor range as a criterion as well

trunk/Ohana/src/relastro/src/bcatalog.c

@@ -36 +36 @@
       // XXX define astrometry vs photometry average.dbFlags
       // XXX put photometry flags in secfilt (ie, per average mag?)
-      subcatalog[0].average[Naverage].code &= ~ID_STAR_FEW;
-      subcatalog[0].average[Naverage].code &= ~ID_STAR_POOR;
+      subcatalog[0].average[Naverage].flags &= ~ID_STAR_FEW;
+      subcatalog[0].average[Naverage].flags &= ~ID_STAR_POOR;
     }
 
@@ -70 +70 @@
 
       /* select measurements by quality */
-      if (DophotSelect && (catalog[0].measure[offset].dophot != DophotValue)) continue;
+      // XXX FIX THIS!!
+      // if (DophotSelect && (catalog[0].measure[offset].dophot != DophotValue)) continue;
 
       /* select measurements by quality */

trunk/Ohana/src/relastro/src/load_catalogs.c

@@ -38 +38 @@
       if (RESET) {
         for (j = 0; j < catalog[i].Naverage; j++) {
-          catalog[i].average[j].code = 0;
+          catalog[i].average[j].flags = 0;
           m = catalog[i].average[j].measureOffset;
           for (k = 0; k < catalog[i].average[j].Nmeasure; k++) {

trunk/Ohana/src/relastro/src/relastro_objects.c

@@ -40 +40 @@
     if (RESET) {
       for (j = 0; j < catalog.Naverage; j++) {
-        catalog.average[j].code = 0;
+        catalog.average[j].flags = 0;
         m = catalog.average[j].measureOffset;
         for (k = 0; k < catalog.average[j].Nmeasure; k++) {

trunk/Ohana/src/relastro/src/select_images.c

@@ -147 +147 @@
       image[nimage] = timage[i]; 
       /* always allow 'few' images to succeed, if possible */
-      if (image[nimage].code & ID_IMAGE_FEW) { 
-        image[nimage].code &= ~(ID_IMAGE_FEW | ID_IMAGE_POOR);
+      if (image[nimage].flags & ID_IMAGE_FEW) { 
+        image[nimage].flags &= ~(ID_IMAGE_FEW | ID_IMAGE_POOR);
       }
       if (RESET) {
@@ -154 +154 @@
         assignMcal (&image[nimage], (double *) NULL, -1);
         image[nimage].dMcal = NAN;
-        image[nimage].code &= ~ID_IMAGE_POOR;
+        image[nimage].flags &= ~ID_IMAGE_POOR;
       }
       line_number[nimage] = i;