Changeset 12564 for trunk/psModules/src/camera/pmFPALevel.c

Timestamp:

Mar 22, 2007, 5:09:53 PM (19 years ago)

Author:

Paul Price

Message:

When we went to process TC3 images, we found that our camera formats
didn't handle its case (PHU=CHIP, EXT=CELL) properly. In order to
accomodate it, I've reworked the camera formats (including adding a
source to an FPA, and generating mosaic camera configurations). Now,
the particular format of the camera format file is *very* dependent
upon the FITS file:

Case PHU EXTENSIONS Description

1. FPA CHIP CONTENTS(METADATA) has a list of extensions, each with a chip type.

CHIPS(METADATA) has a list of chip types, each with cell:type

2. FPA CELL CONTENTS(METADATA) has a list of extensions, each with chip:cell:type

No need for CHIPS.

3. FPA NONE CONTENTS(STRING) has a list of extensions, chip:cell:type

No need for CHIPS

4. CHIP CELL CONTENTS(METADATA) is a menu, each with a chip type

CHIPS(METADATA) has a list of chip types(METADATA), containg a list of
extensions.

5. CHIP NONE CONTENTS(METADATA) is a menu, each with a chip type

CHIPS(METADATA) has a list of chip types(STRING) with cell:type

6. CELL NONE CONTENTS(METADATA) is a menu, each with a cell type.

No need for CHIPS.

Debugged and plugged memory leaks for this fix. Now able to
successfully read TC3 and Megacam (all 3 formats). Can't run ppImage
with PPIMAGE_N on file with PHU=CHIP because it's trying to write out
a PHU (at the FPA level) before it reads any of the input data. This
behaviour exists in a previous version (IPP 1.0; in fact, the current
fix deals with it a bit better --- error instead of SEGV), so it
should be safe to use this now.

File:

• trunk/psModules/src/camera/pmFPALevel.c (modified) (2 diffs)

trunk/psModules/src/camera/pmFPALevel.c

@@ -17 +17 @@
 const char *pmFPALevelToName(pmFPALevel level)
 {
-
     switch (level) {
     case PM_FPA_LEVEL_NONE:
@@ -49 +48 @@
     } else if (!strcasecmp(name, "READOUT")) {
         val = PM_FPA_LEVEL_READOUT;
+    } else if (!strcasecmp(name, "NONE")) {
+        val = PM_FPA_LEVEL_NONE;
     } else {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Unrecognised FPA level name: %s", name);
         val = PM_FPA_LEVEL_NONE;
     }