Changeset 12819

Timestamp:

Apr 12, 2007, 9:31:05 AM (19 years ago)

Author:

eugene

Message:

RebinChip should use output->src rather than looking for a named fpa

Location:

trunk/ppImage/src

Files:

• ppImage.h (modified) (1 diff)
• ppImageLoop.c (modified) (1 diff)
• ppImageRebinReadout.c (modified) (3 diffs)

trunk/ppImage/src/ppImage.h

@@ -41 +41 @@
 bool ppImageDetrendNonLinearPolynomial(pmReadout *input, psMetadataItem *dataItem);
 
-bool ppImageRebinChip (pmConfig *config, pmFPAview *view, char *outName, char *inName);
+bool ppImageRebinChip (pmConfig *config, pmFPAview *view, char *outName);
 bool ppImageRebinReadout (pmReadout *output, pmReadout *input, pmFPAfile *outFile);
 

trunk/ppImage/src/ppImageLoop.c

@@ -152 +152 @@
             return false;
         }
-        if (!ppImageRebinChip(config, view, "PPIMAGE.BIN1", "PPIMAGE.OUTPUT.CHIP")) {
+        if (!ppImageRebinChip(config, view, "PPIMAGE.BIN1")) {
             psError(PS_ERR_UNKNOWN, false, "Unable to bin chip.\n");
             return false;
         }
-        if (!ppImageRebinChip(config, view, "PPIMAGE.BIN2", "PPIMAGE.OUTPUT.CHIP")) {
+        if (!ppImageRebinChip(config, view, "PPIMAGE.BIN2")) {
             psError(PS_ERR_UNKNOWN, false, "Unable to bin chip.\n");
             return false;

trunk/ppImage/src/ppImageRebinReadout.c

@@ -5 +5 @@
 #include "ppImage.h"
 
-bool ppImageRebinChip (pmConfig *config, pmFPAview *view, char *outName, char *inName) {
+bool ppImageRebinChip (pmConfig *config, pmFPAview *view, char *outName) {
 
     pmCell *cell;
     pmReadout *inReadout, *outReadout;
-
-    pmFPAfile *inFile = psMetadataLookupPtr (NULL, config->files, inName);
-    if (inFile == NULL) return false;
 
     pmFPAfile *outFile = psMetadataLookupPtr (NULL, config->files, outName);
@@ -18 +15 @@
     // XXX double check that chip != -1?
 
-    pmChip *inChip = pmFPAviewThisChip (view, inFile->fpa);
+    pmChip *inChip  = pmFPAviewThisChip (view, outFile->src);
     pmChip *outChip = pmFPAviewThisChip (view, outFile->fpa);
     if (!pmChipCopyStructure (outChip, inChip, outFile->xBin, outFile->yBin)) {
@@ -25 +22 @@
     }
 
-    while ((cell = pmFPAviewNextCell (view, inFile->fpa, 1)) != NULL) {
+    while ((cell = pmFPAviewNextCell (view, outFile->src, 1)) != NULL) {
         psLogMsg ("ppImageRebinChip", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
         if (! cell->process || ! cell->file_exists) { continue; }
 
         // process each of the readouts
-        while ((inReadout = pmFPAviewNextReadout (view, inFile->fpa, 1)) != NULL) {
+        while ((inReadout = pmFPAviewNextReadout (view, outFile->src, 1)) != NULL) {
             if (! inReadout->data_exists) { continue; }