Changeset 33719

Timestamp:

Apr 5, 2012, 11:27:08 AM (14 years ago)

Author:

bills

Message:

add program dumpskycells which lists the celestial and galactic coordinates of the center
of each skycell in degrees

Location:

trunk/Ohana/src/addstar

Files:

• Makefile (modified) (4 diffs)
• include/skycells.h (modified) (2 diffs)
• src/ConfigInit_skycells.c (modified) (1 diff)
• src/dumpskycells.c (added)
• src/sky_tessalation.c (modified) (2 diffs)
• src/skycells_to_mdc.c (added)

trunk/Ohana/src/addstar/Makefile

@@ -29 +29 @@
 mkcmf       : $(BIN)/mkcmf.$(ARCH)
 
-all: addstar sedstar load2mass skycells mkcmf loadwise loadsupercos
-
-INSTALL = addstar sedstar load2mass skycells mkcmf loadwise loadsupercos
+all: addstar sedstar load2mass skycells mkcmf loadwise loadsupercos dumpskycells
+
+INSTALL = addstar sedstar load2mass skycells mkcmf loadwise loadsupercos dumpskycells
 
 # I need to fix the client/server version of addstar now that I have dropped Stars
@@ -275 +275 @@
 $(SRC)/sky_tessalation.$(ARCH).o
 
+DUMPSKYCELLS = \
+$(SRC)/dumpskycells.$(ARCH).o \
+$(SRC)/skycells_to_mdc.$(ARCH).o \
+$(SRC)/ConfigInit_skycells.$(ARCH).o \
+$(SRC)/Shutdown.$(ARCH).o \
+$(SRC)/SetSignals.$(ARCH).o \
+
 $(ADDSTARC)   : $(INC)/addstar.h
 $(ADDSTARD)   : $(INC)/addstar.h
@@ -280 +287 @@
 $(ADDSTAR)    : $(INC)/addstar.h
 $(SKYCELLS)   : $(INC)/addstar.h
+$(DUMPSKYCELLS): $(INC)/addstar.h
 $(LOAD-2MASS) : $(INC)/addstar.h $(INC)/2mass.h
 $(LOAD-WISE)  : $(INC)/addstar.h $(INC)/WISE.h
@@ -294 +302 @@
 $(BIN)/loadsupercos.$(ARCH): $(LOAD-SUPERCOS)
 $(BIN)/skycells.$(ARCH)    : $(SKYCELLS)
+$(BIN)/dumpskycells.$(ARCH) : $(DUMPSKYCELLS)
 $(BIN)/mkcmf.$(ARCH)       : $(MKCMF)
 

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

@@ -71 +71 @@
 int    LEVEL;
 char   PROJECTION_NUMBER[8];
+char   *SKYCELLS_MDC;
+int    READONLY;
 
 double CENTER_RA, CENTER_DEC;
@@ -109 +111 @@
 Point        sky_divide_edge                PROTO((Point v1, Point v2));
 
+void         skycells_to_mdc                PROTO((FILE *output, int simple, char *tess_id, FITS_DB *db)); 
+
 // XXX migrate to libdvo eventually
 int dvo_image_clear_vtable             PROTO((FITS_DB *db));
+

trunk/Ohana/src/addstar/src/ConfigInit_skycells.c

@@ -55 +55 @@
   /* XXX this does not yet write out the master photcode table */
   sprintf (CatdirPhotcodeFile, "%s/Photcodes.dat", CATDIR);
-  if (!LoadPhotcodes (CatdirPhotcodeFile, MasterPhotcodeFile, TRUE)) {
+  if (!LoadPhotcodes (CatdirPhotcodeFile, MasterPhotcodeFile, !READONLY)) {
     fprintf (stderr, "error loading photcode table %s or master file %s\n", CatdirPhotcodeFile, MasterPhotcodeFile);
     exit (1);

trunk/Ohana/src/addstar/src/sky_tessalation.c

@@ -266 +266 @@
     if (!ring) continue;
 
+
     // subdivide each image (Nx x Ny subcells)
     Nimage = NX_SUB*NY_SUB*Nring;
@@ -272 +273 @@
       // convert the SkyRectangles to Images for output
       sky_subdivide_image (&image[j*NX_SUB*NY_SUB], &ring[j], NX_SUB, NY_SUB);
+      printf("%s %8.2f %8.2f\n", ring[j].name, ring[j].coords.crval1, ring[j].coords.crval2);
     }