Changeset 15715

Timestamp:

Nov 29, 2007, 12:49:16 PM (18 years ago)

Author:

Paul Price

Message:

NAXIS1 and NAXIS2 aren't written for tables (e.g., source lists, PSF models), so put various concepts that require these in by their name. It's not a great waste of space.

File:

• trunk/psModules/src/config/pmConfigCamera.c (modified) (4 diffs)

trunk/psModules/src/config/pmConfigCamera.c

@@ -85 +85 @@
 // Don't update these skycell concepts; last one MUST be 0 (i.e., NULL).
 const static char *skycellConceptsCell[] = { "CELL.BIASSEC", "CELL.TRIMSEC", "CELL.READDIR", "CELL.XPARITY",
-                                             "CELL.YPARITY", "CELL.XWINDOW", "CELL.YWINDOW", "CELL.X0",
-                                             "CELL.Y0", "CELL.XSIZE", "CELL.YSIZE", 0 };
-const static char *skycellConceptsChip[] = { "CHIP.XPARITY", "CHIP.YPARITY", "CHIP.XSIZE", "CHIP.YSIZE", 0 };
+                                             "CELL.YPARITY", "CELL.X0", "CELL.Y0", 0 };
+const static char *skycellConceptsChip[] = { "CHIP.XPARITY", "CHIP.YPARITY", 0 };
 const static char *skycellConceptsFPA[] = { 0 };
 
@@ -247 +246 @@
         psFree(concepts);
 
-        psMetadataAddStr(translation, PS_LIST_TAIL, "CELL.XSIZE", 0, NULL, "NAXIS1");
-        psMetadataAddStr(translation, PS_LIST_TAIL, "CELL.YSIZE", 0, NULL, "NAXIS2");
-        psMetadataAddStr(translation, PS_LIST_TAIL, "CELL.XWINDOW", 0, NULL, "NAXIS1");
-        psMetadataAddStr(translation, PS_LIST_TAIL, "CELL.YWINDOW", 0, NULL, "NAXIS2");
-        psMetadataAddStr(translation, PS_LIST_TAIL, "CHIP.XSIZE", 0, NULL, "NAXIS1");
-        psMetadataAddStr(translation, PS_LIST_TAIL, "CHIP.YSIZE", 0, NULL, "NAXIS2");
-
         psMetadataAddMetadata(format, PS_LIST_TAIL, "TRANSLATION", 0, "How to translate the FITS headers",
                               translation);
@@ -426 +418 @@
           while ((fpaItem = psMetadataGetAndIncrement(fpaIter))) {
               if (fpaItem->type != PS_DATA_STRING) {
-                  psError(PS_ERR_UNKNOWN, true, "Element %s within FPA in camera configuration is not of type STR.",
-                            fpaItem->name);
+                  psError(PS_ERR_UNKNOWN, true,
+                          "Element %s within FPA in camera configuration is not of type STR.",
+                          fpaItem->name);
                   psFree(new);
                   return false;
@@ -597 +590 @@
             psAbort("Should never get here.\n");
         }
-
-#if 0
-        // XXXX when do I need to adjust the value of CONTENT, CELL.NAME, CHIP.NAME?
-
-        // Don't need a "CONTENT" to identify the content!
-        if (psMetadataLookup(file, "CONTENT")) {
-            psMetadataRemoveKey(file, "CONTENT");
-        }
-        psMetadataAddStr(file, PS_LIST_TAIL, "CONTENT", PS_META_REPLACE, "Key to CONTENTS menu",
-                         "PS_CNTNT");
-        // Don't need CELL.NAME for chip-mosaicked camera
-        if (psMetadataLookup(file, "CELL.NAME")) {
-            psMetadataRemoveKey(file, "CELL.NAME");
-        }
-        // Don't need CHIP.NAME or CELL.NAME for fpa-mosaicked camera
-        if (psMetadataLookup(file, "CHIP.NAME")) {
-            psMetadataRemoveKey(file, "CHIP.NAME");
-        }
-        if (psMetadataLookup(file, "CELL.NAME")) {
-            psMetadataRemoveKey(file, "CELL.NAME");
-        }
-#endif
 
         // Fix up the CONTENTS to contain only the mosaicked cell for each chip