Changeset 12917 for trunk/ppSim/src/ppSimArguments.c

Timestamp:

Apr 18, 2007, 4:11:34 PM (19 years ago)

Author:

Paul Price

Message:

Using psastro to get the reference stars, instead of a text file.

File:

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

trunk/ppSim/src/ppSimArguments.c

@@ -170 +170 @@
                      config->argv[1]);
 
-
-    // Values common for stars
-    float scale = psMetadataLookupF32(NULL, arguments, "-scale"); // Plate scale
-    float zp = psMetadataLookupF32(NULL, arguments, "-zp"); // Zero point
-    float seeing = psMetadataLookupF32(NULL, arguments, "-seeing"); // Zero point
-    psMetadataAddF32(config->arguments, PS_LIST_TAIL, "SCALE", 0, "Plate scale (arcsec/pix)", scale);
-    psMetadataAddF32(config->arguments, PS_LIST_TAIL, "ZEROPOINT", 0, "Photometric zeropoint", zp);
-    psMetadataAddF32(config->arguments, PS_LIST_TAIL, "SEEING", 0, "Seeing simga (pix)",
-                     seeing / 2.0 / sqrt(2.0 * log(2.0)) / scale);
-
-    const char *starName = psMetadataLookupStr(NULL, arguments, "-stars"); // Name of file with stars
-    if (starName) {
+    if (type == PPSIM_TYPE_OBJECT) {
+        // Load values required for adding stars
+        float scale = psMetadataLookupF32(NULL, arguments, "-scale"); // Plate scale
+        float zp = psMetadataLookupF32(NULL, arguments, "-zp"); // Zero point
+        float seeing = psMetadataLookupF32(NULL, arguments, "-seeing"); // Zero point
         float ra0 = psMetadataLookupF32(NULL, arguments, "-ra"); // Right Ascension of boresight
         float dec0 = psMetadataLookupF32(NULL, arguments, "-dec"); // Declination of boresight
@@ -188 +181 @@
         if (isnan(ra0) || isnan(dec0) || isnan(pa) || isnan(scale) || isnan(zp) || isnan(seeing)) {
             psError(PS_ERR_BAD_PARAMETER_VALUE, false,
-                    "-ra, -dec, -pa -scale, -zp, -seeing must be specified with -stars");
+                    "-ra, -dec, -pa, -scale, -zp, -seeing must be specified for OBJECT type");
             usage(arguments, config);
         }
+        psMetadataAddF32(config->arguments, PS_LIST_TAIL, "SCALE", 0, "Plate scale (arcsec/pix)", scale);
+        psMetadataAddF32(config->arguments, PS_LIST_TAIL, "ZEROPOINT", 0, "Photometric zeropoint", zp);
+        psMetadataAddF32(config->arguments, PS_LIST_TAIL, "SEEING", 0, "Seeing simga (pix)",
+                         seeing / 2.0 / sqrt(2.0 * log(2.0)) / scale);
         psMetadataAddF32(config->arguments, PS_LIST_TAIL, "RA", 0, "Boresight RA (radians)",
                          ra0 * M_PI / 180.0);
@@ -197 +194 @@
         psMetadataAddF32(config->arguments, PS_LIST_TAIL, "PA", 0, "Boresight position angle (radians)",
                          pa * M_PI / 180.0);
-
-        psArray *raDecMag = psVectorsReadFromFile(starName, "%f %f %f"); // Vectors for RA Dec Mag
-        if (!raDecMag || raDecMag->n != 3) {
-            psError(PS_ERR_IO, false, "Unable to read RA Dec Mag from %s", starName);
-            psFree(raDecMag);
-            psFree(arguments);
-            psFree(config);
-            exit(PS_EXIT_CONFIG_ERROR);
-        }
-
-        psVector *ra = raDecMag->data[0]; // Star RAs
-        psVector *dec = raDecMag->data[1]; // Star Declinations
-        psVector *mag = raDecMag->data[2]; // Star magnitudes
-        for (long i = 0; i < ra->n; i++) {
-            ra->data.F32[i] *= M_PI / 180.0;
-            dec->data.F32[i] *= M_PI / 180.0;
-        }
-
-        psMetadataAddVector(config->arguments, PS_LIST_TAIL, "CATALOG.RA", 0, "Star RAs (radians)", ra);
-        psMetadataAddVector(config->arguments, PS_LIST_TAIL, "CATALOG.DEC", 0, "Star Decs (radians)", dec);
-        psMetadataAddVector(config->arguments, PS_LIST_TAIL, "CATALOG.MAG", 0, "Star magnitudes", mag);
-        psFree(raDecMag);
-    }
-
-    if (psMetadataLookupF32(NULL, config->arguments, "STARS.DENSITY") > 0 &&
-        (isnan(scale) || isnan(zp) || isnan(seeing))) {
-        psWarning("-scale, -zp, -seeing must be specified if fake stars are to be generated --- turned off.");
-        psMetadataAddS32(config->arguments, PS_LIST_TAIL, "STASR.NUM", PS_META_REPLACE,
-                         "Fake stars turned off", 0);
-    }
-
+    }
 
     psFree(arguments);