Changeset 27840 for branches/simtest_nebulous_branches/extsrc/gpcsw/gpcsrc/fits/burntool/psfstamp.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

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

branches/simtest_nebulous_branches/extsrc/gpcsw/gpcsrc/fits/burntool/psfstamp.c

@@ -112 +112 @@
 
 /* Make a postage stamp for it */
-      box[k].stamp = (IMTYPE *)calloc(size*size, sizeof(IMTYPE));
+      if( (box[k].stamp = (IMTYPE *)calloc(size*size, sizeof(IMTYPE))) == NULL) {
+         fprintf(stderr, "\rerror: failed to stamp buffer\n");
+         exit(-675);
+      }
+
       sum = 0;
       for(j=y0; j<=y1; j++) {
@@ -136 +140 @@
    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[5], qt, xfp, yfp, pi=4*atan(1.0);
+   double scale, phi, fwhm[3], q[7], qt, xfp, yfp, pi=4*atan(1.0);
    IMTYPE *median_image;
    CELL *cell;
@@ -171 +175 @@
 
 /* Create a median image and write as the first one */
-   median_image = (IMTYPE *)calloc(nx*ny, sizeof(IMTYPE));
+   if( (median_image = (IMTYPE *)calloc(nx*ny, sizeof(IMTYPE))) == NULL) {
+      fprintf(stderr, "\rerror: failed to alloc median PSF image\n");
+      exit(-676);
+   }
    for(i=0; i<nx*ny; i++) {
       nstar = 0;
@@ -256 +263 @@
    int k, l, cellx, celly, ota_xid, ota_yid, nfwave, nqavg;
    double xota, yota, xfp, yfp, phi;
-   double fwhm[3], q[3], fw[MAXPSFMEDIAN];
+   double fwhm[3], q[7], fw[MAXPSFMEDIAN];
    double m2[MAXPSFMEDIAN], qp[MAXPSFMEDIAN], qc[MAXPSFMEDIAN];
    double qt[MAXPSFMEDIAN], fwavg[MAXPSFMEDIAN];
+   double qpavg[MAXPSFMEDIAN], qcavg[MAXPSFMEDIAN], qtavg[MAXPSFMEDIAN];
    double q3c[MAXPSFMEDIAN], q3s[MAXPSFMEDIAN];
-   double qpavg[MAXPSFMEDIAN], qcavg[MAXPSFMEDIAN], qtavg[MAXPSFMEDIAN];
    double q3cavg[MAXPSFMEDIAN], q3savg[MAXPSFMEDIAN];
+   double q1c[MAXPSFMEDIAN], q1s[MAXPSFMEDIAN];
+   double q1cavg[MAXPSFMEDIAN], q1savg[MAXPSFMEDIAN];
    int nstar[MAXCELL], nfw[MAXCELL];
    double fwmed[MAXCELL], m2med[MAXCELL];
    double qpmed[MAXCELL], qcmed[MAXCELL], qtmed[MAXCELL];
    double q3cmed[MAXCELL], q3smed[MAXCELL];
-   double qpmacro, qcmacro, qtmacro, fwmacro, q3cmacro, q3smacro;
+   double q1cmed[MAXCELL], q1smed[MAXCELL];
+   double qpmacro, qcmacro, qtmacro, fwmacro, q3cmacro, q3smacro, q1cmacro, q1smacro;
    FILE *fp;
    CELL *cell;
@@ -310 +320 @@
                      q3c[nstar[k]] = q[3];
                      q3s[nstar[k]] = q[4];
+                     q1c[nstar[k]] = q[5];
+                     q1s[nstar[k]] = q[6];
 /* Get the position in the focal plane and therefore the qt statistic */
                      psc_cell_to_pixel(cellx, celly, 0.5*PSC_HCELL/PSC_PIXEL, 
@@ -333 +345 @@
                   q3cmed[k] = double_median(nstar[k], q3c);
                   q3smed[k] = double_median(nstar[k], q3s);
+                  q1cmed[k] = double_median(nstar[k], q1c);
+                  q1smed[k] = double_median(nstar[k], q1s);
                } else {
                   m2med[k] = qpmed[k] = qcmed[k] = qtmed[k] = -99.99;
                   q3cmed[k] = q3smed[k] = -99.99;
+                  q1cmed[k] = q1smed[k] = -99.99;
                }
 /* Toss these results into the macrocell median hopper */
@@ -348 +363 @@
                      q3cavg[nqavg] = q3c[l];
                      q3savg[nqavg] = q3s[l];
+                     q1cavg[nqavg] = q1c[l];
+                     q1savg[nqavg] = q1s[l];
                      nqavg++;
                   }
@@ -359 +376 @@
          q3cmacro = double_median(nqavg, q3cavg);
          q3smacro = double_median(nqavg, q3savg);
-         if(nqavg == 0) qpmacro = qcmacro = qtmacro = q3cmacro = q3smacro = -99.99;
+         q1cmacro = double_median(nqavg, q1cavg);
+         q1smacro = double_median(nqavg, q1savg);
+         if(nqavg == 0) qpmacro = qcmacro = qtmacro = q3cmacro = q3smacro = q1cmacro = q1smacro = -99.99;
          fwmacro = double_median(nfwave, fwavg);
 
@@ -370 +389 @@
                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 q3c=%.3f q3s=%.3f qpm=%.3f qcm=%.3f qtm=%.3f q3cm=%.3f q3sm=%.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 q1c=%.3f q1s=%.3f qpm=%.3f qcm=%.3f qtm=%.3f q3cm=%.3f q3sm=%.3f q1cm=%.3f q1sm=%.3f\n", 
                        cellx, celly, cell->bias, cell->sky, cell->rms, 
                        nstar[k], fwmed[k], fwmacro, m2med[k], 
-                       qpmed[k], qcmed[k], qtmed[k], q3cmed[k], q3smed[k],
-                       qpmacro, qcmacro, qtmacro, q3cmacro, q3smacro);
+                       qpmed[k], qcmed[k], qtmed[k], q3cmed[k], q3smed[k], 
+                       q1cmed[k], q1smed[k],
+                       qpmacro, qcmacro, qtmacro, q3cmacro, q3smacro, 
+                       q1cmacro, q1smacro);
             }
          }