Changeset 31363

Timestamp:

Apr 24, 2011, 11:06:23 PM (15 years ago)

Author:

eugene

Message:

errMag renamed to psfMagErr

Location:

branches/eam_branches/ipp-20110404

Files:

• ppSim/src/ppSimInsertGalaxies.c (modified) (2 diffs)
• ppSim/src/ppSimInsertStars.c (modified) (1 diff)
• ppSub/src/ppSub.c (modified) (1 diff)
• ppSub/src/ppSubFlagNeighbors.c (modified) (2 diffs)
• ppSub/src/ppSubReadoutPhotometry.c (modified) (1 diff)
• psastro/src/psastroConvert.c (modified) (2 diffs)
• pswarp/src/pswarpTransformSources.c (modified) (2 diffs)

branches/eam_branches/ipp-20110404/ppSim/src/ppSimInsertGalaxies.c

@@ -162 +162 @@
         source->psfMag = -2.5*log10(galaxy->flux);
         source->extMag = -2.5*log10(galaxy->flux);
-        source->errMag = sqrt(Area*PS_SQR(roughNoise) + galaxy->flux) / galaxy->flux;   
+        source->psfMagErr = sqrt(Area*PS_SQR(roughNoise) + galaxy->flux) / galaxy->flux;        
         
         // insert the source flux in the image
@@ -173 +173 @@
 
         float par8 = (model->params->n == 8) ? model->params->data.F32[7] : 0.0;
-        fprintf (outfile, "%8.3f %8.3f %10.2f  %2d  %7.3f %5.3f  %5.3f %5.3f %5.3f %5.3f\n", galaxy->x, galaxy->y, flux, 1, source->psfMag, source->errMag, axes.major, axes.minor, axes.theta, par8);
+        fprintf (outfile, "%8.3f %8.3f %10.2f  %2d  %7.3f %5.3f  %5.3f %5.3f %5.3f %5.3f\n", galaxy->x, galaxy->y, flux, 1, source->psfMag, source->psfMagErr, axes.major, axes.minor, axes.theta, par8);
 
         psArrayAdd (sources, 100,source);

branches/eam_branches/ipp-20110404/ppSim/src/ppSimInsertStars.c

@@ -121 +121 @@
 
         source->psfMag = -2.5*log10(star->flux);
-        source->errMag = sqrt(Area*PS_SQR(roughNoise) + flux) / flux;
+        source->psfMagErr = sqrt(Area*PS_SQR(roughNoise) + flux) / flux;
         
         // set the expected model errors
-        model->dparams->data.F32[PM_PAR_I0] = source->errMag * model->params->data.F32[PM_PAR_I0];
+        model->dparams->data.F32[PM_PAR_I0] = source->psfMagErr * model->params->data.F32[PM_PAR_I0];
 
         float par8 = (model->params->n == 8) ? model->params->data.F32[7] : 0.0;
-        fprintf (outfile, "%8.3f %8.3f %10.2f  %2d  %7.3f %5.3f  %5.3f %5.3f %5.3f %5.3f\n", star->x, star->y, star->flux, 0, source->psfMag, source->errMag, axes.major, axes.minor, axes.theta, par8);
+        fprintf (outfile, "%8.3f %8.3f %10.2f  %2d  %7.3f %5.3f  %5.3f %5.3f %5.3f %5.3f\n", star->x, star->y, star->flux, 0, source->psfMag, source->psfMagErr, axes.major, axes.minor, axes.theta, par8);
 
         // if psfConvolve is TRUE, we will (elsewhere) convolve the image we a PSF

branches/eam_branches/ipp-20110404/ppSub/src/ppSub.c

@@ -94 +94 @@
 
         if (data) {
-            psString dump_file = psMetadataLookupStr(NULL, data->config->arguments, "-dumpconfig");
+            psString dump_file = psMetadataLookupStr(NULL, data->config->arguments, "DUMP_CONFIG");
             if (dump_file) {
                 if (!pmConfigDump(data->config, dump_file)) {

branches/eam_branches/ipp-20110404/ppSub/src/ppSubFlagNeighbors.c

@@ -112 +112 @@
                   bool positive = !matchRef && (sourceM1->imageID == 1);
                   positive |= matchRef && (sourceM1->imageID == 2);
-                  float SN1 = isfinite(sourceM1->errMag) ? 1.0 / sourceM1->errMag : NAN;
+                  float SN1 = isfinite(sourceM1->psfMagErr) ? 1.0 / sourceM1->psfMagErr : NAN;
                   if (positive) {
                       source->diffStats->SNp = SN1;
@@ -138 +138 @@
                   bool positive = !matchRef && (sourceM1->imageID == 1);
                   positive |= matchRef && (sourceM1->imageID == 2);
-                  float SN1 = isfinite(sourceM1->errMag) ? 1.0 / sourceM1->errMag : NAN;
-                  float SN2 = isfinite(sourceM2->errMag) ? 1.0 / sourceM2->errMag : NAN;
+                  float SN1 = isfinite(sourceM1->psfMagErr) ? 1.0 / sourceM1->psfMagErr : NAN;
+                  float SN2 = isfinite(sourceM2->psfMagErr) ? 1.0 / sourceM2->psfMagErr : NAN;
                   if (positive) {
                       source->diffStats->SNp = SN1;

branches/eam_branches/ipp-20110404/ppSub/src/ppSubReadoutPhotometry.c

@@ -175 +175 @@
 
             fprintf(sourceFile, "%f %f %f %f %f %f %f %f %d %f %f %f %f %f\n",
-                    x, y, source->psfMag, source->errMag, chi2, source->crNsigma, source->extNsigma,
+                    x, y, source->psfMag, source->psfMagErr, chi2, source->crNsigma, source->extNsigma,
                     source->pixWeight, source->mode, xMoment, yMoment, xxMoment, xyMoment, yyMoment);
         }

branches/eam_branches/ipp-20110404/psastro/src/psastroConvert.c

@@ -102 +102 @@
         pmSource *source = sources->data[n];
 
-        psTrace ("psastro", 6, "mag: %f +/- %f, mode: %x, skip: %x\n", source->psfMag, source->errMag, source->mode, skip);
+        psTrace ("psastro", 6, "mag: %f +/- %f, mode: %x, skip: %x\n", source->psfMag, source->psfMagErr, source->mode, skip);
 
         if (source->mode & skip) {
@@ -166 +166 @@
         obj->pix->yErr = dPAR[PM_PAR_YPOS];
         obj->Mag = source->psfMag;
-        obj->dMag = source->errMag;
+        obj->dMag = source->psfMagErr;
 
         // XXX do we have the information giving the readout and cell offset?

branches/eam_branches/ipp-20110404/pswarp/src/pswarpTransformSources.c

@@ -101 +101 @@
         new->psfMag = source->psfMag;
         new->extMag = source->extMag;
-        new->errMag = source->errMag;
+        new->psfMagErr = source->psfMagErr;
         new->apMag = source->apMag;
         new->pixWeightNotBad = source->pixWeightNotBad;
@@ -116 +116 @@
           (isfinite(new->psfMag) ? pow(10.0, -0.4*new->psfMag) : NAN);
         new->modelPSF->dparams->data.F32[PM_PAR_I0]=
-          (isfinite(new->psfMag) ? new->errMag*pow(10.0, -0.4*new->psfMag) : NAN);
+          (isfinite(new->psfMag) ? new->psfMagErr*pow(10.0, -0.4*new->psfMag) : NAN);
 
 #if 0