Changeset 34437 for trunk/ppTranslate/src/ppMopsRead.c

Timestamp:

Sep 12, 2012, 9:37:27 PM (14 years ago)

Author:

Serge CHASTEL

Message:

Rolled back to previous version (34285)

File:

• trunk/ppTranslate/src/ppMopsRead.c (modified) (4 diffs)

trunk/ppTranslate/src/ppMopsRead.c

@@ -22 +22 @@
   long num = inNames->n;                   // Number of inputs
   psArray *detections = psArrayAlloc(num); // Array of detections, to return
-  double plateScale = 0.0;        // Plate scale
-  long numGood = 0;               // Number of good rows
   for (int i = 0; i < num; i++) {
     const char *name = inNames->data[i];
@@ -98 +96 @@
     det->mjd = psMetadataLookupF64(NULL, header, "MJD-OBS") + det->exptime / 2.0 / 3600 / 24;
 
-    //It's recomputed 
     det->seeing = (float) 0.5 * (psMetadataLookupF32(NULL, header, "FWHM_MAJ") +
                                  psMetadataLookupF32(NULL, header, "FWHM_MIN"));
@@ -192 +189 @@
     psVector *angleV = psMetadataLookupVector(NULL, table, "POSANGLE");
     psVector *flagsV = psMetadataLookupVector(NULL, table, "FLAGS");
-    long localNumGood = 0;               // Number of good rows in the current skycell
+
+    double plateScale = 0.0;        // Plate scale
+    long numGood = 0;               // Number of good rows
     for (long row = 0; row < size; row++) {
 
@@ -234 +233 @@
       plateScale += scale;
       numGood++;
-      localNumGood++;
-    }
+    }
+    det->seeing *= ((float) plateScale) / ((float) numGood);
+
+    // Are we using numGood for anything outside of this function?
+    det->numGood = numGood;
+
     if (isfinite(args->zp) && numGood > 0) {
       psBinaryOp(mag, mag, "+", psScalarAlloc(args->zp, PS_TYPE_F32));
     }
 
-    psTrace("ppMops.read", 2, "Read %ld good rows from %s\n", localNumGood, (const char*)name);
+    psTrace("ppMops.read", 2, "Read %ld good rows from %s\n", numGood, (const char*)name);
   }
-  //The seeing is the product of the mean of FWHM_MIN and FWHM_MAJ by
-  //the mean of the scale values of all "good" detections.
-  if (numGood > 0) {
-    //Avoid dividing by 0
-    det->seeing *= ((float) plateScale) / ((float) numGood);
-  } else {
-    det->seeing = NAN;
-  }
-  // Are we using numGood for anything outside of this function?
-  det->numGood = numGood;
 
   psTrace("ppMops.read", 1, "Done reading input detections\n");