Changeset 7394

Timestamp:

Jun 7, 2006, 7:21:31 AM (20 years ago)

Author:

eugene

Message:

converting to SkyRegions

Location:

trunk/Ohana/src/addstar

Files:

• Makefile (modified) (6 diffs)
• include/addstar.h (modified) (1 diff)
• src/get2mass_dr2.c (modified) (1 diff)
• src/mkacc-2mass.c (modified) (3 diffs)
• src/sort_lists.c (modified) (2 diffs)

trunk/Ohana/src/addstar/Makefile

@@ -41 +41 @@
 $(SRC)/get2mass_dr2.$(ARCH).o \
 $(SRC)/getgsc.$(ARCH).o \
-$(SRC)/gettycho.$(ARCH).o \
 $(SRC)/getusno.$(ARCH).o \
 $(SRC)/getusnob.$(ARCH).o \
-$(SRC)/gimages.$(ARCH).o \
+$(SRC)/gettycho.$(ARCH).o \
 $(SRC)/greference.$(ARCH).o \
 $(SRC)/grefstars.$(ARCH).o \
+$(SRC)/gimages.$(ARCH).o \
 $(SRC)/gstars.$(ARCH).o \
 $(SRC)/image-db.$(ARCH).o \
@@ -113 +113 @@
 $(SRC)/getgsc.$(ARCH).o \
 $(SRC)/getusno.$(ARCH).o \
+$(SRC)/getusnob.$(ARCH).o \
+$(SRC)/gettycho.$(ARCH).o \
 $(SRC)/greference.$(ARCH).o \
 $(SRC)/gcatalog.$(ARCH).o \
@@ -134 +136 @@
 $(SRC)/NewImage.$(ARCH).o \
 $(SRC)/NewReflist.$(ARCH).o \
+$(SRC)/SkyTableFromTychoIndex.$(ARCH).o \
 $(SRC)/NewRefcat.$(ARCH).o 
 
@@ -158 +161 @@
 $(SRC)/getgsc.$(ARCH).o \
 $(SRC)/getusno.$(ARCH).o \
+$(SRC)/getusnob.$(ARCH).o \
+$(SRC)/gettycho.$(ARCH).o \
 $(SRC)/greference.$(ARCH).o \
 $(SRC)/gcatalog.$(ARCH).o \
@@ -177 +182 @@
 $(SRC)/check_permissions.$(ARCH).o \
 $(SRC)/opening_angle.$(ARCH).o \
+$(SRC)/SkyTableFromTychoIndex.$(ARCH).o \
 $(SRC)/ListenClients_Thread.$(ARCH).o \
 $(SRC)/NewImage_Thread.$(ARCH).o \
@@ -220 +226 @@
 $(BIN)/mkacc-2mass.$(ARCH) : $(MKACC-2MASS)
 mkacc-2mass.install        : $(DESTBIN)/mkacc-2mass
+
+all: addstar addstarc addstard addstart 
 
 INSTALL = addstar

trunk/Ohana/src/addstar/include/addstar.h

@@ -179 +179 @@
 Missing *sort_missing (Average *average, int Naverage, Missing *missing, int Nmissing, int *next_miss);
 
-/* functions which use GSCRegion, now deprecated */
-void       sort_regions           PROTO((GSCRegion *region, int N));
-GSCRegion *LoadRegions            PROTO((int *nregions));
-int        FindDecBand            PROTO((double dec, double *DEC0, double *DEC1));
-int        FindRegionByPoint      PROTO((GSCRegion *regions, double ra, double dec, GSCRegion *gsc, int Ngsc));
-int        FindRegionDecBandStart PROTO((GSCRegion *region, int Nregion, double dec));
-int        FindRegionDecBandStop  PROTO((GSCRegion *region, int Nregion, double dec));
-void       aregion                PROTO((GSCRegion *region, FILE *f, double ra, double dec));
-GSCRegion *gregion_image          PROTO((Image *image, Coords *mosaic, int *Nregions));
-GSCRegion *gregion_match          PROTO((GSCRegion *regions, int *nregions));
-GSCRegion *gregion_patch          PROTO((GSCRegion *patch, int *nregions));
-void       gregion_star           PROTO((Stars *star, GSCRegion *region));
-GSCRegion *gregion_stars          PROTO((Stars *stars, int Nstars, int *Nregion));
-GSCRegion *gregions               PROTO((Image *image, int *Nregions));
-
 /** 
     there is an inconsistency to be resolved: fixed structures (like Image)

trunk/Ohana/src/addstar/src/get2mass_dr2.c

@@ -96 +96 @@
 }
 
-/* this just scans along in the file.  file is sorted by dec, so we 
-   should be skipping large chunks - but we would need to have
-   the size from the accel file (won't fit in GSCRegion) and need
-   to use gzseek, if it exists.
+/* this just scans along in the file.  file is sorted by dec, so we should be
+   skipping large chunks - but we would need to have the size from the accel
+   file in (and need to use gzseek, if the data is compressed)
 */
 /* don't bother to seek ahead : position is not sufficiently predictable 

trunk/Ohana/src/addstar/src/mkacc-2mass.c

@@ -6 +6 @@
   int i, N, Nrefcat;
   Stars *refcat;
-  GSCRegion *regions, accregion;
+  SkyRegion *regions, accregion;
 
   ConfigInit (&argc, argv);
@@ -33 +33 @@
 
 good_code:
-  UserPatch.RA[0] = 0;
-  UserPatch.RA[1] = 360;
-  UserPatch.DEC[0] = -90;
-  UserPatch.DEC[1] = +90;
+  UserPatch.RAmin = 0;
+  UserPatch.RAmax = 360;
+  UserPatch.DECmin = -90;
+  UserPatch.DECmax = +90;
 
-  ALLOCATE (regions, GSCRegion, 1);
+  ALLOCATE (regions, SkyRegion, 1);
   strcpy (regions[0].filename, argv[1]);
-  regions[0].RA[0] = 0;
-  regions[0].RA[1] = 360;
-  regions[0].DEC[0] = -90;
-  regions[0].DEC[1] = +90;
+  regions[0].RAmin = 0;
+  regions[0].RAmax = 360;
+  regions[0].DECmin = -90;
+  regions[0].DECmax = +90;
 
   refcat = get2mass_AS_data (regions, &UserPatch, &Nrefcat);
@@ -50 +50 @@
 
   strcpy (accregion.filename, regions[0].filename);
-  accregion.RA[0]  = 360;
-  accregion.RA[1]  =   0;
-  accregion.DEC[0] = +90;
-  accregion.DEC[1] = -90;
+  accregion.RAmin  = 360;
+  accregion.RAmax  =   0;
+  accregion.DECmin = +90;
+  accregion.DECmax = -90;
 
   for (i = 0; i < Nrefcat; i++) {
-    accregion.RA[0]  = MIN (refcat[i].R, accregion.RA[0]);
-    accregion.RA[1]  = MAX (refcat[i].R, accregion.RA[1]);
-    accregion.DEC[0] = MIN (refcat[i].D, accregion.DEC[0]);
-    accregion.DEC[1] = MAX (refcat[i].D, accregion.DEC[1]);
+    accregion.RAmin  = MIN (refcat[i].R, accregion.RAmin);
+    accregion.RAmax  = MAX (refcat[i].R, accregion.RAmax);
+    accregion.DECmin = MIN (refcat[i].D, accregion.DECmin);
+    accregion.DECmax = MAX (refcat[i].D, accregion.DECmax);
   }
 
   fprintf (stderr, "%s %10.6f %10.6f  %10.6f %10.6f  %d\n", 
-           accregion.filename, accregion.RA[0]/15.0, accregion.RA[1]/15.0, accregion.DEC[0], accregion.DEC[1], Nrefcat);
+           accregion.filename, accregion.RAmin/15.0, accregion.RAmax/15.0, accregion.DECmin, accregion.DECmax, Nrefcat);
 
   exit (0);

trunk/Ohana/src/addstar/src/sort_lists.c

@@ -35 +35 @@
 }
 
-void sort_regions (GSCRegion *region, int N) {
+void sort_regions (SkyRegion *region, int N) {
 
   int l,j,ir,i;
-  GSCRegion tmp;
+  SkyRegion tmp;
   
   l = N >> 1;
@@ -57 +57 @@
     j = (l << 1) + 1;
     while (j <= ir) {
-      if (j < ir && region[j].DEC[0] < region[j+1].DEC[0]) j++;
-      if (tmp.DEC[0] < region[j].DEC[0]) {
+      if (j < ir && region[j].DECmin < region[j+1].DECmin) j++;
+      if (tmp.DECmin < region[j].DECmin) {
         region[i] = region[j];
         j += (i=j) + 1;