Changeset 34486

Timestamp:

Sep 27, 2012, 2:27:19 PM (14 years ago)

Author:

Serge CHASTEL

Message:

MOPS want the SEEING value to be the mean of the seeings in each skycell weighted by the number of (valid) detections

Location:

trunk/ppTranslate/src

Files:

• ppMopsMerge.c (modified) (1 diff)
• ppMopsRead.c (modified) (1 diff)
• ppMopsWrite.c (modified) (3 diffs)

trunk/ppTranslate/src/ppMopsMerge.c

@@ -301 +301 @@
                                                 vector->n, newLength);
             }
-                
-        }
+        }
         // XXX IS this safe? Perhaps save in numGood?
         det->num = newLength;

trunk/ppTranslate/src/ppMopsRead.c

@@ -248 +248 @@
     }
     det->seeing *= ((float) plateScale) / ((float) numGood);
-
-    // Are we using numGood for anything outside of this function?
     det->numGood = numGood;
 

trunk/ppTranslate/src/ppMopsWrite.c

@@ -41 +41 @@
   // seeings
   ppMopsDetections *det = NULL;
-  int validSeeingCount = 0;
   for (int d = 0; d < detections->n; d++) {
     if (detections->data[d] != NULL) {
@@ -47 +46 @@
         det = detections->data[d];
       }
-      if (isfinite(((ppMopsDetections*) detections->data[d])->seeing)) {
-        validSeeingCount += 1;
-      }
-    }
-  }
+    }
+  }
+  //Get the SEEING weighted mean
+  float seeing = 0.;
+  int totalGood = 0;
+  for (int d = 0; d < detections->n; d++) {
+    if ( (detections->data[d] != NULL) && (isfinite(((ppMopsDetections*) detections->data[d])->seeing)) ) {
+      seeing += (((ppMopsDetections*) detections->data[d])->seeing)*((float) (((ppMopsDetections*) detections->data[d])->numGood));
+      totalGood += (((ppMopsDetections*) detections->data[d])->numGood);
+    }
+  }
+  seeing /= (float) totalGood;
   if (det != NULL) {
-    //Get the SEEING median
-    psVector* seeingValues = psVectorAlloc(validSeeingCount, PS_TYPE_F32);
-    psVectorInit(seeingValues, NAN);
-    validSeeingCount = 0;
-    for (int d = 0; d < detections->n; d++) {
-      if ( (detections->data[d] != NULL) && (isfinite(((ppMopsDetections*) detections->data[d])->seeing)) ){
-        seeingValues->data.F32[validSeeingCount++] = ((ppMopsDetections*) detections->data[d])->seeing;
-      }
-    }
-    psStats *seeingStats = psStatsAlloc(PS_STAT_SAMPLE_MEDIAN);
-    psVectorStats(seeingStats, seeingValues, NULL, NULL, 0);
     psMetadataAddF64(header, PS_LIST_TAIL, "MJD-OBS", 0, "MJD of exposure midpoint", det->mjd);
     psMetadataAddStr(header, PS_LIST_TAIL, "RA", 0, "Right Ascension of boresight", det->raBoresight);
@@ -73 +68 @@
     psMetadataAddStr(header, PS_LIST_TAIL, "FILTER", 0, "Filter name", det->filter);
     psMetadataAddF32(header, PS_LIST_TAIL, "AIRMASS", 0, "Airmass of exposure", det->airmass);
-    psMetadataAddF32(header, PS_LIST_TAIL, "SEEING", 0, "Mean seeing", seeingStats->sampleMedian);
+    psMetadataAddF32(header, PS_LIST_TAIL, "SEEING", 0, "Mean seeing", seeing);
     //MOPS want the name FWHM for SEEING
-    psMetadataAddF32(header, PS_LIST_TAIL, "FWHM", 0, "Mean seeing", det->seeing);
+    psMetadataAddF32(header, PS_LIST_TAIL, "FWHM", 0, "Mean seeing", seeing);
   } else {
     psWarning("no inputs with surviving detections. output header will be incomplete");