Index: trunk/psphot/src/psphotSubtractBackground.c
===================================================================
--- trunk/psphot/src/psphotSubtractBackground.c	(revision 29936)
+++ trunk/psphot/src/psphotSubtractBackground.c	(revision 31154)
@@ -24,10 +24,5 @@
     assert (modelFile);
 
-    pmReadout *model = NULL;
-    if (modelFile->mode == PM_FPA_MODE_INTERNAL) {
-	model = modelFile->readout;
-    } else {
-	model = pmFPAviewThisReadout (view, modelFile->fpa);
-    }
+    pmReadout *model = READOUT_OR_INTERNAL(view, modelFile);
     assert (model);
 
@@ -44,9 +39,5 @@
     if (file) {
         // we are using PSPHOT.BACKGND as an I/O file: select readout or create
-        if (file->mode == PM_FPA_MODE_INTERNAL) {
-            background = file->readout;
-        } else {
-            background = pmFPAviewThisReadout (view, file->fpa);
-        }
+	background = READOUT_OR_INTERNAL(view, file);
         if (background == NULL) {
             // readout does not yet exist: create from input