Changeset 23740 for trunk/psModules

Timestamp:

Apr 7, 2009, 4:50:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging branches/pap from r23739 onto trunk. No conflicts, ppSub builds fine.

Location:

trunk

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/camera/pmFPA.c (modified) (4 diffs)
• psModules/src/camera/pmFPACopy.c (modified) (1 diff)
• psModules/src/imcombine/pmSubtraction.c (modified) (1 diff)
• psModules/src/imcombine/pmSubtractionMatch.c (modified) (1 diff)

trunk/psModules/src/camera/pmFPA.c

@@ -298 +298 @@
 
 
-pmCell *pmCellAlloc(
-    pmChip *chip,
-    const char *name)
+pmCell *pmCellAlloc(pmChip *chip, const char *name)
 {
     pmCell *tmpCell = (pmCell *) psAlloc(sizeof(pmCell));
@@ -323 +321 @@
     }
     tmpCell->conceptsRead = PM_CONCEPT_SOURCE_NONE;
-    // XXX does this work?  moved to conceptsRead... pmConceptsBlankCell(tmpCell);
+    pmConceptsBlankCell(tmpCell);
 
     return tmpCell;
@@ -362 +360 @@
     }
     tmpChip->conceptsRead = PM_CONCEPT_SOURCE_NONE;
-    // XXX does this work?  moved to conceptsRead... pmConceptsBlankChip(tmpChip);
+    pmConceptsBlankChip(tmpChip);
     return tmpChip;
 }
@@ -393 +391 @@
     }
     tmpFPA->conceptsRead = PM_CONCEPT_SOURCE_NONE;
-    // XXX does this work?  moved to conceptsRead... pmConceptsBlankFPA(tmpFPA);
+    pmConceptsBlankFPA(tmpFPA);
 
     // this may be somewhat pedantic, but it makes these things consistent

trunk/psModules/src/camera/pmFPACopy.c

@@ -399 +399 @@
     if (targetHDU) {
         pmHDU *sourceHDU = pmHDUFromCell(source); // The source HDU
-        if (!sourceHDU) {
-            psWarning("Unable to copy header: no source header.");
-        } else if (sourceHDU->header) {
+        if (sourceHDU && sourceHDU->header) {
             targetHDU->header = psMetadataCopy(targetHDU->header, sourceHDU->header);
         }

trunk/psModules/src/imcombine/pmSubtraction.c

@@ -1385 +1385 @@
     }
 
+    // Data exists on the outputs now
+    if (out1) {
+        out1->data_exists = true;
+        if (out1->parent) {
+            out1->parent->data_exists = out1->parent->parent->data_exists = true;
+        }
+    }
+    if (out2) {
+        out2->data_exists = true;
+        if (out2->parent) {
+            out2->parent->data_exists = out2->parent->parent->data_exists = true;
+        }
+    }
+
+
     psLogMsg("psModules.imcombine", PS_LOG_INFO, "Convolve image: %f sec",
              psTimerClear("pmSubtractionConvolve"));

trunk/psModules/src/imcombine/pmSubtractionMatch.c

@@ -567 +567 @@
             psFree(kernels);
             kernels = NULL;
-
-            // There is data in the readout now
-            if (subMode == PM_SUBTRACTION_MODE_1 || subMode == PM_SUBTRACTION_MODE_DUAL) {
-                conv1->data_exists = true;
-                if (conv1->parent) {
-                    conv1->parent->data_exists = true;
-                    conv1->parent->parent->data_exists = true;
-                }
-            }
-            if (subMode == PM_SUBTRACTION_MODE_2 || subMode == PM_SUBTRACTION_MODE_DUAL) {
-                conv2->data_exists = true;
-                if (conv2->parent) {
-                    conv2->parent->data_exists = true;
-                    conv2->parent->parent->data_exists = true;
-                }
-            }
         }
     }