Changeset 31606 for branches/czw_branch/20110406/psastro/src/psastroConvert.c

Timestamp:

Jun 6, 2011, 1:56:22 PM (15 years ago)

Author:

watersc1

Message:

merge from trunk before working on new stacking code

Location:

branches/czw_branch/20110406

Files:

• . (modified) (1 prop)
• psastro/src/psastroConvert.c (modified) (2 diffs)

branches/czw_branch/20110406/psastro/src/psastroConvert.c

@@ -133 +133 @@
         pmSource *source = sources->data[n];
 
-        psTrace ("psastro", 6, "mag: %f +/- %f, mode: %x, skip: %x\n", source->psfMag, source->errMag, source->mode, skip);
+        psTrace ("psastro", 6, "mag: %f +/- %f, mode: %x, skip: %x\n", source->psfMag, source->psfMagErr, source->mode, skip);
 
         if (source->mode & skip) {
@@ -191 +191 @@
         obj->pix->yErr = dPAR[PM_PAR_YPOS];
         obj->Mag = source->psfMag;
-        obj->dMag = source->errMag;
+        obj->dMag = source->psfMagErr;
 
         // XXX do we have the information giving the readout and cell offset?