Changeset 5945 for trunk/Ohana/src/opihi

Timestamp:

Jan 6, 2006, 6:45:40 PM (21 years ago)

Author:

eugene

Message:

moved filename out of SkyRegion into SkyList, SkyTable

Location:

trunk/Ohana/src/opihi/dvo

Files:

• avextract.c (modified) (1 diff)
• calextract.c (modified) (1 diff)
• calmextract.c (modified) (1 diff)
• ccd.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)
• fitcolors.c (modified) (1 diff)
• gcat.c (modified) (1 diff)
• gstar.c (modified) (1 diff)
• imdata.c (modified) (1 diff)
• lcat.c (modified) (1 diff)
• lcurve.c (modified) (1 diff)
• lightcurve.c (modified) (1 diff)
• mextract.c (modified) (1 diff)
• pmeasure.c (modified) (1 diff)
• region_list.c (modified) (3 diffs)
• skycat.c (modified) (1 diff)
• subpix.c (modified) (1 diff)

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

@@ -55 +55 @@
   for (i = 0; i < skylist[0].Nregions; i++) {
     /* lock, load, unlock catalog */
-    catalog.filename = (char *) skylist[0].regions[i][0].filename;
+    catalog.filename = skylist[0].filename[i];
     switch (lock_catalog (&catalog, LCK_SOFT)) {
     case 2:

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

@@ -61 +61 @@
 
     /* lock, load, unlock catalog */
-    catalog.filename = (char *) skylist[0].regions[Nr][0].filename;
+    catalog.filename = skylist[0].filename[Nr];
     switch (lock_catalog (&catalog, LCK_SOFT)) {
     case 2:

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

@@ -74 +74 @@
 
     /* lock, load, unlock catalog */
-    catalog.filename = (char *) skylist[0].regions[Nr][0].filename;
+    catalog.filename = skylist[0].filename[Nr];
     switch (lock_catalog (&catalog, LCK_SOFT)) {
     case 2:

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

@@ -58 +58 @@
   for (k = 0; k < skylist[0].Nregions; k++) {
     /* lock, load, unlock catalog */
-    catalog.filename = (char *) skylist[0].regions[k][0].filename;
+    catalog.filename = skylist[0].filename[k];
     switch (lock_catalog (&catalog, LCK_SOFT)) {
       case 2:

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

@@ -56 +56 @@
   for (j = 0; j < skylist[0].Nregions; j++) {
     /* lock, load, unlock catalog */
-    catalog.filename = (char *) skylist[0].regions[j][0].filename;
+    catalog.filename = skylist[0].filename[j];
     switch (lock_catalog (&catalog, LCK_SOFT)) {
     case 2:

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

@@ -58 +58 @@
   for (k = 0; k < skylist[0].Nregions; k++) {
     /* lock, load, unlock catalog */
-    catalog.filename = (char *) skylist[0].regions[k][0].filename;
+    catalog.filename = skylist[0].filename[k];
     switch (lock_catalog (&catalog, LCK_SOFT)) {
       case 2:

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

@@ -50 +50 @@
   for (j = 0; j < skylist[0].Nregions; j++) {
     /* lock, load, unlock catalog */
-    catalog.filename = (char *) skylist[0].regions[j][0].filename;
+    catalog.filename = skylist[0].filename[j];
     switch (lock_catalog (&catalog, LCK_SOFT)) {
     case 2:

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

@@ -58 +58 @@
   for (j = 0; j < skylist[0].Nregions; j++) {
     /* lock, load, unlock catalog */
-    catalog.filename = (char *) skylist[0].regions[j][0].filename;
+    catalog.filename = skylist[0].filename[j];
     switch (lock_catalog (&catalog, LCK_SOFT)) {
       case 2:

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

@@ -56 +56 @@
   for (j = 0; j < skylist[0].Nregions; j++) {
     /* lock, load, unlock catalog */
-    catalog.filename = (char *) skylist[0].regions[j][0].filename;
+    catalog.filename = skylist[0].filename[j];
     switch (lock_catalog (&catalog, LCK_SOFT)) {
       case 2:

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

@@ -69 +69 @@
 
     /* lock, load, unlock catalog */
-    catalog.filename = (char *) skylist[0].regions[k][0].filename;
+    catalog.filename = skylist[0].filename[k];
     switch (lock_catalog (&catalog, LCK_SOFT)) {
     case 2:

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

@@ -99 +99 @@
   for (k = 0; k < skylist[0].Nregions; k++) {
     /* lock, load, unlock catalog */
-    catalog[k].filename = (char *) skylist[0].regions[k][0].filename;
+    catalog[k].filename = skylist[0].filename[k];
     switch (lock_catalog (&catalog[k], LCK_SOFT)) {
       case 2:

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

@@ -26 +26 @@
 
   for (i = 0; i < skylist[0].Nregions; i++) {
-    if (stat ((char *) skylist[0].regions[i][0].filename, &filestat) != -1) {
+    if (stat (skylist[0].filename[i], &filestat) != -1) {
       fprintf (stderr, "%3d %s *\n", i, skylist[0].regions[i][0].name);
     } else {
       fprintf (stderr, "%3d %s\n", i, skylist[0].regions[i][0].name);
     } 
-    set_str_variable ("CATNAME", (char *) skylist[0].regions[i][0].filename);
+    set_str_variable ("CATNAME", skylist[0].filename[i]);
   }
 

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

@@ -60 +60 @@
 
   /* lock, load, unlock catalog */
-  catalog.filename = (char *) skylist[0].regions[0][0].filename;
+  catalog.filename = skylist[0].filename[0];
   switch (lock_catalog (&catalog, LCK_SOFT)) {
   case 2:

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

@@ -120 +120 @@
 
     /* get file name and open */
-    catalog.filename = (char *) skylist[0].regions[j][0].filename;
+    catalog.filename = skylist[0].filename[j];
     switch (lock_catalog (&catalog, LCK_SOFT)) {
     case 2:

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

@@ -33 +33 @@
   for (i = 0; i < skylist[0].Nregions; i++) {
     exists = 'Y';
-    if (stat ((char *) skylist[0].regions[i][0].filename, &filestat) == -1) exists = 'N';
+    if (stat (skylist[0].filename[i], &filestat) == -1) exists = 'N';
     if (ShowAll) {
       fprintf (stderr, "%3d %s  %c\n", i, skylist[0].regions[i][0].name, exists);

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

@@ -81 +81 @@
 
   /* set filename, read in header */
-  catalog.filename = (char *) skylist[0].regions[0][0].filename;
+  catalog.filename = skylist[0].filename[0];
   switch (lock_catalog (&catalog, LCK_SOFT)) {
   case 2:

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

@@ -57 +57 @@
 
   /* set filename, read in header */
-  catalog.filename = (char *) skylist[0].regions[0][0].filename;
+  catalog.filename = skylist[0].filename[0];
   switch (lock_catalog (&catalog, LCK_SOFT)) {
   case 2:

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

@@ -56 +56 @@
 
   for (i = 0; i < skylist[0].Nregions; i++) {
-    catalog.filename = (char *) skylist[0].regions[i][0].filename;
+    catalog.filename = skylist[0].filename[i];
     switch (lock_catalog (&catalog, LCK_SOFT)) {
     case 2:

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

@@ -81 +81 @@
     
     /* lock, load, unlock catalog */
-    catalog.filename = (char *) skylist[0].regions[j][0].filename;
+    catalog.filename = skylist[0].filename[j];
     switch (lock_catalog (&catalog, LCK_SOFT)) {
     case 2:

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

@@ -96 +96 @@
     ALLOCATE (skylist[0].regions, SkyRegion *, 1);
     ALLOCATE (skylist[0].regions[0], SkyRegion, 1);
+    ALLOCATE (skylist[0].filename, char *, 1);
+    
     strcpy (skylist[0].regions[0][0].name, RegionName);
     sprintf (filename, "%s/%s.cpt", CATDIR, RegionName);
-    skylist[0].regions[0][0].filename = (e_void) strcreate (filename);
+    skylist[0].filename[0] = strcreate (filename);
     free (RegionName);
     RegionName = NULL;
@@ -142 +144 @@
   NREGIONS = 50;
   ALLOCATE (skylist[0].regions, SkyRegion *, NREGIONS);
+  ALLOCATE (skylist[0].filename, char *, NREGIONS);
 
   while (fscanf (f, "%s", filename) != EOF) {
@@ -147 +150 @@
     strcpy (skylist[0].regions[Nregions][0].name, filename);
     sprintf (filename, "%s/%s.cpt", CATDIR, skylist[0].regions[Nregions][0].name);
-    skylist[0].regions[Nregions][0].filename = (e_void) strcreate (filename);
+    skylist[0].filename[Nregions] = strcreate (filename);
     Nregions ++;
     CHECK_REALLOCATE (skylist[0].regions, SkyRegion *, NREGIONS, Nregions, 50);

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

@@ -63 +63 @@
 
   for (i = 0; i < Nregions; i++) {
-    if (ShowAll || (stat ((char *) regions[i][0].filename, &filestat) != -1)) {
+    if (ShowAll || (stat (skylist[0].filename[i], &filestat) != -1)) {
       if (VERBOSE) fprintf (stderr, "%3d %s %6.2f - %6.2f, %6.2f - %6.2f\n", i, regions[i][0].name, 
                             regions[i][0].Rmin, regions[i][0].Rmax, regions[i][0].Dmin, regions[i][0].Dmax);

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

@@ -41 +41 @@
 
   /* lock, load, unlock catalog */
-  catalog.filename = (char *) skylist[0].regions[0][0].filename;
+  catalog.filename = skylist[0].filename[0];
   switch (lock_catalog (&catalog, LCK_SOFT)) {
   case 2: