Changeset 17915

Timestamp:

Jun 4, 2008, 3:41:14 PM (18 years ago)

Author:

Paul Price

Message:

Need to include camera name now.

Location:

trunk

Files:

• ppMerge/src/ppMergeCamera.c (modified) (1 diff)
• ppSim/src/ppSimCreate.c (modified) (8 diffs)

trunk/ppMerge/src/ppMergeCamera.c

@@ -25 +25 @@
 
     // Output image
-    pmFPA *fpa = pmFPAConstruct(config->camera); // FPA to contain the output
+    pmFPA *fpa = pmFPAConstruct(config->camera, config->cameraName); // FPA to contain the output
     if (!fpa) {
         psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to construct an FPA from camera configuration.");

trunk/ppSim/src/ppSimCreate.c

@@ -18 +18 @@
     pmFPAfile *input = pmFPAfileDefineFromArgs (&status, config, "PPIMAGE.INPUT", "INPUT");
     if (!input) {
-        // if we have not specified the camera already, we need to interpolate the recipes associated with this camera, and read other command-line recipes
+        // if we have not specified the camera already, we need to interpolate the recipes associated with this camera, and read other command-line recipes
         if (!pmConfigReadRecipes(config, PM_RECIPE_SOURCE_CL)) {
             psError(PS_ERR_IO, false, "Error merging recipes from camera config for %s", config->cameraName);
@@ -24 +24 @@
         }
 
-        simImage = true;
-        fpa = pmFPAConstruct(config->camera); // FPA to contain the observation
-        if (!fpa) {
-            psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to construct an FPA from camera configuration.");
-            return NULL;
-        }
-        
+        simImage = true;
+        fpa = pmFPAConstruct(config->camera, config->cameraName); // FPA to contain the observation
+        if (!fpa) {
+            psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to construct an FPA from camera configuration.");
+            return NULL;
+        }
+
     } else {
-        simImage = false;
-        if (input->type != PM_FPA_FILE_IMAGE) {
-            psError(PS_ERR_IO, true, "PPIMAGE.INPUT is not of type IMAGE");
-            return NULL;
-        }
-        fpa = input->fpa;
+        simImage = false;
+        if (input->type != PM_FPA_FILE_IMAGE) {
+            psError(PS_ERR_IO, true, "PPIMAGE.INPUT is not of type IMAGE");
+            return NULL;
+        }
+        fpa = input->fpa;
     }
 
@@ -49 +49 @@
     if (file->type != PM_FPA_FILE_IMAGE) {
         psError(PS_ERR_BAD_PARAMETER_TYPE, true, "%s type is not IMAGE", OUTPUT_FILE);
-        psFree(fpa);
+        psFree(fpa);
         psFree(file);
         return NULL;
@@ -60 +60 @@
     // have we supplied a psf model?
     if (psMetadataLookupPtr(NULL, config->arguments, "PSPHOT.PSF")) {
-        bool status = false;
+        bool status = false;
 
-        // tie the psf file to the chipMosaic 
+        // tie the psf file to the chipMosaic
         pmFPAfileBindFromArgs(&status, file, config, "PSPHOT.PSF.LOAD", "PSPHOT.PSF");
         if (!status) {
             psError(PS_ERR_UNKNOWN, false, "Failed to find/build PSPHOT.PSF.LOAD");
-            psFree(fpa);
-            psFree(file);
+            psFree(fpa);
+            psFree(file);
             return NULL;
         }
@@ -83 +83 @@
     // if we have loaded an input image, we do not need to populate the fpa
     if (!simImage) {
-        return file;
+        return file;
     }
 
@@ -95 +95 @@
             psFree(fpa);
             psFree(view);
-            psFree(file);
+            psFree(file);
             return NULL;
         }
@@ -107 +107 @@
                 psFree(fpa);
                 psFree(view);
-                psFree(file);
+                psFree(file);
                 return NULL;
             }
@@ -119 +119 @@
                     psFree(fpa);
                     psFree(view);
-                    psFree(file);
+                    psFree(file);
                     return NULL;
                 }