Changeset 17702 for branches/eam_branch_20080511/ppSim/src/ppSimLoop.c

Timestamp:

May 15, 2008, 12:01:36 PM (18 years ago)

Author:

eugene

Message:

working on getting the input image options right

File:

• branches/eam_branch_20080511/ppSim/src/ppSimLoop.c (modified) (10 diffs)

branches/eam_branch_20080511/ppSim/src/ppSimLoop.c

@@ -8 +8 @@
 bool ppSimLoop(pmConfig *config)
 {
+    bool status;
+
     PS_ASSERT_PTR_NON_NULL(config, PS_EXIT_PROG_ERROR);
 
@@ -13 +15 @@
     pmFPAfile *file = psMetadataLookupPtr(NULL, config->files, OUTPUT_FILE); // Output file
     assert(file);
+
+    // if we have an input image, we need to add the synthetic data on top of it below
+    // XXX we may potentially use this input file to skip missing elements
+    pmFPAfile *input = psMetadataLookupPtr(NULL, config->files, "PPIMAGE.INPUT");
 
     pmFPA *fpa = file->fpa;             // FPA for file
@@ -105 +111 @@
 
             psVector *biasCols = ppSimMakeBiassec (cell, config);
+
+            pmCell *inputCell = NULL;
+            if (input) {
+                inputCell = pmFPAviewThisCell (view, input->fpa);
+            }
 
             for (int i = 0; i < cell->readouts->n; i++) {
@@ -125 +136 @@
                 }
 
-                psVector *biasRows = ppSimMakeBias (readout, config, rng);
+                psVector *biasRows = ppSimMakeBias (&status, readout, config, rng);
+                if (!status) ESCAPE (PS_ERR_UNKNOWN, "problem generating dark structure");
                 if (type == PPSIM_TYPE_BIAS) goto done;
 
-                ppSimMakeDark (readout, config);
+                if (!ppSimMakeDark (readout, config)) ESCAPE (PS_ERR_UNKNOWN, "problem generating dark structure");
                 if (type == PPSIM_TYPE_DARK) goto done;
 
-                ppSimMakeSky (readout, expCorr, type, config);
+                if (!ppSimMakeSky (readout, expCorr, type, config)) ESCAPE (PS_ERR_UNKNOWN, "problem generating sky background");
                 if (type == PPSIM_TYPE_FLAT) goto done;
 
                 if (type == PPSIM_TYPE_OBJECT) {
-                    ppSimInsertStars (readout, expCorr, stars, config);
+                    if (!ppSimInsertStars (readout, expCorr, stars, config)) ESCAPE (PS_ERR_UNKNOWN, "problem inserting stars");
                 }
 
                 if (type == PPSIM_TYPE_OBJECT) {
-                    ppSimInsertGalaxies (readout, expCorr, galaxies, config);
+                    if (!ppSimInsertGalaxies (readout, expCorr, galaxies, config)) ESCAPE (PS_ERR_UNKNOWN, "problem inserting galaxies");
                 }
 
@@ -145 +157 @@
 
             done:
-                ppSimAddNoise(readout->image, readout->weight, cell, config, rng);
-                ppSimSaturate(readout, config);
-
-                ppSimBadPixels(readout, config, rng);
-
-                ppSimAddOverscan (readout, config, biasCols, biasRows, rng);
+                if (!ppSimAddNoise(readout->image, readout->weight, cell, config, rng)) ESCAPE (PS_ERR_UNKNOWN, "problem adding noise");
+                if (!ppSimSaturate(readout, config)) ESCAPE (PS_ERR_UNKNOWN, "problem setting saturation levels");
+
+                if (!ppSimBadPixels(readout, config, rng)) ESCAPE (PS_ERR_UNKNOWN, "problem adding bad pixels");
+
+                if (!ppSimAddOverscan (readout, config, biasCols, biasRows, rng)) ESCAPE (PS_ERR_UNKNOWN, "problem adding overscan region");
                 psFree(biasRows);
 
@@ -156 +168 @@
                 readout->parent->data_exists = true;
                 readout->parent->parent->data_exists = true;
+
+                if (inputCell && inputCell->readouts->data[i]) {
+                    if (!ppSimMergeReadouts (readout, inputCell->readouts->data[i])) ESCAPE (PS_ERR_UNKNOWN, "problem merging input image with simulated image");
+                }
             }
             psFree(biasCols);
 
-            ppSimUpdateConceptsCell (cell, config);
+            if (!ppSimUpdateConceptsCell (cell, config)) ESCAPE (PS_ERR_UNKNOWN, "problem updating cell concepts");
 
             if (cell->hdu) {
-                ppSimInitHeader(config, NULL, NULL, cell);
+                // XXX only do this if there is no INPUT image?
+                if (!ppSimInitHeader(config, NULL, NULL, cell)) ESCAPE (PS_ERR_UNKNOWN, "problem setting output header");
             }
 
@@ -175 +192 @@
 
         if (chip->hdu) {
-            ppSimInitHeader(config, NULL, chip, NULL);
+            // XXX only do this if there is no INPUT image
+            if (!ppSimInitHeader(config, NULL, chip, NULL)) ESCAPE (PS_ERR_UNKNOWN, "problem setting output header");
         }
 
         // we perform photometry on the readouts of this chip in the output
-        ppSimPhotom (config, view);
+        if (!ppSimPhotom (config, view)) ESCAPE (PS_ERR_UNKNOWN, "problem performing photometry");
 
         if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
@@ -185 +203 @@
             psFree(rng);
             psFree(view);
-            // return PS_EXIT_SYS_ERROR;
             return false;
         }
@@ -195 +212 @@
 
     if (fpa->hdu) {
-        ppSimInitHeader(config, fpa, NULL, NULL);
+        // XXX only do this if there is no INPUT image
+        if (!ppSimInitHeader(config, fpa, NULL, NULL)) ESCAPE (PS_ERR_UNKNOWN, "problem setting output header");
     }
 
@@ -202 +220 @@
         psFree(rng);
         psFree(view);
-        // return PS_EXIT_SYS_ERROR;
         return false;
     }