Changeset 10213 for trunk/ppImage/src/ppImageLoop.c

Timestamp:

Nov 27, 2006, 6:32:23 PM (19 years ago)

Author:

Paul Price

Message:

Cleaning up code.

File:

• trunk/ppImage/src/ppImageLoop.c (modified) (7 diffs)

trunk/ppImage/src/ppImageLoop.c

@@ -16 +16 @@
 
     bool mdok;                      // Status of MD lookup
-    psMetadata *extraOpts = psMetadataLookupMetadata(&mdok, config->arguments, "PPIMAGE.OPTIONS"); // Extra options
+    psMetadata *extraOpts = psMetadataLookupMetadata(&mdok, config->arguments,
+                                                     "PPIMAGE.OPTIONS"); // Extra options
     const char *statsName = psMetadataLookupStr(&mdok, extraOpts, "STATS"); // Filename for statistics
     psMetadata *stats = NULL;           // Container for statistics
@@ -29 +30 @@
     }
 
-    pmFPAfile *input = psMetadataLookupPtr (&status, config->files, "PPIMAGE.INPUT");
+    pmFPAfile *input = psMetadataLookupPtr(&status, config->files, "PPIMAGE.INPUT");
     if (!status) {
         psErrorStackPrint(stderr, "Can't find input data!\n");
@@ -35 +36 @@
     }
 
-    pmFPAview *view = pmFPAviewAlloc (0);
+    pmFPAview *view = pmFPAviewAlloc(0);
 
     // files associated with the science image
-    if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) return false;
+    if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
+        return false;
+    }
 
-    while ((chip = pmFPAviewNextChip (view, input->fpa, 1)) != NULL) {
+    while ((chip = pmFPAviewNextChip(view, input->fpa, 1)) != NULL) {
         psLogMsg ("ppImageLoop", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
-        if (!chip->process || !chip->file_exists) { continue; }
+        if (!chip->process || !chip->file_exists) {
+            continue;
+        }
 
-        if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) return false;
+        if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
+            return false;
+        }
 
-        while ((cell = pmFPAviewNextCell (view, input->fpa, 1)) != NULL) {
+        while ((cell = pmFPAviewNextCell(view, input->fpa, 1)) != NULL) {
             psLogMsg ("ppImageLoop", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
-            if (!cell->process || !cell->file_exists) { continue; }
-            if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) return false;
+            if (!cell->process || !cell->file_exists) {
+                continue;
+            }
+            if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
+                return false;
+            }
 
             // process each of the readouts
             while ((readout = pmFPAviewNextReadout (view, input->fpa, 1)) != NULL) {
-                if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) return false;
-                if (!readout->data_exists) { continue; }
+                if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
+                    return false;
+                }
+                if (!readout->data_exists) {
+                    continue;
+                }
 
                 // perform the detrend analysis
-                if (!ppImageDetrendReadout (config, options, view)) return false;
+                if (!ppImageDetrendReadout(config, options, view)) {
+                    psError(PS_ERR_UNKNOWN, false, "Unable to detrend readout.\n");
+                    return false;
+                }
 
             }
@@ -72 +90 @@
         // Go back over the cells to apply the fringe and do statistics
         view->cell = view->readout = -1;
-        while ((cell = pmFPAviewNextCell (view, input->fpa, 1)) != NULL) {
-            if (!cell->process || !cell->file_exists) { continue; }
+        while ((cell = pmFPAviewNextCell(view, input->fpa, 1)) != NULL) {
+            if (!cell->process || !cell->file_exists) {
+                continue;
+            }
 
             // Apply the fringe correction
@@ -80 +100 @@
                 pmCell *fringeCell = pmFPAfileThisCell(config->files, view, "PPIMAGE.FRINGE");
                 psImage *fringe = ppImageDetrendFringeGenerate(cell, fringeCell);
-                while ((readout = pmFPAviewNextReadout (view, input->fpa, 1)) != NULL) {
-                    if (!readout->data_exists) { continue; }
+                while ((readout = pmFPAviewNextReadout(view, input->fpa, 1)) != NULL) {
+                    if (!readout->data_exists) {
+                        continue;
+                    }
 
                     // XXX: Make generic, so subregions may be subtracted as well
                     psBinaryOp(readout->image, readout->image, "-", fringe);
 
-                    if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) return false;
+                    if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
+                        return false;
+                    }
                 }
                 psFree(fringe);
@@ -102 +126 @@
             }
 
-            if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) return false;
+            if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
+                return false;
+            }
         }
 
-        ppImageMosaicChip (config, view, "PPIMAGE.OUTPUT.CHIP", "PPIMAGE.OUTPUT");
-        ppImageRebinChip (config, view, "PPIMAGE.BIN1", "PPIMAGE.OUTPUT.CHIP");
-        ppImageRebinChip (config, view, "PPIMAGE.BIN2", "PPIMAGE.OUTPUT.CHIP");
+        ppImageMosaicChip(config, view, "PPIMAGE.OUTPUT.CHIP", "PPIMAGE.OUTPUT");
+        ppImageRebinChip(config, view, "PPIMAGE.BIN1", "PPIMAGE.OUTPUT.CHIP");
+        ppImageRebinChip(config, view, "PPIMAGE.BIN2", "PPIMAGE.OUTPUT.CHIP");
 
         // we perform photometry on the readouts of this chip in the output
-        if (options->doPhotom) ppImagePhotom (config, view);
+        if (options->doPhotom) {
+            ppImagePhotom(config, view);
+        }
 
-        if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) return false;
+        if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
+            return false;
+        }
     }
 
@@ -132 +162 @@
     // it would require us to NOT free PPIMAGE.OUTPUT.CHIP until here
     // ppImageMosaicFPA (config, "PPIMAGE.OUTPUT.FPA", "PPIMAGE.OUTPUT.CHIP");
-    ppImageMosaicFPA (config, "PPIMAGE.OUTPUT.FPA1", "PPIMAGE.BIN1");
-    ppImageMosaicFPA (config, "PPIMAGE.OUTPUT.FPA2", "PPIMAGE.BIN2");
+    ppImageMosaicFPA(config, "PPIMAGE.OUTPUT.FPA1", "PPIMAGE.BIN1");
+    ppImageMosaicFPA(config, "PPIMAGE.OUTPUT.FPA2", "PPIMAGE.BIN2");
 
     // we perform astrometry on all chips after sources have been detected
-    if (options->doAstromChip || options->doAstromMosaic) ppImageAstrom (config);
-    if (options->doAddstar) ppImageAddstar (config);
+    if (options->doAstromChip || options->doAstromMosaic) {
+        ppImageAstrom(config);
+    }
+    if (options->doAddstar) {
+        ppImageAddstar(config);
+    }
 
-    if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) return false;
+    if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
+        return false;
+    }
 
     psFree(view);