Changeset 5451 for trunk/Ohana/src/opihi/dvo/dmt.c

Timestamp:

Oct 27, 2005, 7:10:17 PM (21 years ago)

Author:

eugene

Message:

working on SkyRegion conversion

File:

• trunk/Ohana/src/opihi/dvo/dmt.c (modified) (4 diffs)

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

@@ -6 +6 @@
   int i, m, k, N, Ngraph, SaveVectors;
   int Ns, Nsec, NPTS;
-  char catdir[256], filename[256];
   double Radius;
   float dt1, dt2, dmt1, dmt2;
@@ -19 +18 @@
 
   if (!InitPhotcodes ()) return (FALSE);
-
-  VarConfig ("CATDIR", "%s", catdir);
 
   vec1 = vec2 = vec3 = vec4 = vec5 = NULL;
@@ -54 +51 @@
   Ns = GetPhotcodeNsec (code[0].code);
 
-  /* load sky from correct table */
-  sky = SkyTableLoadOptimal (CATDIR, SKY_TABLE, GSCFILE, -1, VERBOSE);
-  SkyTableSetFilenames (sky, CATDIR, "cpt");
+  Radius = MAX (fabs(graphsky.xmax), fabs(graphsky.ymax));
 
-  Radius = MAX (fabs(graphsky.xmax), fabs(graphsky.ymax));
+  sky = GetSkyTable ();
   skylist = SkyListByRadius (sky, -1, graphsky.coords.crval1, graphsky.coords.crval2, Radius);
   
@@ -74 +69 @@
 
     /* lock, load, unlock catalog */
-    catalog.filename = skylist[0].regions[k][0].filename;
+    catalog.filename = (char *) skylist[0].regions[k][0].filename;
     switch (lock_catalog (&catalog, LCK_SOFT)) {
     case 2: