Changeset 5014 for trunk/Ohana/src/opihi/dvo/gimages.c

Timestamp:

Sep 12, 2005, 3:04:48 PM (21 years ago)

Author:

eugene

Message:

substantial work to enable mode and format selections for DVO:image and DVO:secfilt

File:

• trunk/Ohana/src/opihi/dvo/gimages.c (modified) (2 diffs)

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

@@ -4 +4 @@
   
   int i, j, N, Nimage, Nfound, *subset, Nsubset, status;
-  double ra, dec, Ra, Dec, X, Y, Mcal;
+  double ra, dec, Ra, Dec, X, Y;
   double trange, t;
   int TimeSelect, PixelCoords, TimeFormat, PhotCodeSelect;
@@ -96 +96 @@
     if (Y > image[i].NY) continue;
 
+    /*** XXX we need to re-introduce the use of applyMcal
     Mcal = applyMcal (&image[i], 2048.0, 2048.0);
+    ***/
+
     date = sec_to_date (image[i].tzero);
 
     if (PixelCoords) {
       fprintf (GetOutfile(), "%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, 0.001*image[i].secz, 0.001*Mcal, 0.001*image[i].dMcal, image[i].exptime, image[i].code);
+               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);
     } else {
       XY_to_RD (&ra, &dec, 0.5*image[i].NX, 0.5*image[i].NY, &image[i].coords);
       fprintf (GetOutfile(), "%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, 0.001*image[i].secz, 0.001*Mcal, 0.001*image[i].dMcal, image[i].exptime, image[i].code);
+               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);
     }
     sprintf (name, "IMAGEx:%d", Nfound);