Changeset 34472 for trunk/ppTranslate/src/ppMopsWrite.c

Timestamp:

Sep 26, 2012, 11:08:26 AM (14 years ago)

Author:

Serge CHASTEL

Message:

Changes for ppMops version 3

File:

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

trunk/ppTranslate/src/ppMopsWrite.c

@@ -74 +74 @@
     psMetadataAddF32(header, PS_LIST_TAIL, "AIRMASS", 0, "Airmass of exposure", det->airmass);
     psMetadataAddF32(header, PS_LIST_TAIL, "SEEING", 0, "Mean seeing", seeingStats->sampleMedian);
+    //MOPS want the name FWHM for SEEING
+    psMetadataAddF32(header, PS_LIST_TAIL, "FWHM", 0, "Mean seeing", det->seeing);
   } else {
     psWarning("no inputs with surviving detections. output header will be incomplete");
@@ -79 +81 @@
   psMetadataAddStr(header, PS_LIST_TAIL, "OBSCODE", 0, "IAU Observatory code", OBSERVATORY_CODE);
   psMetadataAddF32(header, PS_LIST_TAIL, "MAGZP", 0, "Magnitude zero point", args->zp);
+  //MOPS want the name ZEROPOINT for MAGZP
+  psMetadataAddF32(header, PS_LIST_TAIL, "ZEROPOINT", 0, "Magnitude zero point", args->zp);
   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, "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);
 
   //field in header that tells about the CMF version
@@ -187 +194 @@
                      0);
       if (args->version == 3) {
-        // TODO: Write data of version 3 (see ICD)
+        // 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);
       }
     }
@@ -276 +305 @@
       addColumn("EXT_THETA_ERR", NULL, 0);
     }
+    if (args->version >= 3) {
+      addColumn("RA_EXT", NULL, 0);
+      addColumn("RA_EXT_SIGMA", NULL, 0);
+      addColumn("DEC_EXT", NULL, 0);
+      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);
+      addColumn("EXT_MAG_SIG", NULL, 0);
+      addColumn("EXT_CHISQ", NULL, 0);
+      addColumn("EXT_NDOF", NULL, 0);
+    }
+
     if (!psFitsWriteTableAllColumns(fits, header, table, OUT_EXTNAME)) {
       psError(psErrorCodeLast(), false, "Unable to write table");