Changeset 34735 for branches/eam_branches/ipp-20120905/ppTranslate/src/ppMopsWrite.c

Timestamp:

Nov 29, 2012, 2:15:01 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120905

Files:

• . (modified) (1 prop)
• ppTranslate/src/ppMopsWrite.c (modified) (6 diffs)

branches/eam_branches/ipp-20120905/ppTranslate/src/ppMopsWrite.c

@@ -48 +48 @@
     }
   }
-  //Get the SEEING weighted mean
+  //Get the SEEING weighted mean. Update the PLTSCALE value
   float seeing = 0.;
   int totalGood = 0;
@@ -55 +55 @@
       seeing += ((ppMopsDetections*) detections->data[d])->seeing;
       totalGood += 1;
-    }
-  }
+      if (isfinite(((ppMopsDetections*) detections->data[d])->platescale)) {
+          det->platescale = ((ppMopsDetections*) detections->data[d])->platescale;
+      }
+    }
+  }
+  printf("plate-scale = [%g]\n", det->platescale);
   seeing /= (float) totalGood;
   if (det != NULL) {
@@ -80 +84 @@
   psMetadataAddF32(header, PS_LIST_TAIL, "MAGZPERR", 0, "Error in magnitude zero point", args->zpErr);
   psMetadataAddF32(header, PS_LIST_TAIL, "ASTRORMS", 0, "RMS of astrometric fit", args->rmsAstrom);
-  psMetadataAddStr(header, PS_LIST_TAIL, "COMMENT", 0, "Exposure comment", args->comment);
+  psMetadataAddStr(header, PS_LIST_TAIL, "CMMTOBS", 0, "Exposure comment", args->comment);
   psMetadataAddStr(header, PS_LIST_TAIL, "OBS_MODE", 0, "Exposure observation mode", args->obsMode);
   psMetadataAddStr(header, PS_LIST_TAIL, "DIFFTYPE", 0, "WW: Warp-Warp diff / WS: Warp-Stack diff / SW: Stack-Warp diff", args->difftype);
   psMetadataAddF32(header, PS_LIST_TAIL, "SKY", 0, "Exposure avg sky background", args->sky);
   psMetadataAddStr(header, PS_LIST_TAIL, "SHUTOUTC", 0, "Camera exposure shutter open (UTC)", args->shutoutc);
+  psMetadataAddF32(header, PS_LIST_TAIL, "PLTSCALE_EXT", 0, "Plate scale at centroid", det->platescale);
+  psMetadataAddF32(header, PS_LIST_TAIL, "PLTSCALE", 0, "Plate scale at centroid", det->platescale);
 
   //field in header that tells about the CMF version
@@ -92 +98 @@
 
   // Find the total number of detections
-
   long total = 0;
   for (long i=0; i<detections->n; i++) {
@@ -191 +196 @@
                      0);
       if (args->version == 3) {
-        // Write data of version 3 (see ICD)
-        psMetadataAdd (row, PS_LIST_TAIL, "RA_EXT",         PS_DATA_F32, "Fitted centroid RA", 
-                       0);
-        psMetadataAdd (row, PS_LIST_TAIL, "RA_EXT_SIGMA",   PS_DATA_F32, "Fitted RA sigma", 
-                       0);
-        psMetadataAdd (row, PS_LIST_TAIL, "DEC_EXT",        PS_DATA_F32, "Fitted centroid DEC", 
-                       0);
-        psMetadataAdd (row, PS_LIST_TAIL, "DEC_EXT_SIGMA",  PS_DATA_F32, "Fitted DEC sigma", 
-                       0);
-        psMetadataAdd (row, PS_LIST_TAIL, "POSANG_EXT",     PS_DATA_F32, "Fitted position angle", 
-                       0);
-        psMetadataAdd (row, PS_LIST_TAIL, "PLTSCALE_EXT",   PS_DATA_F32, "Plate scale at centroid", 
-                       0);
-        psMetadataAdd (row, PS_LIST_TAIL, "EXT_FLUX",       PS_DATA_F32, "Fitted flux", 
-                       0);
-        psMetadataAdd (row, PS_LIST_TAIL, "EXT_CAL_MAG",    PS_DATA_F32, "Calibrated mag", 
-                       0);
-        psMetadataAdd (row, PS_LIST_TAIL, "EXT_MAG_SIG",    PS_DATA_F32, "Mag sigma", 
-                       0);
-        psMetadataAdd (row, PS_LIST_TAIL, "EXT_CHISQ",      PS_DATA_F32, "Chi^2 of fit", 
-                       0);
-        psMetadataAdd (row, PS_LIST_TAIL, "EXT_NDOF",       PS_DATA_F32, "Fit degrees of freedom", 
-                       0);
+// Write data of version 3 (see ICD)
+        psMetadataAdd (row, PS_LIST_TAIL, "RA_EXT",         PS_DATA_F32, "Fitted centroid RA",
+                       0);
+        psMetadataAdd (row, PS_LIST_TAIL, "RA_EXT_SIGMA",   PS_DATA_F32, "Fitted RA sigma",
+                       0);
+        psMetadataAdd (row, PS_LIST_TAIL, "DEC_EXT",        PS_DATA_F32, "Fitted centroid DEC",
+                       0);
+        psMetadataAdd (row, PS_LIST_TAIL, "DEC_EXT_SIGMA",  PS_DATA_F32, "Fitted DEC sigma",
+                       0);
+        psMetadataAdd (row, PS_LIST_TAIL, "POSANG_EXT",     PS_DATA_F32, "Fitted position angle",
+                       0);
+        psMetadataAdd (row, PS_LIST_TAIL, "EXT_FLUX",       PS_DATA_F32, "Fitted flux",
+                       0);
+        psMetadataAdd (row, PS_LIST_TAIL, "EXT_CAL_MAG",    PS_DATA_F32, "Calibrated mag",
+                       0);
+        psMetadataAdd (row, PS_LIST_TAIL, "EXT_MAG_SIG",    PS_DATA_F32, "Mag sigma",
+                       0);
+        psMetadataAdd (row, PS_LIST_TAIL, "EXT_CHISQ",      PS_DATA_F32, "Chi^2 of fit",
+                       0);
+        psMetadataAdd (row, PS_LIST_TAIL, "EXT_NDOF",       PS_DATA_F32, "Fit degrees of freedom",
+                       0);
       }
     }
@@ -308 +311 @@
       addColumn("DEC_EXT_SIGMA", NULL, 0);
       addColumn("POSANG_EXT", NULL, 0);
-      addColumn("PLTSCALE_EXT", NULL, 0);
       addColumn("EXT_FLUX", NULL, 0);
       addColumn("EXT_CAL_MAG", NULL, 0);