Index: trunk/ppImage/src/ppImageLoop.c
===================================================================
--- trunk/ppImage/src/ppImageLoop.c	(revision 7522)
+++ trunk/ppImage/src/ppImageLoop.c	(revision 7531)
@@ -20,10 +20,10 @@
 
     while ((chip = pmFPAviewNextChip (view, input->fpa, 1)) != NULL) {
-        psLogMsg ("psphot", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
+        psLogMsg ("ppImageLoop", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
         if (!chip->process || !chip->file_exists) { continue; }
 	pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
 
 	while ((cell = pmFPAviewNextCell (view, input->fpa, 1)) != NULL) {
-            psLogMsg ("psphot", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
+            psLogMsg ("ppImageLoop", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
             if (!cell->process || !cell->file_exists) { continue; }
 	    pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
@@ -48,5 +48,5 @@
 
 	// we perform photometry on the readouts of this chip in the output
-	ppImagePhotom (config, view);
+	if (options->doPhotom) ppImagePhotom (config, view);
 
 	pmFPAfileIOChecks (config->files, view, PM_FPA_AFTER);
@@ -62,5 +62,6 @@
     }
 
-    // ppImageAstrom (config);
+    // we perform astrometry on all chips after sources have been detected
+    if (options->doAstrom) ppImageAstrom (config);
     
     // ppImageFPAMosaic (config, view);