Changeset 12332 for trunk/Ohana/src/opihi/dvo/fitsed.c

Timestamp:

Mar 8, 2007, 12:21:18 PM (19 years ago)

Author:

eugene

Message:

complete merge from branch dvo-mods-2007-02

File:

• trunk/Ohana/src/opihi/dvo/fitsed.c (modified) (4 diffs)

trunk/Ohana/src/opihi/dvo/fitsed.c

@@ -25 +25 @@
   int *hashcode;
   int i, j, k, m, N, done, Nfit;
-  int Nsec, status;
+  int Nsecfilt, status;
   void *oldsignal;
   char *RegionName, *RegionList;
@@ -68 +68 @@
   resSection.name = NULL;
 
+  Nrow = 0;
+
+  fiterrs = NULL;
+  fitmags = NULL;
+
   oldsignal = signal (SIGINT, handle_interrupt);
   interrupt = FALSE;
@@ -73 +78 @@
   /* load photcode information */
   if (!InitPhotcodes ()) goto escape;
-  Nsec = GetPhotcodeNsecfilt ();
+  Nsecfilt = GetPhotcodeNsecfilt ();
 
   /* interpret command-line options */
@@ -203 +208 @@
       m = catalog.average[i].offset;
       for (j = 0; j < catalog.average[i].Nm; j++) {
-        idx = hashcode[catalog.measure[m+j].source];
+        idx = hashcode[catalog.measure[m+j].photcode];
         if (idx == -1) continue;
         // XXX do something more clever if more than one value exists per photcode
-        sourceValue.mags[idx] = catalog.measure[m+j].M_PS + vegaToAB[idx];
-        sourceError.mags[idx] = catalog.measure[m+j].dM_PS;
-        if ((catalog.measure[m+j].source == USNOred) || (catalog.measure[m+j].source == USNOblu)) {
+        sourceValue.mags[idx] = catalog.measure[m+j].M + vegaToAB[idx];
+        sourceError.mags[idx] = catalog.measure[m+j].dM;
+        if ((catalog.measure[m+j].photcode == USNOred) || (catalog.measure[m+j].photcode == USNOblu)) {
           sourceError.mags[idx] = 0.3;
         }