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

Timestamp:

Oct 27, 2005, 10:38:30 AM (21 years ago)

Author:

eugene

Message:

implementing SkyRegions in all DVO programs

File:

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

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

@@ -4 +4 @@
 int dmt (int argc, char **argv) {
   
-  int i, m, k, N, Nregions, Ngraph, SaveVectors;
+  int i, m, k, N, Ngraph, SaveVectors;
   int Ns, Nsec, NPTS;
   char catdir[256], filename[256];
@@ -13 +13 @@
   Catalog catalog;
   Graphdata graphmode, graphsky;
-  RegionFile *regions;
+  SkyTable *sky;
+  SkyList *skylist;
   Vector Xvec, Yvec, Zvec, Rvec, Dvec;
   Vector *vec1, *vec2, *vec3, *vec4, *vec5;
@@ -53 +54 @@
   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));
-  regions = find_regions (graphsky.coords.crval1, graphsky.coords.crval2, Radius, &Nregions);
+  skylist = SkyListByRadius (sky, -1, graphsky.coords.crval1, graphsky.coords.crval2, Radius);
   
   N = 0;
@@ -66 +71 @@
   }
 
-  for (k = 0; k < Nregions; k++) {
+  for (k = 0; k < skylist[0].Nregions; k++) {
 
-    sprintf (filename, "%s/%s", catdir, regions[k].name);
     /* lock, load, unlock catalog */
-    catalog.filename = filename;
+    catalog.filename = skylist[0].regions[k][0].filename;
     switch (lock_catalog (&catalog, LCK_SOFT)) {
     case 2: