Changeset 35560 for trunk/psModules/src/objects/pmSourceMoments.c

Timestamp:

May 9, 2013, 12:19:21 PM (13 years ago)

Author:

eugene

Message:

do not crash psphot if variance is not supplied; include mask and mark in modelGuess functions (needed for trail angle guess); fix Reff sx,sy,sxx relationships; define new function to measure guess at the trail angle; tell pmSourceIO if MATCHED_REFS have been read (& skip); do not read sources for WCS type

File:

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

trunk/psModules/src/objects/pmSourceMoments.c

@@ -151 +151 @@
 
         float *vPix = source->pixels->data.F32[row];
-        float *vWgt = source->variance->data.F32[row];
+        float *vWgt = source->variance ? source->variance->data.F32[row] : source->pixels->data.F32[row];
 
         psImageMaskType  *vMsk = (source->maskObj == NULL) ? NULL : source->maskObj->data.PS_TYPE_IMAGE_MASK_DATA[row];
@@ -266 +266 @@
 
     float **vPix = source->pixels->data.F32;
-    float **vWgt = source->variance->data.F32;
-    psImageMaskType  **vMsk = (source->maskObj == NULL) ? NULL : source->maskObj->data.PS_TYPE_IMAGE_MASK_DATA;
+    float **vWgt = source->variance ? source->variance->data.F32 : source->pixels->data.F32;
+    psImageMaskType **vMsk = (source->maskObj == NULL) ? NULL : source->maskObj->data.PS_TYPE_IMAGE_MASK_DATA;
 
     float RF = 0.0;
@@ -467 +467 @@
 
         float *vPix = source->pixels->data.F32[row];
-        float *vWgt = source->variance->data.F32[row];
+        float *vWgt = source->variance ? source->variance->data.F32[row] : source->pixels->data.F32[row];
 
         psImageMaskType *vMsk = (source->maskObj == NULL) ? NULL : source->maskObj->data.PS_TYPE_IMAGE_MASK_DATA[row];