Changeset 26286

Timestamp:

Nov 27, 2009, 1:09:42 PM (16 years ago)

Author:

eugene

Message:

pass command-line photcode to LoadData

Location:

trunk/Ohana/src/addstar

Files:

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

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

@@ -191 +191 @@
 Header   **LoadHeaders            PROTO((FILE *f, int *mode, int *Nheader));
 HeaderSet *MatchHeaders           PROTO((int **extsize, int *nimage, int mode, Header **headers, int Nheaders));
-int        LoadData               PROTO((FILE *f, char *file, Image **images, int *nvalid, Stars **stars, int *Nstars, Header **headers, int *extsize, HeaderSet *headerSets, int NheaderSets));
+int        LoadData               PROTO((FILE *f, char *file, Image **images, int *nvalid, Stars **stars, int *Nstars, Header **headers, int *extsize, HeaderSet *headerSets, int NheaderSets, AddstarClientOptions *options));
 int        GetZeroPointExposure   PROTO((Header **headers, HeaderSet *headerSets, int Nimages));
 

trunk/Ohana/src/addstar/src/LoadData.c

@@ -6 +6 @@
 
 // examine the header sets and set the Image entries for the the valid images
-int LoadData (FILE *f, char *file, Image **images, int *nvalid, Stars **stars, int *Nstars, Header **headers, int *extsize, HeaderSet *headerSets, int Nimages) {
+int LoadData (FILE *f, char *file, Image **images, int *nvalid, Stars **stars, int *Nstars, Header **headers, int *extsize, HeaderSet *headerSets, int Nimages, AddstarClientOptions *options) {
 
   char *name;
@@ -38 +38 @@
 
     if (VERBOSE) fprintf (stderr, "reading header for %s (%s)\n", headerSets[i].exthead, headerSets[i].extdata);
-    if (!ReadImageHeader (headers[Nhead], &images[0][Nvalid], 0)) {
+    if (!ReadImageHeader (headers[Nhead], &images[0][Nvalid], options[0].photcode)) {
       fprintf (stderr, "skipping %s\n", headerSets[i].exthead);
       continue;

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

@@ -94 +94 @@
     }
 
-    LoadData (f, file[i], images, Nimages, &stars, Nstars, headers, extsize, headerSets, NheaderSets);
+    LoadData (f, file[i], images, Nimages, &stars, Nstars, headers, extsize, headerSets, NheaderSets, options);
 
     // XXX add a function to (optionally) load the extended source measurements