Changeset 18011 for trunk/ppSim/src/ppSimInsertGalaxies.c

Timestamp:

Jun 8, 2008, 4:03:31 PM (18 years ago)

Author:

eugene

Message:

update from changes on eam_branch_20080511 : adding photometry of fake sources, force photometry; major cleanups

File:

• trunk/ppSim/src/ppSimInsertGalaxies.c (modified) (3 diffs)

trunk/ppSim/src/ppSimInsertGalaxies.c

@@ -10 +10 @@
     
     if (!galaxies->n) { return true; }
-
-    // XXX is this needed?
-    // pmFPAfile *simSources = psMetadataLookupPtr(NULL, config->files, "PPSIM.SOURCES"); // Output sources
 
     pmCell *cell = readout->parent;
@@ -38 +35 @@
     if (isnan(skyRate)) {
         float zp      = psMetadataLookupF32(&mdok, recipe, "ZEROPOINT"); assert (mdok);
-        float scale   = psMetadataLookupF32(&mdok, recipe, "SCALE");     assert (mdok);
+        float scale   = psMetadataLookupF32(&mdok, recipe, "PIXEL.SCALE"); assert (mdok);
         float skyMags = psMetadataLookupF32(&mdok, recipe, "SKY.MAGS");  assert (mdok);
         skyRate = scale * scale * ppSimMagToFlux (skyMags, zp);
@@ -56 +53 @@
     int yParityCell = psMetadataLookupS32(NULL, cell->concepts, "CELL.YPARITY");
 
-    int binning = psMetadataLookupS32(NULL, config->arguments, "BINNING"); // Binning in x and y
+    int binning = psMetadataLookupS32(NULL, recipe, "BINNING"); // Binning in x and y
 
     // determine the galaxy model
-    char *modelName = psMetadataLookupStr(&mdok, config->arguments, "GALAXY.MODEL"); // galaxy model name
+    char *modelName = psMetadataLookupStr(&mdok, recipe, "GALAXY.MODEL"); // galaxy model name
     if (modelName == NULL) {
         modelName = defaultModel;