Changeset 28375 for trunk/ppImage

Timestamp:

Jun 16, 2010, 5:30:27 PM (16 years ago)

Author:

watersc1

Message:

merge of stack association and warp/stack/diff jpegs

Location:

trunk

Files:

• . (modified) (1 prop)
• ppImage/src/ppImageLoop.c (modified) (2 diffs)
• ppImage/src/ppImagePhotom.c (modified) (3 diffs)

trunk/ppImage/src/ppImageLoop.c

@@ -175 +175 @@
             ESCAPE("Unable to measures pixel stats for image");
         }
+
         if (!ppImageMosaicChip(config, options, view, "PPIMAGE.CHIP", "PPIMAGE.OUTPUT")) {
             ESCAPE("Unable to mosaic chip");
@@ -181 +182 @@
 
         // we perform photometry on the readouts of this chip in the output
+
         psTimerStart(TIMER_PHOT);
         if (options->doPhotom) {

trunk/ppImage/src/ppImagePhotom.c

@@ -11 +11 @@
     pmCell *cell;
     pmReadout *readout;
-
+    printf("%x %s\n",psErrorCodeLast(),psErrorCodeString(psErrorCodeLast()));
     psphotInit();
-
+    printf("%x %s\n",psErrorCodeLast(),psErrorCodeString(psErrorCodeLast()));
     // find or define a pmFPAfile PSPHOT.INPUT
     pmFPAfile *input = psMetadataLookupPtr (&status, config->files, "PSPHOT.INPUT");
@@ -20 +20 @@
         return false;
     }
-
+    printf("%x %s\n",psErrorCodeLast(),psErrorCodeString(psErrorCodeLast()));
     // we make a new copy of the output chip to keep psphot from modifying the output image
     pmChip *oldChip = pmFPAviewThisChip (view, input->src);
     pmChip *newChip = pmFPAviewThisChip (view, input->fpa);
     pmChipCopy (newChip, oldChip);
-
+    printf("%x %s\n",psErrorCodeLast(),psErrorCodeString(psErrorCodeLast()));
     // iterate over the cells and readout for this chip
     while ((cell = pmFPAviewNextCell (view, input->fpa, 1)) != NULL) {
@@ -34 +34 @@
         while ((readout = pmFPAviewNextReadout (view, input->fpa, 1)) != NULL) {
             if (! readout->data_exists) { continue; }
-
+            printf("%x %s\n",psErrorCodeLast(),psErrorCodeString(psErrorCodeLast()));
             // run the actual photometry analysis
             if (!psphotReadout (config, view)) {