Changeset 34779

Timestamp:

Dec 7, 2012, 12:28:26 PM (14 years ago)

Author:

Serge CHASTEL

Message:

Merge tag into trunk

Location:

trunk/ppTranslate/src

Files:

• ppMopsRead.c (modified) (4 diffs)
• ppMopsWrite.c (modified) (2 diffs)

trunk/ppTranslate/src/ppMopsRead.c

@@ -28 +28 @@
   for (int i = 0; i < num; i++) {
     const char *name = inNames->data[i];
-    printf("%s\n", name);
+    printf("Input filename:\n%s\n", name);
 
     psFits *fits = psFitsOpen(name,  "r"); // FITS file
@@ -84 +84 @@
     }
     ppMopsDetections *det = ppMopsDetectionsAlloc(size);
+    det->platescale = NAN;
     detections->data[i] = det;
     det->component = psStringNCopy(name, strrchr(name, '.') - name); // Strip off extension
@@ -280 +281 @@
       if (isfinite(scale)) {
           det->platescale = scale;
+          //printf("platescale = %g\n", scale);
       }
       numGood++;
@@ -306 +308 @@
     }
 
+    printf("Detection platescale = %g\n", det->platescale);
     psTrace("ppMops.read", 2, "Read %ld good rows from %s\n", numGood, (const char*)name);
   }

trunk/ppTranslate/src/ppMopsWrite.c

@@ -51 +51 @@
   float seeing = 0.;
   int totalGood = 0;
+  int platescale_has_been_set = 0;
   for (int d = 0; d < detections->n; d++) {
     if ( (detections->data[d] != NULL) && (isfinite(((ppMopsDetections*) detections->data[d])->seeing)) ) {
@@ -56 +57 @@
       totalGood += 1;
       if (isfinite(((ppMopsDetections*) detections->data[d])->platescale)) {
+          if (platescale_has_been_set == 0) {
           det->platescale = ((ppMopsDetections*) detections->data[d])->platescale;
-      }
-    }
-  }
-  printf("plate-scale = [%g]\n", det->platescale);
+              platescale_has_been_set = 1;
+          } else {
+              if (det->platescale != ((ppMopsDetections*) detections->data[d])->platescale) {
+                  printf("Different values for platescale: %g - %g in detection %d\n",
+                         det->platescale,
+                         ((ppMopsDetections*) detections->data[d])->platescale,
+                         d);
+      }
+    }
+  }
+    }
+  }
+  //printf("plate-scale = [%g]\n", det->platescale);
   seeing /= (float) totalGood;
   if (det != NULL) {