Changeset 27772

Timestamp:

Apr 26, 2010, 8:16:13 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/eam_branches/Ohana.20100407

Files:

• . (modified) (1 prop)
• src/dvomerge/src/merge_catalogs_old.c (modified) (4 diffs)
• src/getstar/src/select_by_region.c (modified) (8 diffs)
• src/libkapa/src/KiiPicture.c (modified) (3 diffs)
• src/opihi/cmd.data/section.c (modified) (1 diff)

branches/eam_branches/Ohana.20100407/src/dvomerge/src/merge_catalogs_old.c

@@ -10 +10 @@
 int merge_catalogs_old (SkyRegion *region, Catalog *output, Catalog *input, double RADIUS) {
 
-  off_t i, j, n, N, Nin, offset, J, Jmin, status, Nstars;
+  off_t i, j, Nin, offset, J, Jmin, status, Nstars;
   double RADIUS2, Rmin, Rin, Din;
   double *X1, *Y1, *X2, *Y2;
@@ -152 +152 @@
     /*** a match is found, add to average, measure ***/
     Nmatch ++;
-    n = N2[Jmin];
-    N = N1[i];
+    off_t n = N2[Jmin];
+    off_t N = N1[i];
 
     /* make sure there is space for next Nmeasure entries */
@@ -223 +223 @@
   /* these new entries are all written out in UPDATE mode */ 
   for (i = 0; i < Nstars; i++) {
+    off_t N = N1[i];
+
     /* make sure there is space for next entry */
     if (Nmeas + input[0].average[N].Nmeasure >= NMEAS) {
@@ -235 +237 @@
     }
 
-    N = N1[i];
     if (input[0].found[N] >= 0) continue;
     if (!IN_REGION (input[0].average[N].R, input[0].average[N].D)) continue;

branches/eam_branches/Ohana.20100407/src/getstar/src/select_by_region.c

@@ -15 +15 @@
   /* identify selection criteria */
   if (VERBOSE) fprintf (stderr, "extracting for time range %d to %d\n", start, end);
-  if (VERBOSE) fprintf (stderr, "extracting for region %f,%f to %f,%f\n", 
-                        region[0].Rmin, region[0].Dmin, region[0].Rmax, region[0].Dmax);
+  if (VERBOSE) fprintf (stderr, "extracting for region %f,%f to %f,%f\n",
+                        region[0].Rmin, region[0].Dmin, region[0].Rmax, region[0].Dmax);
 
   if (output[0].header.buffer != NULL) {
@@ -54 +54 @@
     if (VERBOSE) fprintf (stderr, "extracting from catalog covering region %f,%f to %f,%f\n", Rmin, Dmin, Rmax, Dmax);
 
-    AREA = fabs(Dmax - Dmin) * fabs(Rmax - Rmin) * cos (0.5*RAD_DEG*(Dmax + Dmin));  
+    AREA = fabs(Dmax - Dmin) * fabs(Rmax - Rmin) * cos (0.5*RAD_DEG*(Dmax + Dmin));
     assert (AREA > 0);
 
@@ -70 +70 @@
       mag = NAN;
       if (Nsec != -1) {
-        mag = catalog[0].secfilt[i*Nsecfilt + Nsec].M;
+        mag = catalog[0].secfilt[i*Nsecfilt + Nsec].M;
       } else {
-        offset = catalog[0].average[i].measureOffset;
-        for (m = 0; m < catalog[0].average[i].Nmeasure; m++) {
-          if (catalog[0].measure[offset + m].photcode == code) {
-            mag = PhotRel (&catalog[0].measure[offset + m], &catalog[0].average[i], &catalog[0].secfilt[i*Nsecfilt]);
-            break;
-          }
-        }
+        offset = catalog[0].average[i].measureOffset;
+        for (m = 0; m < catalog[0].average[i].Nmeasure; m++) {
+          if (catalog[0].measure[offset + m].photcode == code) {
+            mag = PhotRel (&catalog[0].measure[offset + m], &catalog[0].average[i], &catalog[0].secfilt[i*Nsecfilt]);
+            break;
+          }
+        }
       }
       if (isnan(mag)) continue;
@@ -88 +88 @@
       Nmag[bin] ++;
     }
-      
+
     if (!MinMagUse) MinMagValue = MagMin;
     bin = (MinMagValue - MagMin) / dMag;
@@ -106 +106 @@
     R = catalog[0].average[i].R;
     D = catalog[0].average[i].D;
-    
-    if (R < region[0].Rmin) continue;
-    if (R > region[0].Rmax) continue;
+
+    if (region[0].Rmin > region[0].Rmax) {
+        // Rmin > Rmax : R may either be > Rmin or < Rmax:
+        if ((R > region[0].Rmin) && (R < region[0].Rmax)) continue;
+    } else {
+        if (R < region[0].Rmin) continue;
+        if (R > region[0].Rmax) continue;
+    }
     if (D < region[0].Dmin) continue;
     if (D > region[0].Dmax) continue;
@@ -115 +120 @@
       mag = NAN;
       if (Nsec != -1) {
-        mag = catalog[0].secfilt[i*Nsecfilt + Nsec].M;
+        mag = catalog[0].secfilt[i*Nsecfilt + Nsec].M;
       } else {
-        offset = catalog[0].average[i].measureOffset;
-        for (m = 0; m < catalog[0].average[i].Nmeasure; m++) {
-          if (catalog[0].measure[offset + m].photcode == code) {
-            mag = PhotRel (&catalog[0].measure[offset + m], &catalog[0].average[i], &catalog[0].secfilt[i*Nsecfilt]);
-            break;
-          }
-        }
+        offset = catalog[0].average[i].measureOffset;
+        for (m = 0; m < catalog[0].average[i].Nmeasure; m++) {
+          if (catalog[0].measure[offset + m].photcode == code) {
+            mag = PhotRel (&catalog[0].measure[offset + m], &catalog[0].average[i], &catalog[0].secfilt[i*Nsecfilt]);
+            break;
+          }
+        }
       }
       if (isnan(mag) || (mag > MagLimitValue)) continue;
@@ -141 +146 @@
       output[0].measure[Nmeas].averef = Nave;
       Nmeas ++;
-      
+
       CHECK_REALLOCATE (output[0].measure, Measure, NMEAS, Nmeas, 1000);
-    }      
+    }
 
     Nave ++;
@@ -157 +162 @@
 
   fprintf (stderr, "output catalog has %lld stars (%lld measures, %d secfilt)\n",
-           (long long) output[0].Naverage, (long long) output[0].Nmeasure, output[0].Nsecfilt);
+           (long long) output[0].Naverage, (long long) output[0].Nmeasure, output[0].Nsecfilt);
   return (TRUE);
 }

branches/eam_branches/Ohana.20100407/src/libkapa/src/KiiPicture.c

@@ -46 +46 @@
   Nwrite = write (fd, image[0].data1d, size);
   if (Nwrite != size) {
-    fprintf (stderr, "error reading picture\n");
+    fprintf (stderr, "error sending picture to kapa\n");
     return (FALSE);
   }
@@ -105 +105 @@
   Nwrite = write (fd, outbuffer, size);
   if (Nwrite != size) {
-    fprintf (stderr, "error reading picture\n");
+    fprintf (stderr, "error sending picture to kapa\n");
     return (FALSE);
   }
@@ -142 +142 @@
     Nbytes = image[0].Nx*sizeof(float);
     Nwrite = write (fd, image[0].data2d[j], Nbytes);
-    if (Nwrite != size) {
-      fprintf (stderr, "error reading picture\n");
+    if (Nwrite != Nbytes) {
+      fprintf (stderr, "error sending picture to kapa\n");
       return (FALSE);
     }

branches/eam_branches/Ohana.20100407/src/opihi/cmd.data/section.c

@@ -42 +42 @@
   if ((N = get_argument (argc, argv, "-bg"))) {
     remove_argument (N, &argc, argv);
-    if (!strcascmp (argv[N], "NONE")) {
+    if (!strcasecmp (argv[N], "NONE")) {
       background = -1;
     } else {