Index: trunk/ppImage/src/ppImageLoop.c
===================================================================
--- trunk/ppImage/src/ppImageLoop.c	(revision 5858)
+++ trunk/ppImage/src/ppImageLoop.c	(revision 5976)
@@ -1,15 +1,17 @@
 # include "ppImage.h"
 
-bool ppImageLoop (ppData *data, ppOptions *options, ppConfig *config) {
-
+bool ppImageLoop(ppData *data, ppOptions *options, ppConfig *config)
+{
     ppDetrend detrend;
 
     if (options->imageLoadDepth == PP_LOAD_FPA) {
-	ppImageLoadPixels (data->input, data->process, config->database, -1, -1);
-	ppImageLoadPixels (data->bias, 	data->process, config->database, -1, -1);
-	ppImageLoadPixels (data->dark, 	data->process, config->database, -1, -1);
-	ppImageLoadPixels (data->mask, 	data->process, config->database, -1, -1);
-	ppImageLoadPixels (data->flat, 	data->process, config->database, -1, -1);
+        psTrace(__func__, 1, "Loading pixels for FPA...\n");
+        ppImageLoadPixels(data->input, config->database, -1, -1);
+        ppImageLoadPixels(data->bias,  config->database, -1, -1);
+        ppImageLoadPixels(data->dark,  config->database, -1, -1);
+        ppImageLoadPixels(data->mask,  config->database, -1, -1);
+        ppImageLoadPixels(data->flat,  config->database, -1, -1);
     }
+
     for (int i = 0; i < data->input->fpa->chips->n; i++) {
         pmChip *inputChip = data->input->fpa->chips->data[i]; // Chip of interest in input image
@@ -19,13 +21,16 @@
         pmChip *flatChip  = data->flat->fpa->chips->data[i];  // Chip of interest in flat image
 
-        if (! inputChip->valid) { continue; }
+        printf("Chip %d: %x %x\n", i, inputChip->exists, inputChip->process);
+        if (! inputChip->process) { continue; }
 
-	if (options->imageLoadDepth == PP_LOAD_CHIP) {
-	    ppImageLoadPixels (data->input, data->process, config->database, i, -1);
-	    ppImageLoadPixels (data->bias,  data->process, config->database, i, -1);
-	    ppImageLoadPixels (data->dark,  data->process, config->database, i, -1);
-	    ppImageLoadPixels (data->mask,  data->process, config->database, i, -1);
-	    ppImageLoadPixels (data->flat,  data->process, config->database, i, -1);
-	}
+        if (options->imageLoadDepth == PP_LOAD_CHIP) {
+            psTrace(__func__, 1, "Loading pixels for chip %d...\n", i);
+            ppImageLoadPixels(data->input, config->database, i, -1);
+            ppImageLoadPixels(data->bias,  config->database, i, -1);
+            ppImageLoadPixels(data->dark,  config->database, i, -1);
+            ppImageLoadPixels(data->mask,  config->database, i, -1);
+            ppImageLoadPixels(data->flat,  config->database, i, -1);
+        }
+
         for (int j = 0; j < inputChip->cells->n; j++) {
             detrend.input = inputChip->cells->data[j]; // Cell of interest in input image
@@ -35,15 +40,18 @@
             detrend.flat  = flatChip->cells->data[j];  // Cell of interest in flat image
 
-            if (! detrend.input->valid) { continue; }
+            printf ("\tCell %d: %x %x\n", j, detrend.input->exists, detrend.input->process);
+            if (! detrend.input->process) { continue; }
 
-	    if (options->imageLoadDepth == PP_LOAD_CELL) {
-		ppImageLoadPixels (data->input, data->process, config->database, i, j);
-		ppImageLoadPixels (data->bias,  data->process, config->database, i, j);
-		ppImageLoadPixels (data->dark,  data->process, config->database, i, j);
-		ppImageLoadPixels (data->mask,  data->process, config->database, i, j);
-		ppImageLoadPixels (data->flat,  data->process, config->database, i, j);
-	    }
-	    ppDetrendCell (&detrend, options, config);
-	}
+            if (options->imageLoadDepth == PP_LOAD_CELL) {
+                psTrace(__func__, 1, "Loading pixels for chip %d, cell %d...\n", i, j);
+                ppImageLoadPixels(data->input, config->database, i, j);
+                ppImageLoadPixels(data->bias,  config->database, i, j);
+                ppImageLoadPixels(data->dark,  config->database, i, j);
+                ppImageLoadPixels(data->mask,  config->database, i, j);
+                ppImageLoadPixels(data->flat,  config->database, i, j);
+            }
+
+            ppDetrendCell (&detrend, options, config);
+        }
     }
     return true;