Changeset 12873 for trunk/ppSim/src/ppSimCreate.c

Timestamp:

Apr 17, 2007, 6:29:18 PM (19 years ago)

Author:

Paul Price

Message:

Fixing bias, adding catalog and random stars.

File:

• trunk/ppSim/src/ppSimCreate.c (modified) (5 diffs)

trunk/ppSim/src/ppSimCreate.c

@@ -13 +13 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    psString formatName = psMetadataLookupStr(NULL, config->arguments, "FORMAT"); // Input format name
-    config->formatName = psMemIncrRefCounter(formatName);
-
-    psMetadata *formats = psMetadataLookupMetadata(NULL, config->camera, "FORMATS"); // The camera formats
-    if (!formats) {
-        psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find FORMATS in camera configuration.");
-        return NULL;
-    }
-    psMetadata *format = psMetadataLookupMetadata(NULL, formats, formatName); // Format of interest
-    if (!format) {
-        psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find format %s in camera FORMATS.", formatName);
-        return NULL;
-    }
-    pmFPALevel phuLevel = pmFPAPHULevel(format); // Level at which PHU goes
-
     pmFPA *fpa = pmFPAConstruct(config->camera); // FPA to contain the observation
     if (!fpa) {
@@ -34 +19 @@
     }
 
+    pmFPAfile *file = pmFPAfileDefineOutput(config, fpa, OUTPUT_FILE);
+    psFree(fpa);
+    if (!file) {
+        psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to create output file from %s.  "
+                "Did you forget to specify the format?", OUTPUT_FILE);
+        return NULL;
+    }
+    if (file->type != PM_FPA_FILE_IMAGE) {
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true, "%s type is not IMAGE", OUTPUT_FILE);
+        psFree(file);
+        return NULL;
+    }
+
+    pmFPALevel phuLevel = pmFPAPHULevel(file->format); // Level at which PHU goes
+
     pmFPAview *view = pmFPAviewAlloc(0);// View for current level
 
     if (phuLevel == PM_FPA_LEVEL_FPA) {
-        if (!pmFPAAddSourceFromView(fpa, "Simulation", view, format)) {
+        if (!pmFPAAddSourceFromView(fpa, "Simulation", view, file->format)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to add PHU to FPA.");
             psFree(fpa);
@@ -48 +48 @@
     while ((chip = pmFPAviewNextChip(view, fpa, 1))) {
         if (phuLevel == PM_FPA_LEVEL_CHIP) {
-            if (!pmFPAAddSourceFromView(fpa, "Simulation", view, format)) {
+            if (!pmFPAAddSourceFromView(fpa, "Simulation", view, file->format)) {
                 psError(PS_ERR_UNKNOWN, false, "Unable to add PHU to FPA.");
                 psFree(fpa);
@@ -59 +59 @@
         while ((cell = pmFPAviewNextCell(view, fpa, 1))) {
             if (phuLevel == PM_FPA_LEVEL_CELL) {
-                if (!pmFPAAddSourceFromView(fpa, "Simulation", view, format)) {
+                if (!pmFPAAddSourceFromView(fpa, "Simulation", view, file->format)) {
                     psError(PS_ERR_UNKNOWN, false, "Unable to add PHU to FPA.");
                     psFree(fpa);
@@ -70 +70 @@
     psFree(view);
 
-    pmFPAfile *file = pmFPAfileDefineOutput(config, fpa, OUTPUT_FILE);
-    psFree(fpa);
-    if (!file) {
-        psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to create output file from %s", OUTPUT_FILE);
-        return NULL;
-    }
-    if (file->type != PM_FPA_FILE_IMAGE) {
-        psError(PS_ERR_BAD_PARAMETER_TYPE, true, "%s type is not IMAGE", OUTPUT_FILE);
-        psFree(file);
-        return NULL;
-    }
-
     return file;
 }