Changeset 15543 for trunk/Ohana/src/getstar/src/write_getstar_ps1_dev_2.c

Timestamp:

Nov 9, 2007, 11:14:10 AM (19 years ago)

Author:

eugene

Message:

fixed magnitude limit selections; allow non-average photcodes

File:

• trunk/Ohana/src/getstar/src/write_getstar_ps1_dev_2.c (modified) (2 diffs)

trunk/Ohana/src/getstar/src/write_getstar_ps1_dev_2.c

@@ -39 +39 @@
   secfilt = catalog[0].secfilt;
 
-  if (Nsec_c0 == -1) {
-    fprintf (stderr, "invalid photcode %s\n", photcode[0].name);
-    exit (2);
-  }
-
   // do we skip any of catalog entries? (probably not)
   for (i = 0; i < catalog[0].Naverage; i++) {
@@ -63 +58 @@
     output[i].photcode = code_c0;
 
-    output[i].mag      = secfilt[i*Nsecfilt + Nsec_c0].M;
-
     // It is not necessary for the output color terms to be average values.  If they are,
     // we grab them quickly & easily from the secfilt table.  If not, then we need to scan
     // the list of measures to find the value of interest
+
+    // find primary magnitude
+    if (Nsec_c0 != -1) {
+      output[i].mag = secfilt[i*Nsecfilt + Nsec_c0].M;
+    } else {
+      output[i].mag = NAN;
+      offset = average[i].offset;
+      for (m = 0; m < average[i].Nm; m++) {
+        if (measure[offset + m].photcode == code_c0) {
+          output[i].mag = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);
+          break;
+        }
+      }
+    }
 
     // find color term 1