Changeset 15038 for trunk/Ohana/src/relphot

Timestamp:

Sep 26, 2007, 5:34:27 PM (19 years ago)

Author:

eugene

Message:

various fixes to ensure data is carried from Stars to Measures correctly for PS1_DEV_1

Location:

trunk/Ohana/src/relphot/src

Files:

• GridOps.c (modified) (2 diffs)
• ImageOps.c (modified) (1 diff)
• MosaicOps.c (modified) (2 diffs)
• StarOps.c (modified) (6 diffs)
• bcatalog.c (modified) (1 diff)
• plot_scatter.c (modified) (1 diff)
• setExclusions.c (modified) (1 diff)
• setMrelFinal.c (modified) (4 diffs)

trunk/Ohana/src/relphot/src/GridOps.c

@@ -270 +270 @@
       c = clist[i][j];
       
-      if (catalog[c].measure[m].flags & MEAS_BAD) continue;
+      if (catalog[c].measure[m].dbFlags & MEAS_BAD) continue;
       Mcal = getMcal  (m, c);
       if (Mcal == NO_MAG) continue;
@@ -321 +321 @@
       c = clist[i][j];
       
-      if (catalog[c].measure[m].flags & MEAS_BAD) {
+      if (catalog[c].measure[m].dbFlags & MEAS_BAD) {
         Narea ++;
         continue;

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

@@ -195 +195 @@
       c = clist[i][j];
       
-      if (catalog[c].measure[m].flags & MEAS_BAD) continue;
+      if (catalog[c].measure[m].dbFlags & MEAS_BAD) continue;
       Mmos  = getMmos  (m, c);
       if (Mmos == NO_MAG) continue;

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

@@ -348 +348 @@
       if (Mcal == NO_MAG) continue;
       if (Mcal == NO_IMAGE) continue;
-      if (catalog[c].measure[m].flags & MEAS_BAD) continue;
+      if (catalog[c].measure[m].dbFlags & MEAS_BAD) continue;
       if ((Mgrid = getMgrid (m, c)) == NO_MAG) continue;
       if ((Mrel  = getMrel  (catalog, m, c)) == NO_MAG) continue;
@@ -593 +593 @@
       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/relphot/src/StarOps.c

@@ -51 +51 @@
       N = 0;
       for (k = 0; k < catalog[i].average[j].Nm; k++, m++) {
-        if (catalog[i].measure[m].flags & MEAS_BAD) continue;
+        if (catalog[i].measure[m].dbFlags & MEAS_BAD) continue;
         Mcal  = getMcal  (m, i);
         if (Mcal == NO_MAG) continue;
@@ -110 +110 @@
       m = catalog[i].average[j].offset;
       for (k = 0; k < catalog[i].average[j].Nm; k++, m++) {
-        if (catalog[i].measure[m].flags & MEAS_BAD) continue;
+        if (catalog[i].measure[m].dbFlags & MEAS_BAD) continue;
         Mcal  = getMcal  (m, i);
         if (Mcal == NO_MAG) continue;
@@ -158 +158 @@
       m = catalog[i].average[j].offset;
       for (k = 0; k < catalog[i].average[j].Nm; k++, m++) {
-        if (catalog[i].measure[m].flags & MEAS_BAD) continue;
+        if (catalog[i].measure[m].dbFlags & MEAS_BAD) continue;
         Mcal  = getMcal  (m, i);
         if (Mcal == NO_MAG) continue;
@@ -272 +272 @@
       N = 0;
       for (k = 0; k < catalog[i].average[j].Nm; k++, m++) {
-        /* if (catalog[i].measure[m].flags & MEAS_BAD) continue; */
+        /* if (catalog[i].measure[m].dbFlags & MEAS_BAD) continue; */
         Mcal  = getMcal  (m, i);
         if (Mcal == NO_MAG) continue;
@@ -308 +308 @@
       N = 0;
       for (k = 0; k < catalog[i].average[j].Nm; k++, m++) {
-        /* if (catalog[i].measure[m].flags & MEAS_BAD) continue; */
+        /* if (catalog[i].measure[m].dbFlags & MEAS_BAD) continue; */
         Mcal  = getMcal  (m, i);
         if (Mcal == NO_MAG) continue;
@@ -329 +329 @@
       for (k = 0; k < N; k++) {
         if (fabs (list[k] - stats.median) > Ns*stats.sigma) {
-          catalog[i].measure[ilist[k]].flags |= ID_MEAS_POOR;
+          catalog[i].measure[ilist[k]].dbFlags |= ID_MEAS_POOR;
           Ndel ++;
         }

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

@@ -66 +66 @@
       }
 
-      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/relphot/src/plot_scatter.c

@@ -27 +27 @@
 
       for (k = 0; k < catalog[i].average[j].Nm; k++, m++) {
-        if (catalog[i].measure[m].flags & MEAS_BAD) continue;
+        if (catalog[i].measure[m].dbFlags & MEAS_BAD) continue;
         Mcal  = getMcal  (m, i);
         if (Mcal == NO_MAG) continue;

trunk/Ohana/src/relphot/src/setExclusions.c

@@ -38 +38 @@
 
       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;

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

@@ -27 +27 @@
         
         catalog[0].measure[m].Mcal = 0;
-        catalog[0].measure[m].flags &= 0xff00;
-        catalog[0].measure[m].flags &= ~ID_MEAS_POOR;
-        catalog[0].measure[m].flags &= ~ID_MEAS_SKIP;
-        catalog[0].measure[m].flags &= ~ID_MEAS_AREA;
-        catalog[0].measure[m].flags &= ~ID_MEAS_NOCAL;
+        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_AREA;
+        catalog[0].measure[m].dbFlags &= ~ID_MEAS_NOCAL;
       }
     }
@@ -58 +58 @@
     m = catalog[0].average[i].offset;
     for (j = 0; j < catalog[0].average[i].Nm; j++, m++) {
-      catalog[0].measure[m].flags &= ~ID_MEAS_NOCAL;
+      catalog[0].measure[m].dbFlags &= ~ID_MEAS_NOCAL;
     }
   }
@@ -88 +88 @@
 
       /* clear SKIP for all measures at first */
-      catalog[0].measure[m].flags &= ~ID_MEAS_SKIP;
+      catalog[0].measure[m].dbFlags &= ~ID_MEAS_SKIP;
 
       /** never use these measurements (wrong photcode, bad time range) */
@@ -129 +129 @@
 
     skip:
-      catalog[0].measure[m].flags |= ID_MEAS_SKIP;
+      catalog[0].measure[m].dbFlags |= ID_MEAS_SKIP;
       Nskip ++;
     }