Changeset 24557 for branches/eam_branches/20090522/extsrc/gpcsw/gpcsrc/fits/burntool/psfstamp.c

Timestamp:

Jun 25, 2009, 2:00:56 PM (17 years ago)

Author:

eugene

Message:

merging changes from head

Location:

branches/eam_branches/20090522

Files:

• . (modified) (1 prop)
• extsrc/gpcsw (modified) (1 prop)
• extsrc/gpcsw/gpcsrc/fits/burntool/psfstamp.c (modified) (8 diffs)

branches/eam_branches/20090522/extsrc/gpcsw

@@ -5 +5 @@
 man
 Makefile
+Makefile.bak

@@ -5 +5 @@
 man
 Makefile
+Makefile.bak

branches/eam_branches/20090522/extsrc/gpcsw/gpcsrc/fits/burntool/psfstamp.c

@@ -136 +136 @@
    int i, k, l, nstar, fdout, otacx, otacy, xid, yid, ntot=0, sumax;
    int cellcount, ota_xid, ota_yid;
-   double scale, phi, fwhm[3], q[3], qt, xfp, yfp, pi=4*atan(1.0);
+   double scale, phi, fwhm[3], q[5], qt, xfp, yfp, pi=4*atan(1.0);
    IMTYPE *median_image;
    CELL *cell;
@@ -203 +203 @@
    qt = -q[1] * cos(2*phi) - q[2] * sin(2*phi);
 
-   printf("N= %d PSFmaj= %.2f min= %.2f theta= %.1f m2= %.2f q+= %.3f qx= %.3f qt= %.3f\n",
-          nstar, fwhm[0], fwhm[1], fwhm[2]*180/pi, q[0], q[1], q[2], qt);
+   printf("N= %d PSFmaj= %.2f min= %.2f theta= %.1f m2= %.2f q+= %.3f qx= %.3f qt= %.3f q3c= %.3f q3s= %.3f\n",
+          nstar, fwhm[0], fwhm[1], fwhm[2]*180/pi, q[0], q[1], q[2], qt,
+          q[3], q[4]);
 
    if(CONCAT_FITS) {
@@ -258 +259 @@
    double m2[MAXPSFMEDIAN], qp[MAXPSFMEDIAN], qc[MAXPSFMEDIAN];
    double qt[MAXPSFMEDIAN], fwavg[MAXPSFMEDIAN];
+   double q3c[MAXPSFMEDIAN], q3s[MAXPSFMEDIAN];
    double qpavg[MAXPSFMEDIAN], qcavg[MAXPSFMEDIAN], qtavg[MAXPSFMEDIAN];
+   double q3cavg[MAXPSFMEDIAN], q3savg[MAXPSFMEDIAN];
    int nstar[MAXCELL], nfw[MAXCELL];
    double fwmed[MAXCELL], m2med[MAXCELL];
    double qpmed[MAXCELL], qcmed[MAXCELL], qtmed[MAXCELL];
-   double qpmacro, qcmacro, qtmacro, fwmacro;
+   double q3cmed[MAXCELL], q3smed[MAXCELL];
+   double qpmacro, qcmacro, qtmacro, fwmacro, q3cmacro, q3smacro;
    FILE *fp;
    CELL *cell;
@@ -304 +308 @@
                      qp[nstar[k]] = q[1];
                      qc[nstar[k]] = q[2];
+                     q3c[nstar[k]] = q[3];
+                     q3s[nstar[k]] = q[4];
 /* Get the position in the focal plane and therefore the qt statistic */
                      psc_cell_to_pixel(cellx, celly, 0.5*PSC_HCELL/PSC_PIXEL, 
@@ -325 +331 @@
                   qcmed[k] = double_median(nstar[k], qc);
                   qtmed[k] = double_median(nstar[k], qt);
+                  q3cmed[k] = double_median(nstar[k], q3c);
+                  q3smed[k] = double_median(nstar[k], q3s);
                } else {
                   m2med[k] = qpmed[k] = qcmed[k] = qtmed[k] = -99.99;
+                  q3cmed[k] = q3smed[k] = -99.99;
                }
 /* Toss these results into the macrocell median hopper */
@@ -337 +346 @@
                      qcavg[nqavg] = qc[l];
                      qtavg[nqavg] = qt[l];
+                     q3cavg[nqavg] = q3c[l];
+                     q3savg[nqavg] = q3s[l];
                      nqavg++;
                   }
@@ -346 +357 @@
          qcmacro = double_median(nqavg, qcavg);
          qtmacro = double_median(nqavg, qtavg);
-         if(nqavg == 0) qpmacro = qcmacro = qtmacro = -99.99;
+         q3cmacro = double_median(nqavg, q3cavg);
+         q3smacro = double_median(nqavg, q3savg);
+         if(nqavg == 0) qpmacro = qcmacro = qtmacro = q3cmacro = q3smacro = -99.99;
          fwmacro = double_median(nfwave, fwavg);
 
@@ -357 +370 @@
                cell = ota + k;
 
-               fprintf(fp, "ext=xy%1d%1d bias=%d sky=%d rmssky=%d npsf=%d fwhm=%.2f fwmed=%.2f m2=%.2f qp=%.3f qc=%.3f qt=%.3f qpm=%.3f qcm=%.3f qtm=%.3f\n", 
+               fprintf(fp, "ext=xy%1d%1d bias=%d sky=%d rmssky=%d npsf=%d fwhm=%.2f fwmed=%.2f m2=%.2f qp=%.3f qc=%.3f qt=%.3f q3c=%.3f q3s=%.3f qpm=%.3f qcm=%.3f qtm=%.3f q3cm=%.3f q3sm=%.3f\n", 
                        cellx, celly, cell->bias, cell->sky, cell->rms, 
                        nstar[k], fwmed[k], fwmacro, m2med[k], 
-                       qpmed[k], qcmed[k], qtmed[k], 
-                       qpmacro, qcmacro, qtmacro);
+                       qpmed[k], qcmed[k], qtmed[k], q3cmed[k], q3smed[k],
+                       qpmacro, qcmacro, qtmacro, q3cmacro, q3smacro);
             }
          }

@@ -5 +5 @@
 man
 Makefile
+Makefile.bak