Changeset 10787

Timestamp:

Dec 16, 2006, 11:48:37 PM (20 years ago)

Author:

eugene

Message:

fixed mask length, error checks

File:

• trunk/psastro/src/psastroLuminosityFunction.c (modified) (3 diffs)

trunk/psastro/src/psastroLuminosityFunction.c

@@ -68 +68 @@
   // exclude bins with no stars
   // exclude points after the peak with N < 0.8*peak
+  FILE *f = fopen ("psastro.dat", "w");
   int n = 0;
   for (int i = 0; i < nMags->n; i++) {
@@ -74 +75 @@
     lnMag->data.F32[n] = log10 (nMags->data.F32[i]);
     Mag->data.F32[n] = mMin + (i + 0.5)*dMag;
+    fprintf (f, "%d  %f %.0f %f\n", n, Mag->data.F32[n], nMags->data.F32[i], lnMag->data.F32[n]);
     n++;
   }
+  fclose (f);
   lnMag->n = n;
   Mag->n = n;
   psLogMsg ("psastro", 4, "fitting %d points to luminosity function\n", n);
 
-  psVector *mask = psVectorAlloc (nBin, PS_TYPE_MASK);
+  psVector *mask = psVectorAlloc (Mag->n, PS_TYPE_MASK);
   psVectorInit (mask, 0);
 
@@ -88 +91 @@
   stats->clipIter = 3;
 
-  line = psVectorClipFitPolynomial1D(line, stats, mask, 0xff, lnMag, NULL, Mag);
+  if (!psVectorClipFitPolynomial1D(line, stats, mask, 0xff, lnMag, NULL, Mag)) {
+      psError(PS_ERR_UNKNOWN, false, "Failed the fit the luminosity function\n");
+      return(NULL);
+  }
 
   // find min and max unmasked magnitudes