Changeset 3361 for trunk/Ohana/src/addstar/src/calibrate.c

Timestamp:

Mar 2, 2005, 7:54:17 AM (21 years ago)

Author:

eugene

Message:

more work towards addstar-2-0

File:

• trunk/Ohana/src/addstar/src/calibrate.c (modified) (7 diffs)

trunk/Ohana/src/addstar/src/calibrate.c

@@ -1 +1 @@
 # include "addstar.h"
 
-static int Ncal, NCAL;
+static int Ncal, NCAL, *Nstar;
 static float *Mobs, *dMobs, *Mref, *dMref, *Cref, *Airm;
-static float *RA, *DEC, *X, *Y;
-int *Nstar;
 
 void InitCalibration () {
 
-    fprintf (stderr, "calibrating the image...  %d\n", CalReference);
+    fprintf (stderr, "calibrating the image...  %d\n", thiscode[0].equiv);
     Ncal = 0;
     NCAL = 1000;
@@ -18 +16 @@
     ALLOCATE (Airm,  float,  NCAL);
     ALLOCATE (Nstar, int, NCAL);
-    ALLOCATE (RA, float, NCAL);
-    ALLOCATE (DEC, float, NCAL);
-    ALLOCATE (X, float, NCAL);
-    ALLOCATE (Y, float, NCAL);
 }
   
-void SaveCalibration (float M, float dM, float Mr, float dMr, float Mc, float A, int N, float ra, float dec, float x, float y) {
+void SaveCalibration (float M, float dM, float Mr, float dMr, float Mc, float A, int N) {
 
   Mobs[Ncal] = M;
@@ -33 +27 @@
   Airm[Ncal] = A;
   Nstar[Ncal] = N;
-
-  RA[Ncal] = ra;
-  DEC[Ncal] = dec;
-  X[Ncal] = x;
-  Y[Ncal] = y;
   Ncal ++;
 
@@ -49 +38 @@
     REALLOCATE (Airm,  float, NCAL);
     REALLOCATE (Nstar, int,   NCAL);
-    REALLOCATE (RA, float, NCAL);
-    REALLOCATE (DEC, float, NCAL);
-    REALLOCATE (X, float, NCAL);
-    REALLOCATE (Y, float, NCAL);
   }
+}
+
+/* this does not use the linked list to navigate the measure structure
+   this is OK for old measures, but will break for entries which have
+   already added a new measure to the list.  */
+void AddToCalibration (Average *average, Measure *measure, Measure *new, int Nstar) {
+
+  int i, found0, found1, found2;
+  float CalM0, CalM1, CalM2, dCalM;
+  short CalC0, CalC1, CalC2;
+
+  found0 = found1 = found2 = FALSE;
+  CalM0 = CalM1 = CalM2 = dCalM = NO_MAG;
+
+  CalC0 = thiscode[0].equiv;
+  CalC1 = thiscode[0].c1;
+  CalC2 = thiscode[0].c2;
+
+  for (i = 0; i < average[0].Nm; i++) {
+    if (measure[0].source == CalC0) { 
+      found0 = TRUE; 
+      CalM0  = measure[i].M; 
+      dCalM  = measure[i].dM; 
+    }
+    if (measure[i].source == CalC1) { 
+      found1 = TRUE; 
+      CalM1  = measure[i].M; 
+    }
+    if (measure[i].source == CalC2) { 
+      found2 = TRUE; 
+      CalM2  = measure[i].M; 
+    }
+    if (found0 && found1 && found2) {
+      SaveCalibration (new[0].M, new[0].dM, CalM0, dCalM, CalM1-CalM2, new[0].airmass, Nstar);
+      return;
+    }
+    /* n = next[n]; - if we use this, we need to pass in measure[0] above */
+  }
+  return;
 }
 
@@ -59 +83 @@
 
   int i, MaxN, *Nlist, Nkeep;
+  short int Mint;
   float N, M1, M2, Klam, Clam, Xlam, Mabs, *Dmag, *dDmag;
   float dMo, dMr, Mw, Dmed, W1, W2, NSigma;
@@ -91 +116 @@
     /* if this entry has too many (or two few?) matches, skip it */
     if (Nlist[Nstar[i]] != 1) continue;
-    Mabs = 0.001*(Mobs[i] + Klam*(Airm[i] - 1000) + Clam + Xlam*(Mref[i] - Cref[i])) - ZeroPt;
-
+    Mint = Clam + Mobs[i] + Xlam*Cref[i] + Klam*(Airm[i] - 1000);
+    Mabs = 0.001*Mint - ZeroPt;
     /* note: subpix correction is applied in gstars */
-
-    if (DUMP_MATCHES) 
-      fprintf (stdout, "%d  %6.3f %6.3f %6.3f  %10.6f %10.6f  %7.2f %7.2f  %7.2f  %7.2f\n", 
-               i, Mabs, 0.001*Mref[i], 0.001*Cref[i], RA[i], DEC[i], X[i], Y[i], Airm[i], 0.001*dMobs[i]);
 
     /* skip stars brighter than 8.0 */
@@ -157 +178 @@
   }
 }
-
-# if (0)
-
-/* old correction - superceeded by subpix grid */
-
-  /* find lo (Dmed - 0.1) + hi (Dmed + 0.1) 
-  lo = -1; hi = -1;
-  for (i = 0; (lo == -1) && (i < Nkeep); i++) { if (Dmed - Dmag[i] < 0.1) lo = i; }
-  for (i = Nkeep - 1; (hi == -1) && (i >= 0); i--) { if (Dmag[i] - Dmed < 0.1) hi = i; }
-  if (lo == -1) lo = 0;
-  if (hi == -1) hi = Nkeep - 1;
-  */
-
-  if (Nkeep < 3) {
-    fprintf (stderr, "too few stars\n");
-    image[0].Mcal = 10000;
-    image[0].dMcal = 10000;
-    return;
-  }
-  fsort2 (Dmag, dDmag, Nkeep);
-
-  /* accumulate delta mags (25% - 75% of list) */
-  M1 = 0.0;
-  M2 = 0.0;
-  N  = 0.0;
-  for (i = 0.25*Nkeep; i <= 0.75*Nkeep; i++) {
-
-    /* a straight mean works better, given the bad photometry of skyprobe */
-    M1 += Dmag[i];
-    M2 += SQ (Dmag[i]);
-    N  += 1.0; 
-
-  }
-
-  if (N > 1) {
-    M1 = M1 / N;
-    M2 = sqrt (fabs(M2/N - M1*M1));
-    fprintf (stderr, "N: %.0f, mean: %f, stdev: %f, precision: %f\n", N, M1, M2, M2 / sqrt (N));
-    image[0].Mcal = 1000 * M1;
-    image[0].dMcal = 1000 * M2 / sqrt (N);
-  } else {
-    fprintf (stderr, "too few stars\n");
-    image[0].Mcal = 10000;
-    image[0].dMcal = 10000;
-  }
-
-
-    /* subpix correction : make parameters global! */
-    dAs = 0;
-    if (Y[i] < 400) dAs = 0.06 - 0.00015*Y[i];
-    dYs = Y[i] - (int) (Y[i]) + 0.55;
-    dMs = dAs * sin (6.28*dYs);
-    /* Mabs -= dMs; */
-
-# endif