Changeset 34367 for branches/eam_branches/ipp-20120805/psModules/src/objects/pmSourceIO_CMF.c.in

Timestamp:

Aug 30, 2012, 6:08:59 AM (14 years ago)

Author:

eugene

Message:

add PS1_DV3 format to output CMFs (not yet complete); some additional test code

File:

• branches/eam_branches/ipp-20120805/psModules/src/objects/pmSourceIO_CMF.c.in (modified) (4 diffs)

branches/eam_branches/ipp-20120805/psModules/src/objects/pmSourceIO_CMF.c.in

@@ -733 +733 @@
     }
 
+    @PS1_DV3@ pmChip *chip = readout->parent->parent;
+
     table = psArrayAllocEmpty (sources->n);
 
@@ -766 +768 @@
             yErr = dPAR[PM_PAR_YPOS];
 
+            @PS1_DV3@ psSphere ptSky = {0.0, 0.0, 0.0, 0.0};
+            @PS1_DV3@ float posAngle = 0.0;
+            @PS1_DV3@ float pltScale = 0.0;
+            @PS1_DV3@ pmSourceLocalAstrometry (&ptSky, &posAngle, &pltScale, chip, xPos, yPos);
+            @PS1_DV3@ double raPos = ptSky.r*PS_DEG_RAD;
+            @PS1_DV3@ double decPos = ptSky.d*PS_DEG_RAD;
+
             float kronFlux = source->moments ? source->moments->KronFlux : NAN;
             float kronMag = isfinite(kronFlux) ? -2.5*log10(kronFlux) : NAN;
@@ -777 +786 @@
             psMetadataAddF32 (row, PS_LIST_TAIL, "X_EXT_SIG",        0, "Sigma in EXT x coordinate",                  xErr);
             psMetadataAddF32 (row, PS_LIST_TAIL, "Y_EXT_SIG",        0, "Sigma in EXT y coordinate",                  yErr);
+            @PS1_DV3@ psMetadataAddF32 (row, PS_LIST_TAIL, "RA_EXT",           0, "EXT model ra coordinate",                    raPos);
+            @PS1_DV3@ psMetadataAddF32 (row, PS_LIST_TAIL, "DEC_EXT",          0, "EXT model dec coordinate",                   decPos);
             psMetadataAddF32 (row, PS_LIST_TAIL, "EXT_INST_MAG",     0, "EXT fit instrumental magnitude",             model->mag);
             psMetadataAddF32 (row, PS_LIST_TAIL, "EXT_INST_MAG_SIG", 0, "Sigma of PSF instrumental magnitude",        model->magErr);
@@ -790 +801 @@
             psMetadataAddF32 (row, PS_LIST_TAIL, "KRON_MAG",         0, "Kron Mag",                                   kronMag);
 
-            psMetadataAddF32 (row, PS_LIST_TAIL, "NPARAMS",          0, "number of model parameters",                 model->params->n);
+            @ALL, !PS1_DV3@ psMetadataAddF32 (row, PS_LIST_TAIL, "NPARAMS",          0, "number of model parameters",                 model->params->n);
+            @PS1_DV3@       psMetadataAddS32 (row, PS_LIST_TAIL, "NPARAMS",          0, "number of model parameters",                 model->params->n);
             psMetadataAddStr (row, PS_LIST_TAIL, "MODEL_TYPE",       0, "name of model",                              pmModelClassGetName (model->type));