Changeset 14614 for branches/eam_branch_20070817/ppSim/src/ppSimLoop.c

Timestamp:

Aug 22, 2007, 3:05:47 PM (19 years ago)

Author:

eugene

Message:

load / apply psf model from external source

File:

• branches/eam_branch_20070817/ppSim/src/ppSimLoop.c (modified) (8 diffs)

branches/eam_branch_20070817/ppSim/src/ppSimLoop.c

@@ -1 +1 @@
 #include "ppSim.h"
 
-psExit ppSimLoop(pmConfig *config)
+bool ppSimLoop(pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, PS_EXIT_PROG_ERROR);
@@ -48 +48 @@
         }
 
-        // XXX check for a supplied PSF, otherwise generate a basic one
         if (type == PPSIM_TYPE_OBJECT) {
-            // XXX TBD : ppSimSetPSF (chip, config);
+            if (!ppSimSetPSF (chip, config)) {
+                psError(PS_ERR_UNKNOWN, false, "failed IO for chip %d in ppSim\n", view->chip);
+                psFree (view);
+                return false;
+            }
         }
 
@@ -64 +67 @@
                 psError(PS_ERR_BAD_PARAMETER_VALUE, true, "CELL.READDIR = 1 is the only supported mode.");
                 psFree(rng);
-                return PS_EXIT_CONFIG_ERROR;
+                return false;
             }
 
@@ -90 +93 @@
                 ppSimMakeSky (readout, expCorr, type, config);
                 if (type == PPSIM_TYPE_FLAT) goto done;
-
-                // if (type == PPSIM_TYPE_OBJECT) {
-                // ppSimInsertStars (readout, expCorr, stars, config, chip, cell);
-                // }
 
                 if (type == PPSIM_TYPE_OBJECT) {
@@ -123 +122 @@
                 psFree(rng);
                 psFree(view);
-                return PS_EXIT_SYS_ERROR;
+                // return PS_EXIT_SYS_ERROR;
+                return false;
             }
         }
@@ -135 +135 @@
             psFree(rng);
             psFree(view);
-            return PS_EXIT_SYS_ERROR;
+            // return PS_EXIT_SYS_ERROR;
+            return false;
         }
 
@@ -148 +149 @@
         psFree(rng);
         psFree(view);
-        return PS_EXIT_SYS_ERROR;
+        // return PS_EXIT_SYS_ERROR;
+        return false;
     }
 
@@ -154 +156 @@
     psFree(view);
 
-    return 0;
+    return true;
 }