Changeset 3400

Timestamp:

Mar 9, 2005, 9:20:18 PM (21 years ago)

Author:

eugene

Message:

working to mosaic astrom

Location:

trunk/Ohana

Files:

• Makefile (modified) (4 diffs)
• src/addstar/include/addstar.h (modified) (1 diff)
• src/addstar/src/RegionOps.c (modified) (1 diff)
• src/addstar/src/get2mass.c (modified) (3 diffs)
• src/addstar/src/getgsc.c (modified) (1 diff)
• src/addstar/src/greference.c (modified) (1 diff)
• src/elixir/src/MachineOps.c (modified) (1 diff)
• src/libfits/header/F_modify.c (modified) (1 diff)
• src/libfits/include/fits.h (modified) (2 diffs)
• src/libfits/table/F_get_column.c (modified) (1 diff)
• src/libfits/table/F_table_format.c (modified) (2 diffs)
• src/libohana/include/loneos.h (modified) (1 diff)
• src/libohana/include/ohana.h (modified) (2 diffs)

trunk/Ohana/Makefile

@@ -28 +28 @@
 # directory may be compiled by going to those directories. 
 PROGRAM =   \
-addrefs     \
-addspphot   \
 addstar     \
 delstar     \
@@ -42 +40 @@
 kii         \
 misc        \
-mosastro.v2 \
+mosastro.v3 \
 nightd      \
 opihi.v2    \
@@ -56 +54 @@
 opihi.v1    \
 addusno     \
+addrefs     \
+addspphot   \
 fixcat      \
 getstar     \
@@ -63 +63 @@
 markstar    \
 mosastro.v1 \
+mosastro.v2 \
 skycalc     
 

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

@@ -161 +161 @@
 int FindRegionDecBandStart (GSCRegion *region, int Nregion, double dec);
 int FindRegionDecBandStop (GSCRegion *region, int Nregion, double dec);
+int FindDecBand (double dec, double *DEC0, double *DEC1);
+
 int hms_to_deg (double *h0, double *h1, double *d0, double *d1, char *string);
 void find_matches_refstars (GSCRegion *region, Stars **stars, int Nstars, Catalog *catalog);

trunk/Ohana/src/addstar/src/RegionOps.c

@@ -21 +21 @@
 GSCRegion *LoadRegions (int *nregions) {
   
-  int Nregions, i, N, NDec, Nx, Ny;
-  char buffer[28800], temp[50], file[256];
+  int Nregions, i, NDec, Nx, Ny;
+  char temp[50], file[256];
   double RA0, RA1, DEC0, DEC1, D0, D1;
   FILE *f;

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

@@ -5 +5 @@
 Stars *get2mass (GSCRegion *patch, int *NSTARS) {
   
-  int i, j, k, Ns, Nstars, Nrefcat, Nregions; 
+  int i, Nstars, Nrefcat, Nregions; 
   Stars     *stars;
   Stars     *refcat;
@@ -84 +84 @@
 Stars *get2mass_data (TM_Region *region, GSCRegion *patch, int *nstars) {
   
-  int i, Nstars, NSTARS, Nbyte, Nline, Nval;
+  int i, Nstars, NSTARS, Nbyte, Nline;
   Stars *stars;
   gzFile gf;
-  char *filename, buffer[NLINE*NBYTE], datestr[64];
+  char *filename, buffer[NLINE*NBYTE];
   double RA, DEC, J, H, K, dJ, dH, dK;
-  e_time time;
   double RA0, RA1, DEC0, DEC1;
 
@@ -170 +169 @@
 }
 
-/*
-      Nval  = sscanf (&buffer[NBYTE*i +          0], "%lf %lf", &RA, &DEC);
-      Nval += sscanf (&buffer[NBYTE*i +         53], "%lf %lf", &J, &dJ);
-      Nval += sscanf (&buffer[NBYTE*i +         72], "%lf %lf", &H, &dH);
-      Nval += sscanf (&buffer[NBYTE*i +         91], "%lf %lf", &K, &dK);
-      Nval += sscanf (&buffer[NBYTE*i + 164], "%s", datestr);
-*/
-
     /* 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

trunk/Ohana/src/addstar/src/getgsc.c

@@ -8 +8 @@
 Stars *getgsc (GSCRegion *patch, int *NSTARS) {
   
-  int i, j, k, Ns, Ngsc, Nregions, Nstars; 
+  int i, Ngsc, Nregions, Nstars; 
   Stars *gsc;
   Stars *stars;

trunk/Ohana/src/addstar/src/greference.c

@@ -10 +10 @@
 
   Nstars = 0;
+  stars = NULL;
 
   /* get stars from USNO for the given region */

trunk/Ohana/src/elixir/src/MachineOps.c

@@ -447 +447 @@
   double dt;
 
+  fd = 0;
   if (filename == (char *) NULL) {
     system ("tput clear");

trunk/Ohana/src/libfits/header/F_modify.c

@@ -102 +102 @@
 char *fits_keyword_start (char *line) {
 
-  int done;
   char *c;
 

trunk/Ohana/src/libfits/include/fits.h

@@ -32 +32 @@
   X = (T *) malloc ((unsigned)(MAX(((S)*((int)sizeof(T))),1))); \
   if (X == NULL) { \
-    fprintf(stderr,"failed malloc at %s in %s\n", __LINE__, __FILE__);\
+    fprintf(stderr,"failed malloc at %d in %s\n", __LINE__, __FILE__);\
     exit (10); } 
 # define REALLOCATE(X,T,S) \
   X = (T *) realloc(X,(unsigned)(MAX(((S)*((int)sizeof(T))),1))); \
   if (X == NULL) { \
-    fprintf(stderr,"failed realloc at %s in %s\n", __LINE__, __FILE__);\
+    fprintf(stderr,"failed realloc at %d in %s\n", __LINE__, __FILE__);\
     exit (10); }
 # define CHECK_REALLOCATE(X,T,S,N,D) \
@@ -44 +44 @@
     X = (T *) realloc(X,(unsigned)(MAX(((S)*((int)sizeof(T))),1))); \
     if (X == NULL) { \
-      fprintf(stderr,"failed realloc increment at %s in %s\n", __LINE__, __FILE__);\
+      fprintf(stderr,"failed realloc increment at %d in %s\n", __LINE__, __FILE__);\
       exit (10); } }
 # endif /* ALLOCATE */

trunk/Ohana/src/libfits/table/F_get_column.c

@@ -197 +197 @@
   if (label == (char *) NULL) return (FALSE);
   if (label[0] == 0) return (FALSE);
+  array = NULL;
 
   /* find label in header */

trunk/Ohana/src/libfits/table/F_table_format.c

@@ -54 +54 @@
 int fits_table_format (char *format, char *type, int *Nval, int *Nbytes) {
 
-  char Fchar, foo[80], bar;
+  char Fchar, Size[80], Type;
   int Nv;
 
@@ -64 +64 @@
   if (Nv == 0) { 
     Nv = 1;
-    strcpy (foo, "1");
+    strcpy (Size, "1");
   } else {
-    strcpy (foo, &format[1]);
+    strcpy (Size, &format[1]);
   }
-
-  if (Fchar == 'F') { *Nbytes = 1;  strcpy (type, "float");  bar = 'f'; *Nval = Nv; }
-  if (Fchar == 'I') { *Nbytes = 1;  strcpy (type, "int");    bar = 'd'; *Nval = Nv; }
-  if (Fchar == 'A') { *Nbytes = 1;  strcpy (type, "char");   bar = 's'; *Nval = Nv; }
+  
+  Type = 'x';
+  if (Fchar == 'F') { *Nbytes = 1;  strcpy (type, "float");  Type = 'f'; *Nval = Nv; }
+  if (Fchar == 'I') { *Nbytes = 1;  strcpy (type, "int");    Type = 'd'; *Nval = Nv; }
+  if (Fchar == 'A') { *Nbytes = 1;  strcpy (type, "char");   Type = 's'; *Nval = Nv; }
   if (!*Nbytes) { return (FALSE); }
   
-  sprintf (format, "%%-%s%c", foo, bar);
+  sprintf (format, "%%-%s%c", Size, Type);
 
   return (TRUE);

trunk/Ohana/src/libohana/include/loneos.h

@@ -414 +414 @@
 void coords_precess (double *ra, double *dec, double in_epoch, double out_epoch);
 
+int FindMosaicForImage (Image *images, int Nimages, int entry);
+int FindMosaicForImage_TableSearch (Image *images, int Nimages, int entry);
+int FindMosaicForImage_MatchSearch (Image *images, int Nimages, int entry);
+int BuildChipMatch (Image *images, int Nimages);
+
 short int putMi (double value);
 double getMi (short int value);

trunk/Ohana/src/libohana/include/ohana.h

@@ -78 +78 @@
   X = (T *) malloc ((unsigned)(MAX(((S)*((int)sizeof(T))),1))); \
   if (X == NULL) { \
-    fprintf(stderr,"failed malloc at %s in %s\n", __LINE__, __FILE__);\
+    fprintf(stderr,"failed malloc at %d in %s\n", __LINE__, __FILE__);\
     exit (10); } 
 # define REALLOCATE(X,T,S) \
   X = (T *) realloc(X,(unsigned)(MAX(((S)*((int)sizeof(T))),1))); \
   if (X == NULL) { \
-    fprintf(stderr,"failed realloc at %s in %s\n", __LINE__, __FILE__);\
+    fprintf(stderr,"failed realloc at %d in %s\n", __LINE__, __FILE__);\
     exit (10); }
 # define CHECK_REALLOCATE(X,T,S,N,D) \
@@ -90 +90 @@
     X = (T *) realloc(X,(unsigned)(MAX(((S)*((int)sizeof(T))),1))); \
     if (X == NULL) { \
-      fprintf(stderr,"failed realloc increment at %s in %s\n", __LINE__, __FILE__);\
+      fprintf(stderr,"failed realloc increment at %d in %s\n", __LINE__, __FILE__);\
       exit (10); } }
 # endif /* ALLOCATE */