Changeset 17705 for branches/eam_branch_20080511/ppSim/src/ppSimArguments.c

Timestamp:

May 15, 2008, 4:44:46 PM (18 years ago)

Author:

eugene

Message:

options to turn on and off all of the components

File:

• branches/eam_branch_20080511/ppSim/src/ppSimArguments.c (modified) (5 diffs)

branches/eam_branch_20080511/ppSim/src/ppSimArguments.c

@@ -22 +22 @@
 {
     bool status;
-    bool mdok;                          // Status of MD lookup
 
     assert(config);
@@ -154 +153 @@
     ppSimType type = ppSimTypeFromString (typeStr);
 
-    char *filter = ppSimArgToRecipeStr(&status, options, "FILTER", arguments, "-filter"); // Filter name
+    ppSimArgToRecipeStr(&status, options, "FILTER", arguments, "-filter"); // Filter name
 
     // set the exposure time 
@@ -178 +177 @@
     ppSimArgToRecipeS32(&status, options, "BINNING",       arguments, "-bin");
 
-    // XX don't do this: recipe is not yet fully realized (camera options not interpolated)
-    psMetadata *recipe = psMetadataLookupMetadata(&mdok, config->recipes, PPSIM_RECIPE); // Recipe
-
     if (type == PPSIM_TYPE_OBJECT) {
         // Load values required for adding stars
@@ -195 +191 @@
         }
 
-        float scale = ppSimArgToRecipeF32(&status, options, "PIXEL.SCALE", arguments, "-scale"); // Plate scale
+        ppSimArgToRecipeF32(&status, options, "PIXEL.SCALE", arguments, "-scale"); // Plate scale (arcsec / pixel)
         ppSimArgToRecipeF32(&status, options, "SKY.MAGS", arguments, "-skymags"); // Plate scale
         ppSimArgToRecipeStr(&status, options, "PSF.MODEL",    arguments, "-psfclass"); // PSF model class
@@ -201 +197 @@
 
         // the user supplies FWHM in arcsec; here we convert to Sigma in pixels
-        psMetadataAddF32(options, PS_LIST_TAIL, "SEEING", 0, "Seeing SIGMA (pixels)", seeing / 2.0 / sqrt(2.0 * log(2.0)) / scale);
+        psMetadataAddF32(options, PS_LIST_TAIL, "SEEING", 0, "Seeing FWHM (arcsec)", seeing);
         psMetadataAddF32(options, PS_LIST_TAIL, "RA", 0, "Boresight RA (radians)", ra0 * M_PI / 180.0);
         psMetadataAddF32(options, PS_LIST_TAIL, "DEC", 0, "Boresight Declination (radians)", dec0 * M_PI / 180.0);
         psMetadataAddF32(options, PS_LIST_TAIL, "PA", 0, "Boresight position angle (radians)",pa * M_PI / 180.0);
 
-        assert (filter != NULL);
-
         ppSimArgToRecipeF32(&status, options, "ZEROPOINT", arguments, "-zp"); // Zero point
-        if (!status) {
-            float zp = ppSimGetZeroPoint (recipe, filter);
-            psMetadataAddF32(options, PS_LIST_TAIL, "ZEROPOINT", 0, "Photometric zeropoint", zp);
-        }
     }