Changeset 12770

Timestamp:

Apr 5, 2007, 5:26:25 PM (19 years ago)

Author:

Paul Price

Message:

An FPA may contain an image that it's read in and a weight map (or
mask) that it's constructed in the readout. In that case,
pmHDUGenerate wasn't generating the HDU for the weight, because it
assumed it existed. Fixed by specifying additional tests.
Also fixed the levels.

File:

• trunk/psModules/src/camera/pmHDUGenerate.c (modified) (5 diffs)

trunk/psModules/src/camera/pmHDUGenerate.c

@@ -521 +521 @@
         return false;
     }
-    if (hdu->images) {
+    if (hdu->images && hdu->masks && hdu->weights) {
         // It's already here!
         return true;
@@ -571 +571 @@
         return generateForCells(chip);
     }
-    if (hdu->images) {
+    if (hdu->images && hdu->masks && hdu->weights) {
         // It's already here!
         return true;
@@ -578 +578 @@
     pmFPALevel extLevel = extensionLevel(hdu);
     switch (extLevel) {
-    case PM_FPA_LEVEL_NONE:
     case PM_FPA_LEVEL_CELL:
         // Work on lower levels
         return generateForCells(chip);
+    case PM_FPA_LEVEL_NONE:
     case PM_FPA_LEVEL_CHIP: {
             // Work on this level
@@ -620 +620 @@
         return generateForChips(fpa);
     }
-    if (hdu->images) {
+    if (hdu->images && hdu->masks && hdu->weights) {
         // It's already here!
         return true;
@@ -627 +627 @@
     pmFPALevel extLevel = extensionLevel(hdu);
     switch (extLevel) {
-    case PM_FPA_LEVEL_NONE:
     case PM_FPA_LEVEL_CELL:
     case PM_FPA_LEVEL_CHIP:
         // Work on lower levels
         return generateForChips(fpa);
+    case PM_FPA_LEVEL_NONE:
     case PM_FPA_LEVEL_FPA: {
             // Work on this level