Changeset 31606 for branches/czw_branch/20110406/psModules/src/objects/pmPCMdata.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)
• psModules/src/objects/pmPCMdata.c (modified) (2 diffs)

branches/czw_branch/20110406/psModules/src/objects/pmPCMdata.c

@@ -263 +263 @@
 bool pmPCMupdate(pmPCMdata *pcm, pmSource *source, pmSourceFitOptions *fitOptions, pmModel *model) {
 
-    bool newWindow = (source->pixels->numRows != pcm->modelFlux->numRows) || (source->pixels->numCols != pcm->modelFlux->numCols);
+    bool sameWindow = (source->pixels->numRows == pcm->modelFlux->numRows);
+    sameWindow     &= (source->pixels->numCols == pcm->modelFlux->numCols);
+    sameWindow     &= (source->pixels->col0    == pcm->modelFlux->col0);
+    sameWindow     &= (source->pixels->row0    == pcm->modelFlux->row0);
 
     // re-count the number of unmasked pixels:
-    if (newWindow) {
+    if (!sameWindow) {
         for (psS32 i = 0; i < source->pixels->numRows; i++) {
             for (psS32 j = 0; j < source->pixels->numCols; j++) {
@@ -346 +349 @@
 
     // has the source pixel window changed?
-    if (newWindow) {
+    if (!sameWindow) {
 
         // adjust all supporting images: