Changeset 15130

Timestamp:

Sep 29, 2007, 2:14:15 PM (19 years ago)

Author:

eugene

Message:

flags to dbFlags

Location:

trunk/Ohana/src/relastro/src

Files:

• MosaicOps.c (modified) (1 diff)
• bcatalog.c (modified) (1 diff)
• load_catalogs.c (modified) (1 diff)
• setExclusions.c (modified) (1 diff)

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

@@ -209 +209 @@
       c = clist[i][j];
       
-      if (catalog[c].measure[m].flags & (ID_MEAS_AREA | ID_MEAS_NOCAL)) continue;
+      if (catalog[c].measure[m].dbFlags & (ID_MEAS_AREA | ID_MEAS_NOCAL)) continue;
 
       ave = catalog[c].measure[m].averef;

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

@@ -69 +69 @@
       }
 
-      subcatalog[0].measure[Nmeasure].flags &= ~ID_MEAS_SKIP;
+      subcatalog[0].measure[Nmeasure].dbFlags &= ~ID_MEAS_SKIP;
       subcatalog[0].measure[Nmeasure]        = catalog[0].measure[offset];
       subcatalog[0].measure[Nmeasure].averef = Naverage;
       if (RESET) { 
         subcatalog[0].measure[Nmeasure].Mcal = 0;
-        subcatalog[0].measure[Nmeasure].flags &= 0xff00;
-        subcatalog[0].measure[Nmeasure].flags &= ~ID_MEAS_POOR;
-        subcatalog[0].measure[Nmeasure].flags &= ~ID_MEAS_AREA;
-        subcatalog[0].measure[Nmeasure].flags &= ~ID_MEAS_NOCAL;
+        subcatalog[0].measure[Nmeasure].dbFlags &= 0xff00;
+        subcatalog[0].measure[Nmeasure].dbFlags &= ~ID_MEAS_POOR;
+        subcatalog[0].measure[Nmeasure].dbFlags &= ~ID_MEAS_AREA;
+        subcatalog[0].measure[Nmeasure].dbFlags &= ~ID_MEAS_NOCAL;
       }
       Nmeasure ++;

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

@@ -39 +39 @@
           m = catalog[i].average[j].offset;
           for (k = 0; k < catalog[i].average[j].Nm; k++) {
-            catalog[i].measure[m+k].flags = 0;
+            catalog[i].measure[m+k].dbFlags = 0;
           }
         }

trunk/Ohana/src/relastro/src/setExclusions.c

@@ -39 +39 @@
 
       markbad:
-        catalog[i].measure[m].flags |= ID_MEAS_AREA;
+        catalog[i].measure[m].dbFlags |= ID_MEAS_AREA;
         Narea ++;
         continue;
         
       mark_nocal:
-        catalog[i].measure[m].flags |= ID_MEAS_NOCAL;
+        catalog[i].measure[m].dbFlags |= ID_MEAS_NOCAL;
         Nnocal ++;
         continue;