Changeset 14667 for trunk/ppSim/src/ppSimLoop.c

Timestamp:

Aug 25, 2007, 11:57:36 AM (19 years ago)

Author:

eugene

Message:

added galaxies, some tweaks

File:

• trunk/ppSim/src/ppSimLoop.c (modified) (7 diffs)

trunk/ppSim/src/ppSimLoop.c

@@ -17 +17 @@
 
     // Load catalogue stars
-    psArray *stars = NULL;
+    psArray *stars = psArrayAllocEmpty (1);
     if (type == PPSIM_TYPE_OBJECT) {
-        stars = ppSimLoadStars (fpa, config);
+        ppSimLoadStars (stars, fpa, config);
     }
 
@@ -25 +25 @@
     if (type == PPSIM_TYPE_OBJECT) {
         ppSimMakeStars (stars, fpa, config, rng);
+    }
+
+    // Add random galaxies
+    psArray *galaxies = psArrayAllocEmpty (1);
+    if (type == PPSIM_TYPE_OBJECT) {
+        ppSimMakeGalaxies (galaxies, fpa, config, rng);
     }
 
@@ -62 +68 @@
         while ((cell = pmFPAviewNextCell(view, fpa, 1))) {
 
-            // Size, position and orientation of cell
-            int numCols = psMetadataLookupS32(NULL, cell->concepts, "CELL.XSIZE") / binning;
-            int numRows = psMetadataLookupS32(NULL, cell->concepts, "CELL.YSIZE") / binning;
-
+            // check that we are able to work with this cell (readdir must be 1)
             int readdir = psMetadataLookupS32(NULL, cell->concepts, "CELL.READDIR"); // Read direction
             if (readdir != 1) {
@@ -73 +76 @@
             }
 
-            psVector *biasCols = ppSimMakeBiassec (cell, config);
+            // if no readout exists, generate a single readout (upgrade to allow multiple
+            // readouts?)
+            if (cell->readouts->n == 0) {
+                // Size, position and orientation of cell
+                int numCols = psMetadataLookupS32(NULL, cell->concepts, "CELL.XSIZE") / binning;
+                int numRows = psMetadataLookupS32(NULL, cell->concepts, "CELL.YSIZE") / binning;
 
-            int numReadouts = 1;
-            for (int i = 0; i < numReadouts; i++) {
+                // generate a new readout for this cell
                 pmReadout *readout = pmReadoutAlloc(cell); // Readout within cell
 
@@ -83 +90 @@
                 readout->weight = psImageAlloc(numCols, numRows, PS_TYPE_F32); // Noise in pixels
 
+                psImageInit (readout->image, 0.0);
+                psImageInit (readout->weight, 0.0);
+            }
+
+            psVector *biasCols = ppSimMakeBiassec (cell, config);
+
+            for (int i = 0; i < cell->readouts->n; i++) {
+
+                pmReadout *readout = cell->readouts->data[i];
+                assert (readout);
+
+                // if we have not read in a weight or generated a fake image above, we need to
+                // build one here
+                if (!readout->weight) {
+                    if (!pmReadoutGenerateWeight(readout, true)) {
+                        psError (PS_ERR_UNKNOWN, false, "trouble creating weight");
+                        return false;
+                    }
+                }
+
                 psImage *expCorr = NULL; // Exposure correction per pixel, for adding objects
                 if (type == PPSIM_TYPE_OBJECT) {
-                    expCorr = psImageAlloc(numCols, numRows, PS_TYPE_F32);
+                    expCorr = psImageAlloc(readout->image->numCols, readout->image->numRows, PS_TYPE_F32);
                 }
 
                 psVector *biasRows = ppSimMakeBias (readout, config, rng);
                 if (type == PPSIM_TYPE_BIAS) goto done;
-                
+        
                 ppSimMakeDark (readout, config);
                 if (type == PPSIM_TYPE_DARK) goto done;
@@ -99 +126 @@
                 if (type == PPSIM_TYPE_OBJECT) {
                     ppSimInsertSources (readout, expCorr, stars, config);
+                }
+
+                if (type == PPSIM_TYPE_OBJECT) {
+                    ppSimInsertGalaxies (readout, expCorr, galaxies, config);
                 }
 
@@ -111 +142 @@
                 readout->parent->data_exists = true;
                 readout->parent->parent->data_exists = true;
-                psFree(readout);        // Drop reference
             }
             psFree(biasCols);