Changeset 7683

Timestamp:

Jun 24, 2006, 1:08:05 PM (20 years ago)

Author:

eugene

Message:

updating 2MASS addstar tools

Location:

trunk/Ohana/src/addstar

Files:

• Makefile (modified) (6 diffs)
• include/2mass.h (modified) (2 diffs)
• include/addstar.h (modified) (1 diff)
• src/get2mass.c (modified) (6 diffs)
• src/get2mass_as.c (modified) (2 diffs)
• src/get2mass_as_raw.c (added)
• src/mkacc-2mass.c (modified) (1 diff)
• src/scan2mass.c (added)
• src/scan2mass_as_data.c (added)
• src/sort_lists.c (modified) (1 diff)

trunk/Ohana/src/addstar/Makefile

@@ -27 +27 @@
 $(SRC)/build_links.$(ARCH).o \
 $(SRC)/calibrate.$(ARCH).o \
-$(SRC)/check_permissions.$(ARCH).o \
 $(SRC)/ConfigInit.$(ARCH).o \
 $(SRC)/dump.$(ARCH).o \
@@ -39 +38 @@
 $(SRC)/get2mass.$(ARCH).o \
 $(SRC)/get2mass_as.$(ARCH).o \
+$(SRC)/get2mass_as_raw.$(ARCH).o \
 $(SRC)/get2mass_dr2.$(ARCH).o \
 $(SRC)/getgsc.$(ARCH).o \
@@ -78 +78 @@
 $(SRC)/mkacc-2mass.$(ARCH).o \
 $(SRC)/image-db.$(ARCH).o \
-$(SRC)/check_permissions.$(ARCH).o \
-$(SRC)/ConfigInit.$(ARCH).o \
-$(SRC)/SetSignals.$(ARCH).o \
-$(SRC)/conversions.$(ARCH).o \
+$(SRC)/ConfigInit.$(ARCH).o \
+$(SRC)/SetSignals.$(ARCH).o \
 $(SRC)/wimage.$(ARCH).o \
 $(SRC)/get2mass_as.$(ARCH).o
+
+SCAN-2MASS = \
+$(SRC)/scan2mass.$(ARCH).o \
+$(SRC)/scan2mass_as_data.$(ARCH).o \
+$(SRC)/get2mass_as.$(ARCH).o \
+$(SRC)/ConfigInit.$(ARCH).o \
+$(SRC)/Shutdown.$(ARCH).o \
+$(SRC)/SetSignals.$(ARCH).o
 
 EXTRA = \
@@ -132 +138 @@
 $(SRC)/Shutdown.$(ARCH).o \
 $(SRC)/edge_check.$(ARCH).o \
-$(SRC)/check_permissions.$(ARCH).o \
 $(SRC)/opening_angle.$(ARCH).o \
 $(SRC)/NewImage.$(ARCH).o \
@@ -180 +185 @@
 $(SRC)/Shutdown.$(ARCH).o \
 $(SRC)/edge_check.$(ARCH).o \
-$(SRC)/check_permissions.$(ARCH).o \
 $(SRC)/opening_angle.$(ARCH).o \
 $(SRC)/SkyTableFromTychoIndex.$(ARCH).o \
@@ -227 +231 @@
 mkacc-2mass.install        : $(DESTBIN)/mkacc-2mass
 
+scan2mass                : $(BIN)/scan2mass.$(ARCH)
+$(BIN)/scan2mass.$(ARCH) : $(SCAN-2MASS)
+scan2mass.install        : $(DESTBIN)/scan2mass
+
 all: addstar addstarc addstard addstart 
 

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

@@ -7 +7 @@
 } TM_Region;
 
+typedef struct {
+  double Rmin, Rmax, Dmin, Dmax;
+  int index[20];
+  int Nindex;
+} TMBands;
+
 short TM_J, TM_H, TM_K;
 
@@ -12 +18 @@
 Stars *get2mass_2DR_data (SkyRegion *region, char *filename, SkyRegion *patch, int photcode, int *nstars);
 Stars *get2mass_AS_data (SkyRegion *region, char *filename, SkyRegion *patch, int phocode, int *nstars);
+Stars *get2mass_AS_rawdata (SkyRegion *region, char *filename, SkyRegion *patch, int phocode, int *nstars);
+
+SkyTable *scan2mass_acc (char *path, char *accel);
+int scan2mass_as_data (char *filename);
+
+char *skipNbounds (char *line, char bound, int Nbound, int Nbyte);
+e_time get2mass_time (char *ptr, char *buffer, int Nbound, int Nbyte);

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

@@ -219 +219 @@
 int NewRefcat_Thread (int BindSocket);
 int NewReflist_Thread (int BindSocket);
+
+// this is a gnu extension?? caution!
+void *memrchr(const void *s, int c, size_t n);

trunk/Ohana/src/addstar/src/get2mass.c

@@ -5 +5 @@
   
   char *path;
-  int i, Nstars, Nrefcat; 
+  char gzname[1024];
+  int i, status, Nstars, Nrefcat; 
   Stars    *stars;
   Stars    *refcat;
   SkyTable *sky;
+  struct stat filestat;
 
   NAMED_PHOTCODE (TM_J, "2MASS_J");
@@ -22 +24 @@
   if (mode == 1) path = TWO_MASS_DIR_DR2;
 
+  // the accel.dat file has the raw filenames
+  // test if the file exists, or else try the .gz version
   sky = get2mass_acc (patch, path, "accel.dat");
   
@@ -32 +36 @@
       case 0:
         // XXX put filename from table here
-        refcat = get2mass_AS_data (&sky[0].regions[i], sky[0].filename[i], patch, photcode, &Nrefcat);
-        if (VERBOSE) fprintf (stderr, "loaded %d stars from 2MASS (allsky)\n", Nrefcat);
+        status = stat (sky[0].filename[i], &filestat);
+        if ((status == -1) && (errno == ENOENT)) {
+          sprintf (gzname, "%s.gz", sky[0].filename[i]);
+          refcat = get2mass_AS_data (&sky[0].regions[i], gzname, patch, photcode, &Nrefcat);
+        } else {
+          refcat = get2mass_AS_rawdata (&sky[0].regions[i], sky[0].filename[i], patch, photcode, &Nrefcat);
+        }
+        if (VERBOSE) fprintf (stderr, "loaded %d stars from 2MASS (allsky) : %s\n", Nrefcat, sky[0].filename[i]);
         break;
       case 1:
@@ -53 +63 @@
 }  
 
-/* watch for patch which cross 0,360 boundary */
+/* watch for patches which cross 0,360 boundary */
 SkyTable *get2mass_acc (SkyRegion *patch, char *path, char *accel) {
 
-  int Nregions, NREGIONS;
+  int Nregions, NREGIONS, Nrec;
   char accelfile[1024], line[256], filename[128], datafile[256], **filenames;
   FILE *f;
@@ -78 +88 @@
     if (line[0] == 0) continue;
     if (line[0] == '#') continue;
-    sscanf (line, "%s %lf %lf %lf %lf", filename, &Rs, &Re, &Ds, &De);
+    sscanf (line, "%s %lf %lf %lf %lf %d", filename, &Rs, &Re, &Ds, &De, &Nrec);
     Rs *= 15.0;
     Re *= 15.0;
@@ -89 +99 @@
     regions[Nregions].Dmin = Ds;
     regions[Nregions].Dmax = De;
+    regions[Nregions].childE = Nrec; // a cheat since 2MASS only has one depth
+    fprintf (stderr, "choosing: %10.6f - %10.6f, %10.6f - %10.6f\n", Rs, Re, Ds, De);
 
     sprintf (datafile, "%s/%s", path, filename);

trunk/Ohana/src/addstar/src/get2mass_as.c

@@ -8 +8 @@
 /* read in chunks of ~16MB */
 # define NBYTE 0x1000000
-
-char *skipNbounds (char *line, char bound, int Nbound, int Nbyte);
-void *memrchr(const void *s, int c, size_t n);
-e_time get2mass_time (char *ptr, char *buffer, int Nbound, int Nbyte);
 
 Stars *get2mass_AS_data (SkyRegion *region, char *filename, SkyRegion *patch, int photcode, int *nstars) {
@@ -61 +57 @@
   NSTARS = 10000;
   ALLOCATE (stars, Stars, NSTARS);
+
+  /* I want to add a seek-ahead test to find a good starting position in the file
+     this is very expensive using gzseek / gzread.  */
 
   Nextra = 0;

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

@@ -67 +67 @@
   exit (0);
 }
+
+/* XXX update this function to create an additional accelerator file for each 2mass file
+   each file: one row per DEC band
+   each row: Rmin, Rmax, Dmin, Dmax, Nbyte(i)
+   where Nbyte(i) = byte for each Rmin + i*30 deg transition
+*/

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

@@ -57 +57 @@
     j = (l << 1) + 1;
     while (j <= ir) {
-      if (j < ir && region[j].DECmin < region[j+1].DECmin) j++;
-      if (tmp.DECmin < region[j].DECmin) {
+      if (j < ir && region[j].Dmin < region[j+1].Dmin) j++;
+      if (tmp.Dmin < region[j].Dmin) {
         region[i] = region[j];
         j += (i=j) + 1;