Changeset 31451 for trunk/psModules/src/objects/pmSourceIO_CMP.c

Timestamp:

May 5, 2011, 11:02:53 AM (15 years ago)

Author:

eugene

Message:

merge updates from eam branch 20110404

File:

• trunk/psModules/src/objects/pmSourceIO_CMP.c (modified) (3 diffs)

trunk/psModules/src/objects/pmSourceIO_CMP.c

@@ -137 +137 @@
         axes = pmPSF_ModelToAxes (PAR, 20.0);
 
-        float errMag = isfinite(source->errMag) ? source->errMag : 999;
+        float psfMagErr = isfinite(source->psfMagErr) ? source->psfMagErr : 999;
 
         psLineInit (line);
@@ -143 +143 @@
         psLineAdd (line, "%6.1f ",  PAR[PM_PAR_YPOS]);
         psLineAdd (line, "%6.3f ",  PS_MIN (99.0, source->psfMag + ZERO_POINT));
-        psLineAdd (line, "%03d ",   PS_MIN (999, (int)errMag));
+        psLineAdd (line, "%03d ",   PS_MIN (999, (int)psfMagErr));
         psLineAdd (line, "%2d ",    type);
         psLineAdd (line, "%3.1f ",  lsky);
@@ -280 +280 @@
             source->psfMag = atof (array->data[2]);
             source->extMag = atof (array->data[6]);
-            source->errMag = atof (array->data[3]) / 1000.0;
+            source->psfMagErr = atof (array->data[3]) / 1000.0;
             source->apMag  = atof (array->data[7]);
             axes.major     = atof (array->data[8]);