Changeset 33415 for branches/meh_branches/ppstack_test/psvideophot/src/psvideoLoop.c

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• psvideophot (modified) (1 prop)
• psvideophot/src (modified) (1 prop)
• psvideophot/src/psvideoLoop.c (modified) (10 diffs)

branches/meh_branches/ppstack_test/psvideophot/src

@@ -1 +1 @@
 psvideophot
+dumpvideo
 Makefile
 Makefile.in
@@ -9 +10 @@
 psvideophotVersionDefinitions.h
 
+

@@ -1 +1 @@
 psvideophot
+dumpvideo
 Makefile
 Makefile.in
@@ -9 +10 @@
 psvideophotVersionDefinitions.h
 
+

branches/meh_branches/ppstack_test/psvideophot/src/psvideoLoop.c

@@ -44 +44 @@
     }
 
+    psString class_id = psMetadataLookupStr(&status, config->arguments, "CLASS_ID");
+    psString cell_id = psMetadataLookupStr(&status, config->arguments, "CELL_ID");
+
 
     pmConfigCamerasCull(config, NULL);
@@ -56 +59 @@
     }
 
+    psArray *output = NULL;
+
     pmChip *chip;                       // Chip from FPA
     while ((chip = pmFPAviewNextChip(view, input->fpa, 1)) != NULL) {
         psLogMsg ("psvideophotLoop", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
+        psString chipName = psMetadataLookupStr(&status, chip->concepts, "CHIP.NAME");
+        if (strcmp(chipName, class_id)) {
+            continue;
+        }
         if (!chip->process || !chip->file_exists) {
-            continue;
+            ESCAPE("target chip has no data");
         }
         if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
             ESCAPE("load failure for Chip");
         }
+        (void) class_id;
 
         double threshold = THRESHOLD;
@@ -72 +82 @@
         while ((cell = pmFPAviewNextCell(view, input->fpa, 1)) != NULL) {
             psLogMsg ("psvideophotLoop", 5, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
+            psString cellName = psMetadataLookupStr(&status, cell->concepts, "CELL.NAME");
+            if (strcmp(cellName, cell_id)) {
+                continue;
+            }
             if (!cell->process || !cell->file_exists) {
-                continue;
+                ESCAPE("target cell has no data");
             }
             if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
                 ESCAPE("load failure for Cell");
             }
+
+            psLogMsg("psvideophotLoop", 1, "Found target cell %s %d. %ld readouts\n", cellName, view->cell, cell->readouts->n);
 
             // Put version information into the header
@@ -87 +103 @@
 
             if (cell->readouts->n <2) {
-              continue; 
+              psLogMsg("psvideophotLoop", 1, "cell %s has only %ld readouts\n", cellName, cell->readouts->n);
+              ESCAPE("invalid video Cell");
             }
-
-            psString cellName = psMetadataLookupStr(&status, cell->concepts, "CELL.NAME");
-            psLogMsg("psvideophotLoop", 1, "Found video cell %s %d\n", cellName, view->cell);
 
             // get the position of this cell on the chip 
@@ -114 +128 @@
 
             // go find the video extension data
-            psString video_extension_name = NULL;
-            psStringAppend(&video_extension_name, "video_table_%s", cellName);
+            psString video_extension_name = psMetadataLookupStr(&status, config->arguments, "VIDEOEXTNAME");
+            if (!video_extension_name) {
+                psStringAppend(&video_extension_name, "video_table_%s", cellName);
+            }
             psArray *video_table = readVideoTable(input, video_extension_name);
             if (!video_table) {
@@ -121 +137 @@
                 ESCAPE("invalid image file");
             }
-            psMetadataAddArray(cell->analysis, PS_LIST_TAIL, "VIDEO_DATA", 0, "", video_table);
+            psFree(video_extension_name);
+            // psMetadataAddArray(cell->analysis, PS_LIST_TAIL, "VIDEO_DATA", 0, "", video_table);
+
+            output = (psArray *) psMemIncrRefCounter(video_table);
 
             if (cell->readouts->n != video_table->n) {
@@ -180 +199 @@
                 double cnpix2 = psMetadataLookupS32(&status, row, "cnpix2");
 
+                // avoid errors from unused variables
                 (void) frame_start; (void) frame_complete;
                 (void) rowpre; (void) cnpix1; (void) cnpix2; (void) fwhm_x; (void) fwhm_y; (void) fwhm;
@@ -191 +211 @@
                 double star_readout_y = (centroid_y - cnpix2) / yBin;
 
+#ifdef notdef
                 printf("%4d %9.2f %9.2f %9.2f %.1f %.1f %9.6f %6.3f %6.3f %6.3f\n",
                         frame, flux, snr, sky, star_readout_x, star_readout_y, frame_complete - frame_start,
                             fwhm, fwhm_x, fwhm_y);
-
+#endif
                 psStatsInit(stats);
 
@@ -206 +227 @@
                 double stddev = stats->sampleStdev;
                 double median = stats->sampleMedian;
+                double vpFlux = 0;
+                double vpSum = 0;
+                double xy[2] = {0, 0};
                 if (stddev > threshold) {
 
-                    double sum = 0;
-                    // XXX: use a point data type
-                    double xy[2];
-                    Centering(readout->image, EDGE, &sum, xy, median);
-                    double ourFlux;
-                    ourFlux = SubSum(readout->image, xy, median);
-
-                    printf("%4d %9.2f %9.2f %9.2f %.1f %.1f %9.2f\n",
-                             frame, ourFlux, ourFlux/stddev, median, xy[0], xy[1], stddev);
+                    Centering(readout->image, EDGE, &vpSum, xy, median);
+
+                    if (isfinite(xy[0]) && isfinite(xy[1])) {
+                        vpFlux = SubSum(readout->image, xy, median);
+                    }
+
+//                    printf("%4d %9.2f %9.2f %9.2f %.1f %.1f %9.2f\n",
+//                             frame, vpFlux, vpFlux/median, median, xy[0], xy[1], stddev);
                 } else {
-                    printf("%4d %9.2f %9.2f %8.2f\n",
-                            frame, 0.0,   stddev, median);
-                }
+//                    printf("%4d %9.2f %9.2f %8.2f\n",
+//                            frame, 0.0,   stddev, median);
+                }
+                if (frame % 60 == 0) {
+                    printf("frame  flux        sky       snr     X    Y     dt        fwhm   fwhm_x fwhm_y  vp_flux   vp_median vp_sum    vp_stddev vp_x vp_y\n");
+                }
+                printf("%4d   %9.2f %9.2f %9.2f %.1f %.1f %9.6f %6.3f %6.3f %6.3f   %9.2f %9.2f %9.2f %9.2f %.1f %.1f\n",
+                        frame, flux, sky, snr, star_readout_x, star_readout_y, frame_complete - frame_start,
+                            fwhm, fwhm_x, fwhm_y,
+                            vpFlux, median, vpSum, stddev, xy[0], xy[1]);
+                psMetadataAddF32(row, PS_LIST_TAIL, "vp_flux", 0, "vp flux", vpFlux);
+                psMetadataAddF32(row, PS_LIST_TAIL, "vp_median", 0, "vp meidan", median);
+                psMetadataAddF32(row, PS_LIST_TAIL, "vp_stddev", 0, "vp meidan", stddev);
+                psMetadataAddF32(row, PS_LIST_TAIL, "vp_sum", 0, "vp sum of source", vpSum);
+                psMetadataAddF32(row, PS_LIST_TAIL, "vp_x", 0, "centroid x from vp", xy[0]);
+                psMetadataAddF32(row, PS_LIST_TAIL, "vp_y", 0, "centroid y from vp", xy[1]);
             }
             psLogMsg ("psvideophotLoop", 5, "Done processing video cell");
@@ -247 +283 @@
     psFree(view);
 
-    // Dump configuration
-    psString dump_file = psMetadataLookupStr(&status, config->arguments, "DUMP_CONFIG");
-    if (dump_file) {
-        if (!pmConfigDump(config, dump_file)) {
-            ESCAPE("Unable to dump configuration.");
-        }
-    }
+    psString outputName = psMetadataLookupStr(&status, config->arguments, "OUTPUT");
+    psString realName = pmConfigConvertFilename(outputName, config, true, true);
+    if (!realName) {
+        psError(PS_ERR_UNKNOWN, false, "failed to convert filename for %s", outputName);
+        ESCAPE("cannot save output");
+    }
+    psFits *outFits = psFitsOpen(realName, "w");
+    if (!outFits) {
+        psError(PS_ERR_UNKNOWN, false, "failed to open output filename for %s", outputName);
+        ESCAPE(" ");
+    }
+
+    psMetadata *outputHeader = lastHDU ? lastHDU->header : NULL;
+    if (!psFitsWriteTable(outFits, outputHeader, output, "videophotemetry")) {
+        psError(PS_ERR_UNKNOWN, false, "failed to write videophotometry table");
+        ESCAPE("cannot write output");
+    }
+    psFitsClose(outFits);
 
     return true;

@@ -1 +1 @@
 psvideophot
+dumpvideo
 Makefile
 Makefile.in
@@ -9 +10 @@
 psvideophotVersionDefinitions.h
 
+