Changeset 30618 for trunk/ppSim/src/ppSimMakeGalaxies.c

Timestamp:

Feb 13, 2011, 11:35:11 AM (15 years ago)

Author:

eugene

Message:

remove old deprecated functions related to in-line photometry in ppSim; enable 2D seeing variation in simulated images (SEEING.RAMP); galaxy angle in degrees; galaxy grid fluxes user set

File:

• trunk/ppSim/src/ppSimMakeGalaxies.c (modified) (5 diffs)

trunk/ppSim/src/ppSimMakeGalaxies.c

@@ -28 +28 @@
     float galaxyThetaMax  = psMetadataLookupF32(&mdok, recipe, "GALAXY.THETA.MAX"); // Density of fakes
     float galaxyThetaMin  = psMetadataLookupF32(&mdok, recipe, "GALAXY.THETA.MIN"); // Density of fakes
+    galaxyThetaMax *= PS_RAD_DEG;
+    galaxyThetaMin *= PS_RAD_DEG;
 
     float galaxyIndexMin  = psMetadataLookupF32(&mdok, recipe, "GALAXY.INDEX.MIN"); // Density of fakes
@@ -95 +97 @@
 
         int i = 0;
+        float refNorm = 1.0;
+        float ourNorm = 1.0;
 
         for (long iy = 0.5*galaxyGridDY; iy < ySize; iy += galaxyGridDY) {
@@ -104 +108 @@
                 galaxy->y    = iy;
 
-                galaxy->peak = 1000;
+                // galaxy->peak = 1000;
+                galaxy->peak = bright / 100.0;
+                // fprintf (stderr, "Io: %f\n", bright);
 
                 // galaxyIndex from user should be for function of this form: exp(-r^(1/n))
@@ -111 +117 @@
                 float rndValue;
 
-                rndValue = galaxyGridRandom ? drand48() : i / num;
+                rndValue = galaxyGridRandom ? drand48() : i / (float) num;
                 float index = (galaxyIndexMin  + rndValue * galaxyIndexSlope);
                 galaxy->index = 0.5/index; // factor of 0.5 because the Sersic model creates exp(-z^n), not exp(-r^n)
 
-                rndValue = galaxyGridRandom ? drand48() : i / num;
+                rndValue = galaxyGridRandom ? drand48() : i / (float) num;
                 float scale = (galaxyRmajorMin + rndValue * galaxyRmajorSlope);
 
@@ -125 +131 @@
                 galaxy->Rmaj  = scale;
 
-                rndValue = galaxyGridRandom ? drand48() : i / num;
+                rndValue = galaxyGridRandom ? drand48() : i / (float) num;
                 galaxy->Rmin  = (galaxyARatioMin + rndValue * galaxyARatioSlope) * galaxy->Rmaj;
 
-                rndValue = galaxyGridRandom ? drand48() : i / num;
+                rndValue = galaxyGridRandom ? drand48() : i / (float) num;
                 galaxy->theta = (galaxyThetaMin  + rndValue * galaxyThetaSlope);
-
-                // galaxy->peak *= Io;
+                
+                if (i == 0) {
+                    refNorm = Io*scale*scale;
+                } 
+                ourNorm = refNorm / (Io*scale*scale);
+                galaxy->peak *= ourNorm;
 
                 if (0) {
-                    fprintf (stderr, "Rmaj: %f, scale: %f, index: %f, bn: %f, Ro: %f, Io: %f\n", galaxy->Rmaj, scale, index, bn, fR, Io);
+                    fprintf (stderr, "Rmaj: %f, scale: %f, index: %f, bn: %f, Ro: %f, Io: %f, theta: %f\n", galaxy->Rmaj, scale, index, bn, fR, Io, galaxy->theta);
                 }