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

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

@@ -81 +81 @@
     if (PhotCodeSelect) {
       if ((code[0].type == PHOT_REF) || (code[0].type == PHOT_DEP)) {
-        if (code[0].code != image[i].source) continue;
+        if (code[0].code != image[i].photcode) continue;
       } 
-      if ((code[0].type == PHOT_PRI) || (code[0].type == PHOT_SEC)) {
-        if (code[0].code != GetPhotcodeEquivCodebyCode (image[i].source)) continue;
+      if (code[0].type == PHOT_SEC) {
+        if (code[0].code != GetPhotcodeEquivCodebyCode (image[i].photcode)) continue;
       } 
     }      
@@ -104 +104 @@
     if (PixelCoords) {
       gprint (GP_LOG, "%3d %s %6.1f %6.1f %20s %5d %2d %4.2f %6.3f %5.3f %5.3f %4x\n", 
-               Nfound, image[i].name, X, Y, date, image[i].nstar, image[i].source, image[i].secz_PS, image[i].Mcal_PS, image[i].dMcal_PS, image[i].exptime, image[i].code);
+               Nfound, image[i].name, X, Y, date, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal, image[i].exptime, image[i].code);
     } else {
       XY_to_RD (&ra, &dec, 0.5*image[i].NX, 0.5*image[i].NY, &image[i].coords);
       gprint (GP_LOG, "%3d %s %8.4f %8.4f %20s %5d %2d %4.2f %6.3f %5.3f %5.3f %4x\n", 
-               Nfound, image[i].name, ra, dec, date, image[i].nstar, image[i].source, image[i].secz_PS, image[i].Mcal_PS, image[i].dMcal_PS, image[i].exptime, image[i].code);
+               Nfound, image[i].name, ra, dec, date, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal, image[i].exptime, image[i].code);
     }
     sprintf (name, "IMAGEx:%d", Nfound);