Index: /trunk/psModules/src/objects/pmSourceIO_CMF.c.in
===================================================================
--- /trunk/psModules/src/objects/pmSourceIO_CMF.c.in	(revision 37771)
+++ /trunk/psModules/src/objects/pmSourceIO_CMF.c.in	(revision 37772)
@@ -319,5 +319,6 @@
 
     // define PSF model type
-    int modelType = pmModelClassGetType ("PS_MODEL_GAUSS");
+    int defaultModelType = pmModelClassGetType ("PS_MODEL_GAUSS");
+    int modelType = -1;
 
     // if header does not define the model, default to a gaussian
@@ -326,5 +327,9 @@
         modelType = pmModelClassGetType (PSF_NAME);
     }
-    assert (modelType > -1);
+    // work around bug in psphotFullForce
+    if (modelType < 0) {
+    	modelType = defaultModelType;
+    }
+    // assert (modelType > -1);
 
     // do we expect to find lensing parameters?
Index: /trunk/psphot/src/psphotGalaxyParams.c
===================================================================
--- /trunk/psphot/src/psphotGalaxyParams.c	(revision 37771)
+++ /trunk/psphot/src/psphotGalaxyParams.c	(revision 37772)
@@ -164,9 +164,9 @@
 	    }
 	    psScalar *scalar = NULL;
-	    scalar = job->args->data[5];
+	    scalar = job->args->data[8];
 	    Next += scalar->data.S32;
-	    scalar = job->args->data[6];
+	    scalar = job->args->data[9];
 	    Npetro += scalar->data.S32;
-	    scalar = job->args->data[7];
+	    scalar = job->args->data[10];
 	    Nannuli += scalar->data.S32;
 	    psFree(job);