Changeset 34472 for trunk/ppTranslate/src/ppMopsRead.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/ppMopsRead.c (modified) (5 diffs)

trunk/ppTranslate/src/ppMopsRead.c

@@ -8 +8 @@
 #include "ppMops.h"
 
-static void addDummyValues(psMetadata* md, long size);
+static void addDummyValues(psMetadata* md, long size, int version);
 static void replaceDummyValuesF32(const char* colName, psMetadata* source, psMetadata* target, psVector* indexes);
 
@@ -116 +116 @@
     if (skyChipPsfVersion >= 2) {
       //First: append all the new columns that we want to the existing table
-      addDummyValues(det->table, size);
+      addDummyValues(det->table, size, args->version);
       if (!psFitsMoveExtName(fits, "SkyChip.xfit")) {
         psTrace("ppMops.read", 3, "No fitted trails extension");
@@ -147 +147 @@
           replaceDummyValuesF32("EXT_WIDTH_MIN_ERR",  fittedTrails, det->table, idet);
           replaceDummyValuesF32("EXT_THETA_ERR",  fittedTrails, det->table, idet);
+          if (skyChipPsfVersion >= 3) {
+            replaceDummyValuesF32("RA_EXT",  fittedTrails, det->table, idet);
+            replaceDummyValuesF32("RA_EXT_SIGMA",  fittedTrails, det->table, idet);
+            replaceDummyValuesF32("DEC_EXT",  fittedTrails, det->table, idet);
+            replaceDummyValuesF32("DEC_EXT_SIGMA",  fittedTrails, det->table, idet);
+            replaceDummyValuesF32("POSANG_EXT",  fittedTrails, det->table, idet);
+            replaceDummyValuesF32("PLTSCALE_EXT",  fittedTrails, det->table, idet);
+            replaceDummyValuesF32("EXT_FLUX",  fittedTrails, det->table, idet);
+            replaceDummyValuesF32("EXT_CAL_MAG",  fittedTrails, det->table, idet);
+            replaceDummyValuesF32("EXT_MAG_SIG",  fittedTrails, det->table, idet);
+            replaceDummyValuesF32("EXT_CHISQ",  fittedTrails, det->table, idet);
+            replaceDummyValuesF32("EXT_NDOF",  fittedTrails, det->table, idet);
+          }
         }
       }
@@ -257 +270 @@
 }
 
-static void addDummyValues(psMetadata* md, long size) {
+static void addDummyValues(psMetadata* md, long size, int version) {
   psMetadataAdd(md, PS_LIST_TAIL, "X_EXT", PS_DATA_VECTOR, "EXT model x coordinate", createDummyF32(size));
   psMetadataAdd(md, PS_LIST_TAIL, "Y_EXT", PS_DATA_VECTOR, "EXT model y coordinate", createDummyF32(size));
@@ -271 +284 @@
   psMetadataAdd(md, PS_LIST_TAIL, "EXT_WIDTH_MIN_ERR",  PS_DATA_VECTOR, "EXT width error (minor axis)", createDummyF32(size));
   psMetadataAdd(md, PS_LIST_TAIL, "EXT_THETA_ERR",  PS_DATA_VECTOR, "EXT orientation angle (error)", createDummyF32(size));
+  if (version >= 3) {
+    psTrace("ppMops.read", 10, "Adding columns for version PS1_DV%d\n", version);
+    psMetadataAdd(md, PS_LIST_TAIL, "RA_EXT",  PS_DATA_VECTOR, "Fitted centroid RA", createDummyF32(size));
+    psMetadataAdd(md, PS_LIST_TAIL, "RA_EXT_SIGMA",  PS_DATA_VECTOR, "Fitted RA sigma", createDummyF32(size));
+    psMetadataAdd(md, PS_LIST_TAIL, "DEC_EXT",  PS_DATA_VECTOR, "Fitted centroid DEC", createDummyF32(size));
+    psMetadataAdd(md, PS_LIST_TAIL, "DEC_EXT_SIGMA",  PS_DATA_VECTOR, "Fitted DEC sigma", createDummyF32(size));
+    psMetadataAdd(md, PS_LIST_TAIL, "POSANG_EXT",  PS_DATA_VECTOR, "Fitted position angle", createDummyF32(size));
+    psMetadataAdd(md, PS_LIST_TAIL, "PLTSCALE_EXT",  PS_DATA_VECTOR, "Plate scale at centroid", createDummyF32(size));
+    psMetadataAdd(md, PS_LIST_TAIL, "EXT_FLUX",  PS_DATA_VECTOR, "Fitted flux", createDummyF32(size));
+    psMetadataAdd(md, PS_LIST_TAIL, "EXT_CAL_MAG",  PS_DATA_VECTOR, "Calibrated mag", createDummyF32(size));
+    psMetadataAdd(md, PS_LIST_TAIL, "EXT_MAG_SIG",  PS_DATA_VECTOR, "Mag sigma", createDummyF32(size));
+    psMetadataAdd(md, PS_LIST_TAIL, "EXT_CHISQ",  PS_DATA_VECTOR, "Chi^2 of fit", createDummyF32(size));
+    psMetadataAdd(md, PS_LIST_TAIL, "EXT_NDOF",  PS_DATA_VECTOR, "Fit degrees of freedom", createDummyF32(size));
+  }
 }