Changeset 5014 for trunk/Ohana/src/opihi

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

Location:

trunk/Ohana/src/opihi/dvo

Files:

• avextract.c (modified) (1 diff)
• calextract.c (modified) (1 diff)
• calmextract.c (modified) (1 diff)
• catalog.c (modified) (1 diff)
• ccd.c (modified) (1 diff)
• cmatch.c (modified) (1 diff)
• cmd.c (modified) (1 diff)
• ddmags.c (modified) (1 diff)
• dmagaves.c (modified) (1 diff)
• dmagmeas.c (modified) (1 diff)
• dmags.c (modified) (1 diff)
• dmt.c (modified) (1 diff)
• extract.c (modified) (1 diff)
• fitcolors.c (modified) (3 diffs)
• gimages.c (modified) (2 diffs)
• gstar.c (modified) (1 diff)
• imdata.c (modified) (1 diff)
• imextract.c (modified) (1 diff)
• imlist.c (modified) (1 diff)
• imphot.c (modified) (1 diff)
• imstats.c (modified) (1 diff)
• lcurve.c (modified) (1 diff)
• lightcurve.c (modified) (1 diff)
• mextract.c (modified) (1 diff)
• pmeasure.c (modified) (1 diff)
• subpix.c (modified) (2 diffs)

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

@@ -28 +28 @@
   /* find CATDIR in config system */
   if (VarConfig ("CATDIR", "%s", catdir) == NULL) goto escape;
-  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL) 
-    strcpy (catalog.catmode, "RAW");
 
   /* interpret command-line options */

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

@@ -30 +30 @@
   /* find CATDIR in config system */
   if (VarConfig ("CATDIR", "%s", catdir) == NULL) goto escape;
-  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL) 
-    strcpy (catalog.catmode, "RAW");
 
   /* command line arguments */

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

@@ -31 +31 @@
   /* find CATDIR in config system */
   if (VarConfig ("CATDIR", "%s", catdir) == NULL) goto escape;
-  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL) 
-    strcpy (catalog.catmode, "RAW");
 
   /* command line arguments */

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

@@ -32 +32 @@
   VarConfig ("GSCDIR", "%s", gscdir);
   VarConfig ("CATDIR", "%s", catdir);
-  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL) 
-    strcpy (catalog.catmode, "RAW");
 
   Mz = 17.0;

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

@@ -28 +28 @@
   /* find CATDIR in config system */
   if (VarConfig ("CATDIR", "%s", catdir) == NULL) goto escape;
-  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL) 
-    strcpy (catalog.catmode, "RAW");
 
   /* interpret command-line options */

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

@@ -11 +11 @@
   VarConfig ("GSCDIR", "%s", gscdir);
   VarConfig ("CATDIR", "%s", catdir);
-  if (VarConfig ("CATMODE", "%s", catalog1.catmode) == NULL) 
-    strcpy (catalog1.catmode, "RAW");
       
   if (argc != 9) {

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

@@ -28 +28 @@
   /* find CATDIR in config system */
   if (VarConfig ("CATDIR", "%s", catdir) == NULL) goto escape;
-  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL) 
-    strcpy (catalog.catmode, "RAW");
 
   /* interpret command-line options */

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

@@ -28 +28 @@
   /* find CATDIR in config system */
   if (VarConfig ("CATDIR", "%s", catdir) == NULL) goto escape;
-  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL) 
-    strcpy (catalog.catmode, "RAW");
 
   /* interpret command-line options */

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

@@ -29 +29 @@
   /* find CATDIR in config system */
   if (VarConfig ("CATDIR", "%s", catdir) == NULL) goto escape;
-  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL) 
-    strcpy (catalog.catmode, "RAW");
 
   /* interpret command-line options */

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

@@ -29 +29 @@
   /* find CATDIR in config system */
   if (VarConfig ("CATDIR", "%s", catdir) == NULL) goto escape;
-  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL) 
-    strcpy (catalog.catmode, "RAW");
 
   /* interpret command-line options */

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

@@ -28 +28 @@
   /* find CATDIR in config system */
   if (VarConfig ("CATDIR", "%s", catdir) == NULL) goto escape;
-  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL) 
-    strcpy (catalog.catmode, "RAW");
 
   /* interpret command-line options */

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

@@ -20 +20 @@
 
   VarConfig ("CATDIR", "%s", catdir);
-  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL) 
-    strcpy (catalog.catmode, "RAW");
 
   vec1 = vec2 = vec3 = vec4 = vec5 = NULL;

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

@@ -36 +36 @@
   VarConfig ("GSCDIR", "%s", gscdir);
   VarConfig ("CATDIR", "%s", catdir);
-  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL) 
-    strcpy (catalog.catmode, "RAW");
 
   regions = (RegionFile *) NULL;

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

@@ -14 +14 @@
   int N1, N2, i1, i2, mode[4];
   int Nsec, Nregions, status;
-  char catdir[256], catmode[16], filename[256], *RegionName, *RegionList;
+  char catdir[256], filename[256], *RegionName, *RegionList;
   char *cmd, *outcmd, *camera;
   double *M1, *M2;
@@ -37 +37 @@
   /* find CATDIR in config system */
   if (VarConfig ("CATDIR", "%s", catdir) == NULL) goto escape;
-  if (VarConfig ("CATMODE", "%s", catmode) == NULL) strcpy (catmode, "RAW");
 
   /* interpret command-line options */
@@ -104 +103 @@
   for (k = 0; k < Nregions; k++) {
     /* lock, load, unlock catalog */
-    strcpy (catalog[k].catmode, catmode);
     sprintf (filename, "%s/%s", catdir, regions[k].name);
     catalog[k].filename = filename;

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);

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

@@ -18 +18 @@
 
   if (VarConfig ("CATDIR", "%s", catdir) == NULL) return (FALSE);
-  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL) 
-    strcpy (catalog.catmode, "RAW");
 
   if (!InitPhotcodes ()) return (FALSE);

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

@@ -40 +40 @@
     }      
   }
-
-  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL) 
-    strcpy (catalog.catmode, "RAW");
 
   if (argc != 4) {

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

@@ -139 +139 @@
       break;
     case (AIRMASS):
-      vec[0].elements[N] = 0.001*image[j].secz;
+      vec[0].elements[N] = image[j].secz_PS;
       break;
     case (MCAL):
-      vec[0].elements[N] = 0.001*image[j].Mcal;
+      vec[0].elements[N] = image[j].Mcal_PS;
       break;
     case (dMCAL):
-      vec[0].elements[N] = 0.001*image[j].dMcal;
+      vec[0].elements[N] = image[j].dMcal_PS;
       break;
     case (PHOTCODE):

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

@@ -86 +86 @@
     XY_to_RD (&r, &d, 0.5*image[i].NX, 0.5*image[i].NY, &image[i].coords);
     fprintf (GetOutfile(), "%3d %s %8.4f %8.4f %f %5d %2d %4.2f %5.3f %5.3f\n", 
-             i, image[i].name, r, d, t, image[i].nstar, image[i].source, 0.001*image[i].secz, 0.001*image[i].Mcal, 0.001*image[i].dMcal);
+             i, image[i].name, r, d, t, image[i].nstar, image[i].source, image[i].secz_PS, image[i].Mcal_PS, image[i].dMcal_PS);
   }
 

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

@@ -74 +74 @@
     switch (image[i].order) {
     case 0:
-      fprintf (stderr, "%s: %d - %d\n", image[i].name, image[i].order, image[i].Mcal);
+      fprintf (stderr, "%s: %d - %f\n", image[i].name, image[i].order, image[i].Mcal_PS);
       break;
     case 1:
-      fprintf (stderr, "%s: %d - %d, %d %d\n", image[i].name, image[i].order, image[i].Mcal, image[i].Mx, image[i].My);
+      fprintf (stderr, "%s: %d - %f, %d %d\n", image[i].name, image[i].order, image[i].Mcal_PS, image[i].Mx, image[i].My);
       break;
     case 2:
-      fprintf (stderr, "%s: %d - %d, %d %d, %d %d %d\n", image[i].name, image[i].order, image[i].Mcal, image[i].Mx, image[i].My, image[i].Mxx, image[i].Mxy, image[i].Myy);
+      fprintf (stderr, "%s: %d - %f, %d %d, %d %d %d\n", image[i].name, image[i].order, image[i].Mcal_PS, image[i].Mx, image[i].My, image[i].Mxx, image[i].Mxy, image[i].Myy);
       break;
     case 3:
-      fprintf (stderr, "%s: %d - %d, %d %d, %d %d %d, %d %d %d %d\n", image[i].name, image[i].order, image[i].Mcal, image[i].Mx, image[i].My, 
+      fprintf (stderr, "%s: %d - %f, %d %d, %d %d %d, %d %d %d %d\n", image[i].name, image[i].order, image[i].Mcal_PS, image[i].Mx, image[i].My, 
                image[i].Mxx, image[i].Mxy, image[i].Myy, image[i].Mxxx, image[i].Mxxy, image[i].Mxyy, image[i].Myyy);
       break;
     case 4:
-      fprintf (stderr, "%s: %d - %d, %d %d, %d %d %d, %d %d %d %d, %d %d %d %d %d\n", image[i].name, image[i].order, image[i].Mcal, image[i].Mx, image[i].My, 
+      fprintf (stderr, "%s: %d - %f, %d %d, %d %d %d, %d %d %d %d, %d %d %d %d %d\n", image[i].name, image[i].order, image[i].Mcal_PS, image[i].Mx, image[i].My, 
                image[i].Mxx, image[i].Mxy, image[i].Myy, image[i].Mxxx, image[i].Mxxy, image[i].Mxyy, image[i].Myyy,
                image[i].Mxxxx, image[i].Mxxxy, image[i].Mxxyy, image[i].Mxyyy, image[i].Myyyy);

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

@@ -45 +45 @@
   fprintf (stdout, "seq  ra (J2000) dec    time (s)   Nstars\n");
   for (i = 0; i < Nimage; i++) {
-    Xvec.elements[i] = 0.001*image[i].secz;
+    Xvec.elements[i] = image[i].secz_PS;
     if (Mcal) 
-      Yvec.elements[i] = 0.001*image[i].Mcal;
+      Yvec.elements[i] = image[i].Mcal_PS;
     else 
-      Yvec.elements[i] = 0.001*image[i].dMcal;
+      Yvec.elements[i] = image[i].dMcal_PS;
     if (!FindMosaicForImage (image, Nimage, i)) continue;
     XY_to_RD (&r, &d, 0.5*image[i].NX, 0.5*image[i].NY, &image[i].coords);
     fprintf (stderr, "%d %8.4f %8.4f %10d %6d  %5.3f %6.3f %6.3f\n", 
              i, r, d, image[i].tzero, image[i].nstar, Xvec.elements[i], 
-             0.001*image[i].Mcal, 0.001*image[i].dMcal);
+             image[i].Mcal_PS, image[i].dMcal_PS);
   } 
   if (AutoLimits) SetLimits (&Xvec, &Yvec, &graphmode);

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

@@ -18 +18 @@
 
   VarConfig ("CATDIR", "%s", catdir);
-  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL) 
-    strcpy (catalog.catmode, "RAW");
 
   if (!InitPhotcodes ()) return (FALSE);

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

@@ -15 +15 @@
 
   VarConfig ("CATDIR", "%s", catdir);
-  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL) 
-    strcpy (catalog.catmode, "RAW");
 
   if (!InitPhotcodes ()) return (FALSE);

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

@@ -29 +29 @@
   /* find CATDIR in config system */
   if (VarConfig ("CATDIR", "%s", catdir) == NULL) goto escape;
-  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL) 
-    strcpy (catalog.catmode, "RAW");
 
   /* interpret command-line options */

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

@@ -22 +22 @@
   if (!GetGraph (&graphmode, NULL, &Ngraph)) return (FALSE);
   if (VarConfig ("CATDIR", "%s", catdir) == NULL) return (FALSE);
-  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL) 
-    strcpy (catalog.catmode, "RAW");
 
   regions = (RegionFile *) NULL;

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

@@ -23 +23 @@
 
   VarConfig ("CATDIR", "%s", catdir);
-  if (VarConfig ("CATMODE", "%s", catalog.catmode) == NULL) 
-    strcpy (catalog.catmode, "RAW");
 
   GetTimeFormat (&TimeReference, &TimeFormat);
@@ -150 +148 @@
         RD_to_XY (&X, &Y, Ra, Dec, &image[I].coords);
         t = TimeValue (measure[j].t, TimeReference, TimeFormat);
-        fprintf (GetOutfile(), "%f %6.3f %7.2f %7.2f %5.3f\n", t, Mabs, X, Y, 0.001*image[I].secz);
+        fprintf (GetOutfile(), "%f %6.3f %7.2f %7.2f %5.3f\n", t, Mabs, X, Y, image[I].secz_PS);
       } 
     }