Changeset 23197 for branches/cnb_branches/cnb_branch_20090215/psModules/src/objects/pmSourcePhotometry.c

Timestamp:

Mar 5, 2009, 11:13:29 AM (17 years ago)

Author:

beaumont

Message:

Finished ppStack visualization. Unified the way in which visualizations are invoked, plotting windows are closed, etc

Location:

branches/cnb_branches/cnb_branch_20090215

Files:

• . (modified) (1 prop)
• psModules/src/objects/pmSourcePhotometry.c (modified) (3 diffs)

branches/cnb_branches/cnb_branch_20090215/psModules/src/objects/pmSourcePhotometry.c

@@ -3 +3 @@
  *  @author EAM, IfA; GLG, MHPCC
  *
- *  @version $Revision: 1.49.4.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-19 17:59:50 $
+ *  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-16 22:28:54 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -578 +578 @@
         }
     }
-    model->nPix = Npix;
+    model->nPix = Npix; 
     model->nDOF = Npix - 1;
     model->chisq = dC;
@@ -768 +768 @@
 // measure centroid of unshifted gaussian (should be 16.0,16.0)
         {
-          psImage *image = source->pixels;
-          float xo = 0.0;
-          float yo = 0.0;
-          float xo2 = 0.0;
-          float yo2 = 0.0;
-          float no = 0.0;
-          for (int j = 0; j < image->numRows; j++)
-          {
-            for (int i = 0; i < image->numCols; i++) {
-              xo += i*image->data.F32[j][i];
-              yo += j*image->data.F32[j][i];
-              xo2 += i*i*image->data.F32[j][i];
-              yo2 += j*j*image->data.F32[j][i];
-              no += image->data.F32[j][i];
-            }
-          }
-          xo /= no;
-          yo /= no;
-          xo2 = sqrt (xo2/no - xo*xo);
-          yo2 = sqrt (yo2/no - yo*yo);
-          fprintf (stderr, "pre-shift centroid: %f,%f, sigma: %f,%f: flux: %f\n", xo, yo, xo2, yo2, no);
+          psImage *image = source->pixels;
+          float xo = 0.0;
+          float yo = 0.0;
+          float xo2 = 0.0;
+          float yo2 = 0.0;
+          float no = 0.0;
+          for (int j = 0; j < image->numRows; j++)
+          {
+            for (int i = 0; i < image->numCols; i++) {
+              xo += i*image->data.F32[j][i];
+              yo += j*image->data.F32[j][i];
+              xo2 += i*i*image->data.F32[j][i];
+              yo2 += j*j*image->data.F32[j][i];
+              no += image->data.F32[j][i];
+            }
+          }
+          xo /= no;
+          yo /= no;
+          xo2 = sqrt (xo2/no - xo*xo);
+          yo2 = sqrt (yo2/no - yo*yo);
+          fprintf (stderr, "pre-shift centroid: %f,%f, sigma: %f,%f: flux: %f\n", xo, yo, xo2, yo2, no);
         }
 
 // measure centroid of unshifted gaussian (should be 16.0,16.0)
         {
-          psImage *image = flux;
-          float xo = 0.0;
-          float yo = 0.0;
-          float xo2 = 0.0;
-          float yo2 = 0.0;
-          float no = 0.0;
-          for (int j = 0; j < image->numRows; j++)
-          {
-            for (int i = 0; i < image->numCols; i++) {
-              xo += i*image->data.F32[j][i];
-              yo += j*image->data.F32[j][i];
-              xo2 += i*i*image->data.F32[j][i];
-              yo2 += j*j*image->data.F32[j][i];
-              no += image->data.F32[j][i];
-            }
-          }
-          xo /= no;
-          yo /= no;
-          xo2 = sqrt (xo2/no - xo*xo);
-          yo2 = sqrt (yo2/no - yo*yo);
-          fprintf (stderr, "pre-shift centroid: %f,%f, sigma: %f,%f: flux: %f\n", xo, yo, xo2, yo2, no);
+          psImage *image = flux;
+          float xo = 0.0;
+          float yo = 0.0;
+          float xo2 = 0.0;
+          float yo2 = 0.0;
+          float no = 0.0;
+          for (int j = 0; j < image->numRows; j++)
+          {
+            for (int i = 0; i < image->numCols; i++) {
+              xo += i*image->data.F32[j][i];
+              yo += j*image->data.F32[j][i];
+              xo2 += i*i*image->data.F32[j][i];
+              yo2 += j*j*image->data.F32[j][i];
+              no += image->data.F32[j][i];
+            }
+          }
+          xo /= no;
+          yo /= no;
+          xo2 = sqrt (xo2/no - xo*xo);
+          yo2 = sqrt (yo2/no - yo*yo);
+          fprintf (stderr, "pre-shift centroid: %f,%f, sigma: %f,%f: flux: %f\n", xo, yo, xo2, yo2, no);
         }
 # endif