Changeset 25760

Timestamp:

Oct 2, 2009, 3:17:11 PM (17 years ago)

Author:

eugene

Message:

ppSim was unable to load refstars, now fixed

Location:

trunk/ppSim/src

Files:

• ppSimLoadStars.c (modified) (1 diff)
• ppSimLoop.c (modified) (2 diffs)
• ppSimMakeStars.c (modified) (1 diff)

trunk/ppSim/src/ppSimLoadStars.c

@@ -41 +41 @@
     psMetadataAdd(astroRecipe, PS_LIST_TAIL, "DEC_MIN", PS_DATA_F32 | PS_META_REPLACE, "", dec0 - radius);
     psMetadataAdd(astroRecipe, PS_LIST_TAIL, "DEC_MAX", PS_DATA_F32 | PS_META_REPLACE, "", dec0 + radius);
-    psArray *refStars = psastroLoadRefstars(config, "PSASTRO.INPUT");
+    psArray *refStars = psastroLoadRefstars(config, "PPSIM.OUTPUT");
     if (!refStars) {
         psError(PS_ERR_UNKNOWN, false, "Unable to find reference stars.");

trunk/ppSim/src/ppSimLoop.c

@@ -30 +30 @@
     ppSimType type = ppSimTypeFromString (typeStr); // Type of image to simulate
     int binning = psMetadataLookupS32(NULL, recipe, "BINNING"); // Binning in x and y
+
+    ppSimUpdateConceptsFPA (fpa, config);
+    if (fpa->hdu) { // XXX only do this if there is no INPUT image
+        if (!ppSimInitHeader(config, fpa, NULL, NULL)) ESCAPE (PS_ERR_UNKNOWN, "problem setting output header");
+    }
 
     psArray *stars = psArrayAllocEmpty (1);
@@ -57 +62 @@
         psFree(view);
         return false;
-    }
-
-    ppSimUpdateConceptsFPA (fpa, config);
-    if (fpa->hdu) { // XXX only do this if there is no INPUT image
-        if (!ppSimInitHeader(config, fpa, NULL, NULL)) ESCAPE (PS_ERR_UNKNOWN, "problem setting output header");
     }
 

trunk/ppSim/src/ppSimMakeStars.c

@@ -61 +61 @@
         if (!status) {
             refMag = brightMag;
-            refSum = 1;
+            refSum = starsDensity * xSize * ySize * PS_SQR(scale * 180.0 / M_PI);
         }
     } else {