Changeset 16973

Timestamp:

Mar 13, 2008, 8:47:58 AM (18 years ago)

Author:

eugene

Message:

add pmm mode

Location:

trunk/Ohana/src/addstar

Files:

• Makefile (modified) (2 diffs)
• include/addstar.h (modified) (2 diffs)
• src/LoadStars.c (modified) (1 diff)
• src/args.c (modified) (1 diff)

trunk/Ohana/src/addstar/Makefile

@@ -63 +63 @@
 $(SRC)/LoadData.$(ARCH).o \
 $(SRC)/LoadDataSDSS.$(ARCH).o \
+$(SRC)/LoadDataPMM.$(ARCH).o \
 $(SRC)/in_image.$(ARCH).o \
 $(SRC)/load_subpix.$(ARCH).o \
@@ -175 +176 @@
 $(SRC)/LoadData.$(ARCH).o \
 $(SRC)/LoadDataSDSS.$(ARCH).o \
+$(SRC)/LoadDataPMM.$(ARCH).o \
 $(SRC)/grefstars.$(ARCH).o \
 $(SRC)/load_subpix.$(ARCH).o \

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

@@ -74 +74 @@
 char   CameraLayout[256];
 SkyTable *ServerSky;
+char  *PMM_CCD_TABLE;
 
 /* used to select entries from header (gstars or parse_time) (KEEP) */
@@ -250 +251 @@
 int altaz (double *alt, double *az, double ha, double dec, double latitude);
 
+int LoadDataPMM (FILE *f, char *file, Image **images, int *nvalid, Stars **stars, int *Nstars);
+PhotCode *LoadMetadataPMM (char *datafile, Image *image);
+time_t pmm_date_to_sec (char *date, char *time);
+double pmm_get_ra (char *RA);
+double pmm_get_dec (char *DEC);
+PhotCode *pmm_get_photcode (char *emulsion, char *filter);
+
 // this is a gnu extension?? caution!
 void *memrchr(const void *s, int c, size_t n);

trunk/Ohana/src/addstar/src/LoadStars.c

@@ -63 +63 @@
     }
 
+    if (PMM_CCD_TABLE != NULL) {
+      LoadDataPMM (f, file[i], images, Nimages, &stars, Nstars);
+      continue;
+    }
+
     headers = LoadHeaders (f, &mode, &Nheaders);
     headerSets = MatchHeaders (&extsize, &NheaderSets, mode, headers, Nheaders);

trunk/Ohana/src/addstar/src/args.c

@@ -43 +43 @@
   if ((N = get_argument (argc, argv, "-list"))) {
     options.filelist = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+
+  PMM_CCD_TABLE = NULL;
+  if ((N = get_argument (argc, argv, "-pmm"))) {
+    remove_argument (N, &argc, argv);
+    PMM_CCD_TABLE = strcreate (argv[N]);
     remove_argument (N, &argc, argv);
   }