Index: trunk/psastro/src/psastroModelFitBoresite.c
===================================================================
--- trunk/psastro/src/psastroModelFitBoresite.c	(revision 15887)
+++ trunk/psastro/src/psastroModelFitBoresite.c	(revision 15891)
@@ -2,33 +2,33 @@
 
 // we now have a set of observed L,M values.  fit these to the boresite model
-bool psastroModelFitBoresite (psVector *Lo, psVector *Mo, psVector *Po) {
+psVector *psastroModelFitBoresite (psVector *Xo, psVector *Yo, psVector *Po) {
 
-    assert (Lo->n > 2);
-    assert (Lo->n == Mo->n);
-    assert (Lo->n == Po->n);
+    assert (Xo->n > 2);
+    assert (Xo->n == Yo->n);
+    assert (Xo->n == Po->n);
 
     // arrays to hold the data to be fitted
-    psArray *x = psArrayAlloc(2*Lo->n);
-    psVector *y = psVectorAlloc(2*Lo->n, PS_TYPE_F32);
+    psArray *x = psArrayAlloc(2*Xo->n);
+    psVector *y = psVectorAlloc(2*Xo->n, PS_TYPE_F32);
 
     int n = 0;
-    for (int i = 0; i < Lo->n; i++) {
+    for (int i = 0; i < Xo->n; i++) {
 
 	psVector *coord = NULL;
 
-	// L coordinate value
+	// X coordinate value
 	coord = psVectorAlloc (2, PS_TYPE_F32);
 	coord->data.F32[1] = 0.0;
 	coord->data.F32[0] = Po->data.F32[i];
 	x->data[n] = coord;
-	y->data.F32[n] = Lo->data.F32[i];
+	y->data.F32[n] = Xo->data.F32[i];
 	n++;
 	
-	// M coordinate value
+	// Y coordinate value
 	coord = psVectorAlloc (2, PS_TYPE_F32);
 	coord->data.F32[1] = 1.0;
 	coord->data.F32[0] = Po->data.F32[i];
 	x->data[n] = coord;
-	y->data.F32[n] = Mo->data.F32[i];
+	y->data.F32[n] = Yo->data.F32[i];
 	n++;
     }	
@@ -47,13 +47,13 @@
     psStats *stats = psStatsAlloc (PS_STAT_SAMPLE_MEAN | PS_STAT_MAX | PS_STAT_MIN);
 
-    // center (Lo) = mean(Lo), RL = range / 2
-    psVectorStats (stats, Lo, NULL, NULL, 0);
-    params->data.F32[PAR_L0] = stats->sampleMean;
-    params->data.F32[PAR_RL] = (stats->max - stats->min) / 2.0;
+    // center (Xo) = mean(Xo), RX = range / 2
+    psVectorStats (stats, Xo, NULL, NULL, 0);
+    params->data.F32[PAR_X0] = stats->sampleMean;
+    params->data.F32[PAR_RX] = (stats->max - stats->min) / 2.0;
 
-    // center (Mo) = mean(Mo), RM = range / 2
-    psVectorStats (stats, Mo, NULL, NULL, 0);
-    params->data.F32[PAR_M0] = stats->sampleMean;
-    params->data.F32[PAR_RM] = (stats->max - stats->min) / 2.0;
+    // center (Yo) = mean(Yo), RY = range / 2
+    psVectorStats (stats, Yo, NULL, NULL, 0);
+    params->data.F32[PAR_Y0] = stats->sampleMean;
+    params->data.F32[PAR_RY] = (stats->max - stats->min) / 2.0;
 
     params->data.F32[PAR_P0] = 0.0;
@@ -63,11 +63,11 @@
     psImage *covar = psImageAlloc (params->n, params->n, PS_TYPE_F32);
     
-    fprintf (stderr, "guess values:\n");
-    fprintf (stderr, "Lo:  %f\n", params->data.F32[PAR_L0]);
-    fprintf (stderr, "Mo:  %f\n", params->data.F32[PAR_M0]);
-    fprintf (stderr, "RL:  %f\n", params->data.F32[PAR_RL]);
-    fprintf (stderr, "RM:  %f\n", params->data.F32[PAR_RM]);
-    fprintf (stderr, "P0:  %f\n", params->data.F32[PAR_P0]);
-    fprintf (stderr, "T0:  %f\n", params->data.F32[PAR_T0]);
+    // fprintf (stderr, "guess values:\n");
+    // fprintf (stderr, "Xo:  %f\n", params->data.F32[PAR_X0]);
+    // fprintf (stderr, "Yo:  %f\n", params->data.F32[PAR_Y0]);
+    // fprintf (stderr, "RX:  %f\n", params->data.F32[PAR_RX]);
+    // fprintf (stderr, "RY:  %f\n", params->data.F32[PAR_RY]);
+    // fprintf (stderr, "P0:  %f\n", params->data.F32[PAR_P0]);
+    // fprintf (stderr, "T0:  %f\n", params->data.F32[PAR_T0]);
 
     // XXX skip the weights for now
@@ -75,136 +75,11 @@
 
     fprintf (stderr, "fitted values:\n");
-    fprintf (stderr, "Lo:  %f\n", params->data.F32[PAR_L0]);
-    fprintf (stderr, "Mo:  %f\n", params->data.F32[PAR_M0]);
-    fprintf (stderr, "RL:  %f\n", params->data.F32[PAR_RL]);
-    fprintf (stderr, "RM:  %f\n", params->data.F32[PAR_RM]);
+    fprintf (stderr, "Xo:  %f\n", params->data.F32[PAR_X0]);
+    fprintf (stderr, "Yo:  %f\n", params->data.F32[PAR_Y0]);
+    fprintf (stderr, "RX:  %f\n", params->data.F32[PAR_RX]);
+    fprintf (stderr, "RY:  %f\n", params->data.F32[PAR_RY]);
     fprintf (stderr, "P0:  %f\n", params->data.F32[PAR_P0]);
     fprintf (stderr, "T0:  %f\n", params->data.F32[PAR_T0]);
 
-    return true;
+    return params;
 }
-
-# if (0)
-# undef PAR_L0
-# undef PAR_RL
-# undef PAR_PHI
-# define PAR_L0  0
-# define PAR_RL  1
-# define PAR_PHI 2
-
-// we now have a set of observed L,M values.  fit these to the boresite model
-bool psastroModelFitBoresite_L (psVector *Lo, psVector *Mo, psVector *Po) {
-
-    assert (Lo->n > 2);
-    assert (Lo->n == Mo->n);
-    assert (Lo->n == Po->n);
-
-    // arrays to hold the data to be fitted
-    psArray *x = psArrayAlloc(Lo->n);
-    psVector *y = psVectorAlloc(Lo->n, PS_TYPE_F32);
-
-    for (int i = 0; i < Lo->n; i++) {
-
-	psVector *coord = NULL;
-
-	// L coordinate value
-	coord = psVectorAlloc (1, PS_TYPE_F32);
-	coord->data.F32[0] = Po->data.F32[i];
-	x->data[i] = coord;
-	y->data.F32[i] = Lo->data.F32[i];
-    }	
-
-    psVector *params = psVectorAlloc (3, PS_TYPE_F32);
-    
-    // create the minimization constraints
-    psMinConstraint *constraint = psMinConstraintAlloc();
-
-    // XXX for now, no parameter masks, skip checkLimits
-    // constraint->checkLimits = psastroModelBoresiteLimits;
-
-    // make an initial guess:
-    psStats *stats = psStatsAlloc (PS_STAT_SAMPLE_MEAN | PS_STAT_MAX | PS_STAT_MIN);
-
-    // center (Lo) = mean(Lo), RL = range / 2
-    psVectorStats (stats, Lo, NULL, NULL, 0);
-    params->data.F32[PAR_L0] = stats->sampleMean;
-    params->data.F32[PAR_RL] = (stats->max - stats->min) / 2.0;
-    params->data.F32[PAR_PHI] = 0.0;
-
-    psMinimization *myMin = psMinimizationAlloc (15, 0.001);
-    psImage *covar = psImageAlloc (params->n, params->n, PS_TYPE_F32);
-    
-    fprintf (stderr, "guess values:\n");
-    fprintf (stderr, "Lo:  %f\n", params->data.F32[PAR_L0]);
-    fprintf (stderr, "RL:  %f\n", params->data.F32[PAR_RL]);
-    fprintf (stderr, "phi: %f\n", params->data.F32[PAR_PHI]);
-
-    // XXX skip the weights for now
-    psMinimizeLMChi2(myMin, covar, params, constraint, x, y, NULL, psastroModelBoresiteL);
-
-    fprintf (stderr, "fitted values:\n");
-    fprintf (stderr, "Lo:  %f\n", params->data.F32[PAR_L0]);
-    fprintf (stderr, "RL:  %f\n", params->data.F32[PAR_RL]);
-    fprintf (stderr, "phi: %f\n", params->data.F32[PAR_PHI]);
-
-    return true;
-}
-
-// we now have a set of observed L,M values.  fit these to the boresite model
-bool psastroModelFitBoresite (psVector *Lo, psVector *Mo, psVector *Po) {
-
-    assert (Lo->n > 2);
-    assert (Lo->n == Mo->n);
-    assert (Lo->n == Po->n);
-
-    // arrays to hold the data to be fitted
-    psArray *x = psArrayAlloc(Lo->n);
-    psVector *y = psVectorAlloc(Lo->n, PS_TYPE_F32);
-
-    for (int i = 0; i < Lo->n; i++) {
-
-	psVector *coord = NULL;
-
-	// L coordinate value
-	coord = psVectorAlloc (1, PS_TYPE_F32);
-	coord->data.F32[0] = Po->data.F32[i];
-	x->data[i] = coord;
-	y->data.F32[i] = Mo->data.F32[i];
-    }	
-
-    psVector *params = psVectorAlloc (3, PS_TYPE_F32);
-    
-    // create the minimization constraints
-    psMinConstraint *constraint = psMinConstraintAlloc();
-
-    // XXX for now, no parameter masks, skip checkLimits
-    // constraint->checkLimits = psastroModelBoresiteLimits;
-
-    // make an initial guess:
-    psStats *stats = psStatsAlloc (PS_STAT_SAMPLE_MEAN | PS_STAT_MAX | PS_STAT_MIN);
-
-    // center (Lo) = mean(Lo), RL = range / 2
-    psVectorStats (stats, Mo, NULL, NULL, 0);
-    params->data.F32[PAR_L0] = stats->sampleMean;
-    params->data.F32[PAR_RL] = (stats->max - stats->min) / 2.0;
-    params->data.F32[PAR_PHI] = 0.0;
-
-    psMinimization *myMin = psMinimizationAlloc (15, 0.001);
-    psImage *covar = psImageAlloc (params->n, params->n, PS_TYPE_F32);
-    
-    fprintf (stderr, "guess values:\n");
-    fprintf (stderr, "Lo:  %f\n", params->data.F32[PAR_L0]);
-    fprintf (stderr, "RL:  %f\n", params->data.F32[PAR_RL]);
-    fprintf (stderr, "phi: %f\n", params->data.F32[PAR_PHI]);
-
-    // XXX skip the weights for now
-    psMinimizeLMChi2(myMin, covar, params, constraint, x, y, NULL, psastroModelBoresiteM);
-
-    fprintf (stderr, "fitted values:\n");
-    fprintf (stderr, "Lo:  %f\n", params->data.F32[PAR_L0]);
-    fprintf (stderr, "RL:  %f\n", params->data.F32[PAR_RL]);
-    fprintf (stderr, "phi: %f\n", params->data.F32[PAR_PHI]);
-
-    return true;
-}
-# endif