Changeset 12332 for trunk/Ohana/src/opihi/dvo/imextract.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/imextract.c (modified) (3 diffs)

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

@@ -63 +63 @@
       return (FALSE);
     }
-    if ((code[0].type != PHOT_PRI) && (code[0].type != PHOT_SEC) && (code[0].type != PHOT_DEP)) {
+    if ((code[0].type != PHOT_SEC) && (code[0].type != PHOT_DEP)) {
       gprint (GP_ERR, "photcode must be primary, secondary, or dependent code\n");
       return (FALSE);
@@ -114 +114 @@
     if (PhotcodeSelect) {
       if (code[0].type == PHOT_DEP) {
-        if (code[0].code != image[j].source) continue;
+        if (code[0].code != image[j].photcode) continue;
       } else {
-        if (code[0].code != GetPhotcodeEquivCodebyCode (image[j].source)) continue;
+        if (code[0].code != GetPhotcodeEquivCodebyCode (image[j].photcode)) continue;
       }
     }
@@ -139 +139 @@
       break;
     case (AIRMASS):
-      vec[0].elements[N] = image[j].secz_PS;
+      vec[0].elements[N] = image[j].secz;
       break;
     case (MCAL):
-      vec[0].elements[N] = image[j].Mcal_PS;
+      vec[0].elements[N] = image[j].Mcal;
       break;
     case (dMCAL):
-      vec[0].elements[N] = image[j].dMcal_PS;
+      vec[0].elements[N] = image[j].dMcal;
       break;
     case (PHOTCODE):
-      vec[0].elements[N] = image[j].source;
+      vec[0].elements[N] = image[j].photcode;
       break;
     case (TIME):