Changeset 14642

Timestamp:

Aug 23, 2007, 1:24:04 PM (19 years ago)

Author:

eugene

Message:

adding output PPSIM.SOURCES for generated sources

Location:

branches/eam_branch_20070817/ppSim

Files:

• notes.txt (modified) (2 diffs)
• src/ppSimCreate.c (modified) (1 diff)
• src/ppSimInsertSources.c (modified) (3 diffs)
• src/ppSimLoop.c (modified) (1 diff)

branches/eam_branch_20070817/ppSim/notes.txt

@@ +1 @@
+
+ppSim development work still needed:
+
+* save sources in output files
+* load input image
+
+* optionally apply detrend data (bias, dark, etc).  when adding data
+  to a loaded image, we only need to inject fake stars.
+
+* examine the range of star fluxes.  (too many are being generated).  
+* check the overlap between the real and random star fluxes
+
+* generate stars with / without known exposure correction (ie, stars
+  could be generated with known fluxes or know magnitudes)
+
+* generate galaxies (objects with random values for major, minor, theta)
+* generate convolved galaxies
 
 * should not have to supply ZP, Seeing, PA, Scale on command line for all ppSim runs
@@ -7 +24 @@
 * add generated stars to an output file (pmSource list?)
 * make star source an option (random / dvo database)
-* generate PSF from PSF model
+* add the gain to the metadata
 
 ppSimLoop:

branches/eam_branch_20070817/ppSim/src/ppSimCreate.c

@@ -48 +48 @@
     }
 
+    // XXX only invoke this code for OBJECT types of images
+    // PPSIM.SOURCES carries the constructed, fake sources with their true parameters
+    pmFPAfile *simSources = pmFPAfileDefineOutput (config, file->fpa, "PPSIM.SOURCES");
+    if (!simSources) {
+        psError(PS_ERR_UNKNOWN, false, "Cannot find a rule for PPSIM.SOURCES");
+        return false;
+    }
+    simSources->save = true;
+
     pmFPALevel phuLevel = pmFPAPHULevel(file->format); // Level at which PHU goes
 

branches/eam_branch_20070817/ppSim/src/ppSimInsertSources.c

@@ -8 +8 @@
     assert (readout);
     
+    // XXX is this needed?
+    // pmFPAfile *simSources = psMetadataLookupPtr(NULL, config->files, "PPSIM.SOURCES"); // Output sources
+
     pmCell *cell = readout->parent;
     pmChip *chip = cell->parent;
@@ -50 +53 @@
     int dY = PM_CELL_TO_CHIP (0.0, y0Cell, yParityCell, binning);
 
+    psArray *sources = psArrayAllocEmpty (stars->n);
+
     // add sources to the readout image & weight
     for (long i = 0; i < stars->n; i++) {
@@ -87 +92 @@
         // insert the source flux in the image
         pmSourceAddWithOffset (source, PM_MODEL_OP_FULL, 0xff, dX, dY);
+        psArrayAdd (sources, 100,source);
     }
 
-    // XXX add the source array to the readout analysis
+    // NOTE: readout must be part of the pmFPAfile named "PPSIM.OUTPUT"
+    psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.SOURCES", PS_DATA_ARRAY, "psphot sources", sources);
 
+    // XXX many leaks in here, i think 
     return true;
 }

branches/eam_branch_20070817/ppSim/src/ppSimLoop.c

@@ -28 +28 @@
 
     pmFPAview *view = pmFPAviewAlloc(0);// View for iterating over FPA
+
+    // XXX if we include the psphot analysis, we will need to activate the correct pmFPAfiles
+    // at the correct times.  ppSim operates on PPSIM.OUTPUT and PPSIM.SOURCES
 
     // load any needed files (eg, input image, PSF)