Index: /issm/trunk/src/m/classes/public/parameterization/parametercontrolB.m
===================================================================
--- /issm/trunk/src/m/classes/public/parameterization/parametercontrolB.m	(revision 5382)
+++ /issm/trunk/src/m/classes/public/parameterization/parametercontrolB.m	(revision 5383)
@@ -4,5 +4,5 @@
 %   It is possible to specify the number of steps, values for the
 %   minimum and maximum values of B, specify a noise dampening, the 
-%   kind of fit to use or the the optscal.
+%   kind of cm_responses to use or the the optscal.
 %   
 %   Usage:
@@ -11,5 +11,5 @@
 %   Example:
 %      md=parametercontrolB(md)
-%      md=parametercontrolB(md,'nsteps',20,'cm_noisedmp',10^-15,'fit',0)
+%      md=parametercontrolB(md,'nsteps',20,'cm_noisedmp',10^-15,'cm_responses',0)
 %      md=parametercontrolB(md,'cm_min',10,'cm_max',10^8,'cm_jump',0.99,'maxiter',20)
 %      md=parametercontrolB(md,'cm_maxdmp_value',5*10^8,'cm_maxdmp_slope',10^-20,,'cm_mindmp_value',10^7,'cm_mindmp_slope',10^-17)
@@ -118,11 +118,11 @@
 end
 
-%fit
+%cm_responses
 found=0;
-if exist(options,'fit'),
-	fit=getfieldvalue(options,'fit');
-	if ~any(fit~=0 & fit~=1 & fit~=2),
-		md.fit=repmat(fit(:),md.nsteps,1);
-		md.fit(md.nsteps+1:end)=[];
+if exist(options,'cm_responses'),
+	cm_responses=getfieldvalue(options,'cm_responses');
+	if ~any(~ismember(cm_responses,[ SurfaceAbsVelMisfitEnum, SurfaceRelVelMisfitEnum, SurfaceLogVelMisfitEnum, SurfaceLogVxVyMisfitEnum, SurfaceAverageVelMisfitEnum ]));
+		md.cm_responses=repmat(cm_responses(:),md.nsteps,1);
+		md.cm_responses(md.nsteps+1:end)=[];
 		found=1;
 	end
@@ -130,6 +130,10 @@
 if ~found
 	third=ceil(md.nsteps/3);
-	md.fit=[2*ones(third,1);0*ones(third,1);repmat([0;0;2;0],third,1)];
-	md.fit(md.nsteps+1:end)=[];
+	md.cm_responses=[...
+		SurfaceLogVelMisfitEnum*ones(third,1);...
+		SurfaceAbsVelMisfitEnum*ones(third,1);...
+		repmat([SurfaceAbsVelMisfitEnum;SurfaceAbsVelMisfitEnum;SurfaceLogVelMisfitEnum;SurfaceAbsVelMisfitEnum],third,1)...
+		];
+	md.cm_responses(md.nsteps+1:end)=[];
 end
 
Index: /issm/trunk/src/m/classes/public/parameterization/parametercontroldrag.m
===================================================================
--- /issm/trunk/src/m/classes/public/parameterization/parametercontroldrag.m	(revision 5382)
+++ /issm/trunk/src/m/classes/public/parameterization/parametercontroldrag.m	(revision 5383)
@@ -4,5 +4,5 @@
 %   It is possible to specify the number of steps, values for the
 %   minimum and maximum values of the drag, specify a noise dampening, the 
-%   kind of fit to use or the the optscal.
+%   kind of cm_responses to use or the the optscal.
 %   
 %   Usage:
@@ -11,5 +11,5 @@
 %   Example:
 %      md=parametercontroldrag(md)
-%      md=parametercontroldrag(md,'nsteps',20,'cm_noisedmp',10^-8,'fit',0)
+%      md=parametercontroldrag(md,'nsteps',20,'cm_noisedmp',10^-8,'cm_responses',0)
 %      md=parametercontroldrag(md,'cm_min',1,'cm_max',150,'cm_jump',0.99,'maxiter',20)
 %      md=parametercontroldrag(md,'cm_maxdmp_value',100,'cm_maxdmp_slope',10^-13,,'cm_mindmp_value',10,'cm_mindmp_slope',10^-17)
@@ -118,11 +118,11 @@
 end
 
-%fit
+%cm_responses
 found=0;
-if exist(options,'fit'),
-	fit=getfieldvalue(options,'fit');
-	if ~any(fit~=0 & fit~=1 & fit~=2),
-		md.fit=repmat(fit(:),md.nsteps,1);
-		md.fit(md.nsteps+1:end)=[];
+if exist(options,'cm_responses'),
+	cm_responses=getfieldvalue(options,'cm_responses');
+	if ~any(~ismember(cm_responses,[ SurfaceAbsVelMisfitEnum, SurfaceRelVelMisfitEnum, SurfaceLogVelMisfitEnum, SurfaceLogVxVyMisfitEnum, SurfaceAverageVelMisfitEnum ]));
+		md.cm_responses=repmat(cm_responses(:),md.nsteps,1);
+		md.cm_responses(md.nsteps+1:end)=[];
 		found=1;
 	end
@@ -130,6 +130,10 @@
 if ~found
 	third=ceil(md.nsteps/3);
-	md.fit=[2*ones(third,1);0*ones(third,1);repmat([0;0;2;0],third,1)];
-	md.fit(md.nsteps+1:end)=[];
+	md.cm_responses=[...
+		SurfaceLogVelMisfitEnum*ones(third,1);...
+		SurfaceAbsVelMisfitEnum*ones(third,1);...
+		repmat([SurfaceAbsVelMisfitEnum;SurfaceAbsVelMisfitEnum;SurfaceLogVelMisfitEnum;SurfaceAbsVelMisfitEnum],third,1)...
+		];
+	md.cm_responses(md.nsteps+1:end)=[];
 end