Index: /branches/eam_branches/ipp-20101205/psModules/src/objects/pmModel.c
===================================================================
--- /branches/eam_branches/ipp-20101205/psModules/src/objects/pmModel.c	(revision 30151)
+++ /branches/eam_branches/ipp-20101205/psModules/src/objects/pmModel.c	(revision 30152)
@@ -70,5 +70,6 @@
     tmp->fitRadius = 0;
     tmp->flags = PM_MODEL_STATUS_NONE;
-    tmp->residuals = NULL;              // XXX should the model own this memory?
+    tmp->residuals = NULL;              // do not free: the model does not own this memory
+    tmp->isPCM = false;
 
     psS32 Nparams = pmModelClassParameterCount(type);
@@ -108,6 +109,7 @@
 pmModel *pmModelCopy (pmModel *model)
 {
-    PS_ASSERT_PTR_NON_NULL(model, NULL);
-
+    if (model == NULL) {
+	return NULL;
+    }
     pmModel *new = pmModelAlloc (model->type);
 
Index: /branches/eam_branches/ipp-20101205/psModules/src/objects/pmModel.h
===================================================================
--- /branches/eam_branches/ipp-20101205/psModules/src/objects/pmModel.h	(revision 30151)
+++ /branches/eam_branches/ipp-20101205/psModules/src/objects/pmModel.h	(revision 30152)
@@ -43,4 +43,5 @@
     float fitRadius;                    ///< fit radius actually used
     pmResiduals *residuals;             ///< normalized PSF residuals
+    bool isPCM;				///< is this model fitted with PSF-convolution?
 
     // functions for this model which depend on the model class