Changeset 16186 for trunk/psModules/src/camera/pmFPAfile.c

Timestamp:

Jan 22, 2008, 5:10:51 PM (18 years ago)

Author:

Paul Price

Message:

Merging pap_branch_080117 into the mainline.

File:

• trunk/psModules/src/camera/pmFPAfile.c (modified) (12 diffs)

trunk/psModules/src/camera/pmFPAfile.c

@@ -74 +74 @@
   file->fits = NULL;
   file->compression = NULL;
-  file->bitpix = 0;
-  file->floatType = PS_FITS_FLOAT_NONE;
+  file->options = NULL;
   file->names = psMetadataAlloc();
 
@@ -192 +191 @@
       char *name = psMetadataLookupStr (NULL, chip->concepts, "CHIP.NAME");
       if (name != NULL) {
-        psStringSubstitute(&newName, name, "{CHIP.NAME}");
+        psStringSubstitute(&newName, name, "{CHIP.NAME}");
       }
     }
@@ -201 +200 @@
       char *name = psMetadataLookupStr (NULL, chip->concepts, "CHIP.ID");
       if (name != NULL) {
-        psStringSubstitute(&newName, name, "{CHIP.ID}");
+        psStringSubstitute(&newName, name, "{CHIP.ID}");
       }
     }
@@ -220 +219 @@
       char *name = psMetadataLookupStr (NULL, cell->concepts, "CELL.NAME");
       if (name != NULL) {
-        psStringSubstitute(&newName, name, "{CELL.NAME}");
+        psStringSubstitute(&newName, name, "{CELL.NAME}");
       }
     }
@@ -243 +242 @@
       char *name = psMetadataLookupStr (NULL, fpa->concepts, "FPA.FILTER");
       if (name && *name) {
-        psStringSubstitute(&newName, name, "{FILTER}");
+        psStringSubstitute(&newName, name, "{FILTER}");
       }
     }
@@ -251 +250 @@
       char *name = psMetadataLookupStr (NULL, fpa->concepts, "FPA.FILTERID");
       if (name && *name) {
-        psStringSubstitute(&newName, name, "{FILTER.ID}");
+        psStringSubstitute(&newName, name, "{FILTER.ID}");
       }
     }
@@ -259 +258 @@
       char *name = psMetadataLookupStr (NULL, fpa->concepts, "FPA.INSTRUMENT");
       if (name && *name) {
-        psStringSubstitute(&newName, name, "{CAMERA}");
+        psStringSubstitute(&newName, name, "{CAMERA}");
       }
     }
@@ -267 +266 @@
       char *name = psMetadataLookupStr (NULL, fpa->concepts, "FPA.INSTRUMENT");
       if (name && *name) {
-        psStringSubstitute(&newName, name, "{INSTRUMENT}");
+        psStringSubstitute(&newName, name, "{INSTRUMENT}");
       }
     }
@@ -275 +274 @@
       char *name = psMetadataLookupStr (NULL, fpa->concepts, "FPA.DETECTOR");
       if (name && *name) {
-        psStringSubstitute(&newName, name, "{DETECTOR}");
+        psStringSubstitute(&newName, name, "{DETECTOR}");
       }
     }
@@ -283 +282 @@
       char *name = psMetadataLookupStr (NULL, fpa->concepts, "FPA.TELESCOPE");
       if (name && *name) {
-        psStringSubstitute(&newName, name, "{TELESCOPE}");
+        psStringSubstitute(&newName, name, "{TELESCOPE}");
       }
     }
@@ -340 +339 @@
   if (view->cell >= inChip->cells->n) {
     psError(PS_ERR_IO, true, "Requested cell == %d>= inChip->cells->n == %ld",
-            view->cell, inChip->cells->n);
+            view->cell, inChip->cells->n);
     return false;
   }
@@ -387 +386 @@
   if (view->cell >= inChip->cells->n) {
     psError(PS_ERR_IO, true, "Requested cell == %d>= inChip->cells->n == %ld",
-            view->cell, inChip->cells->n);
+            view->cell, inChip->cells->n);
     return false;
   }