Changeset 38522 for branches/eam_branches/ipp-20150616/Ohana/src/addstar/src/LoadData.c

Timestamp:

Jun 23, 2015, 4:11:40 PM (11 years ago)

Author:

eugene

Message:

a bit of data structure re-org (load filenames into a structure)

File:

• branches/eam_branches/ipp-20150616/Ohana/src/addstar/src/LoadData.c (modified) (4 diffs)

branches/eam_branches/ipp-20150616/Ohana/src/addstar/src/LoadData.c

@@ -5 +5 @@
 
 // examine the header sets and set the Image entries for the the valid images
-int LoadData (FILE *f, char *file, Image **images, off_t *nvalid, Stars **stars, unsigned int *Nstars, Header **headers, off_t *extsize, HeaderSet *headerSets, int Nimages, AddstarClientOptions *options) {
+int LoadData (FILE *f, AddstarFile *file, Image **images, off_t *nvalid, Stars **stars, unsigned int *Nstars, Header **headers, off_t *extsize, HeaderSet *headerSets, int Nimages, AddstarClientOptions *options) {
 
-  char *name;
   off_t Nskip, Nvalid, NVALID;
   int i, j, Nhead, Ndata;
@@ -22 +21 @@
     REALLOCATE (images[0], Image, NVALID);
   }    
-
-  // find image rootname
-  if (USE_NAME) {
-      name = filebasename (USE_NAME);
-  } else {
-      name = filebasename (file);
-  }
 
   // if zero points are calculated for the full exposure using more than just the matched chip header,
@@ -58 +50 @@
     // XXX use something to set the chip name? EXTNAME?
     if (!strcmp(headerSets[i].exthead, "PHU") && (Nimages == 1)) {
-      snprintf (images[0][Nvalid].name, DVO_IMAGE_NAME_LEN, "%s", name);
+      snprintf (images[0][Nvalid].name, DVO_IMAGE_NAME_LEN, "%s", file->imagename);
     } else {
-      snprintf (images[0][Nvalid].name, DVO_IMAGE_NAME_LEN, "%s[%s]", name, headerSets[i].exthead);
+      snprintf (images[0][Nvalid].name, DVO_IMAGE_NAME_LEN, "%s[%s]", file->imagename, headerSets[i].exthead);
     }
 
@@ -117 +109 @@
       stars[0][i].measure.Map += OFFSET_ZPT;
     }
-
   }
 
-  free (name);
   *nvalid = Nvalid;
   return (TRUE);