Changeset 25152

Timestamp:

Aug 20, 2009, 11:50:55 AM (17 years ago)

Author:

watersc1

Message:

 

Location:

branches/czw_branch/cleanup

Files:

• Ohana/src/getstar/src/MatchCoords.c (modified) (2 diffs)
• ppStack/src/ppStackCombineFinal.c (modified) (1 diff)

branches/czw_branch/cleanup/Ohana/src/getstar/src/MatchCoords.c

@@ -40 +40 @@
     // Xi[4] = Xi[0]; Yi[4] = Yi[0];
 
-
     ymin = xmin = +FLT_MAX;
     ymax = xmax = -FLT_MAX;
@@ -52 +51 @@
     // transform input point to image coords
     double x, y;
-    RD_to_XY(&x, &y, ra, dec, &dbImages[i].coords);
+    int status = RD_to_XY(&x, &y, ra, dec, &dbImages[i].coords);
+
+    if (!status) {
+        // avoid matching antipodal skycells
+        continue;
+    }
 
     if ((x >= xmin && x <= xmax) && (y >= ymin && y <= ymax)) {

branches/czw_branch/cleanup/ppStack/src/ppStackCombineFinal.c

@@ -60 +60 @@
         sumWeights += weight;
     }
-    pmReadout *outRO = options->outRO;  // Output readout
-    outRO->covariance = psImageCovarianceSum(options->covariances);
-    psBinaryOp(outRO->covariance->image, outRO->covariance->image, "/",
-               psScalarAlloc(sumWeights, PS_TYPE_F32));
-    psFree(options->covariances); options->covariances = NULL;
-    psImageCovarianceTransfer(outRO->variance, outRO->covariance);
+    if (sumWeights > 0.0) {
+        pmReadout *outRO = options->outRO;  // Output readout
+        outRO->covariance = psImageCovarianceSum(options->covariances);
+        psBinaryOp(outRO->covariance->image, outRO->covariance->image, "/",
+                   psScalarAlloc(sumWeights, PS_TYPE_F32));
+        psFree(options->covariances); options->covariances = NULL;
+        psImageCovarianceTransfer(outRO->variance, outRO->covariance);
+    }
 
 #ifdef TESTING