Changeset 37772 for trunk/psModules/src/objects/pmSourceIO_CMF.c.in

Timestamp:

Dec 24, 2014, 8:55:06 AM (12 years ago)

Author:

eugene

Message:

merge changes from ipp-20141119

Location:

trunk

Files:

• . (modified) (1 prop)
• psModules/src/objects/pmSourceIO_CMF.c.in (modified) (2 diffs, 1 prop)

trunk/psModules/src/objects/pmSourceIO_CMF.c.in

@@ -319 +319 @@
 
     // 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 +327 @@
         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?