Changeset 38539

Timestamp:

Jun 24, 2015, 5:32:30 PM (11 years ago)

Author:

eugene

Message:

fix the load-from-list bit

Location:

branches/eam_branches/ipp-20150616/Ohana/src/addstar

Files:

• Makefile (modified) (1 diff)
• src/LoadFilenames.c (modified) (3 diffs)
• src/loadgalphot_readstars.c (modified) (1 diff)

branches/eam_branches/ipp-20150616/Ohana/src/addstar/Makefile

@@ -37 +37 @@
 mkcmf        : $(BIN)/mkcmf.$(ARCH)
 
-all: addstar addstar_client sedstar load2mass loadgalphot loadstarpar loadstarpar_client loadICRF loadICRF_client skycells mkcmf loadwise loadtycho loadsupercos dumpskycells findskycell
-
-INSTALL = addstar addstar_client sedstar load2mass loadgalphot loadstarpar loadstarpar_client loadICRF loadICRF_client skycells mkcmf loadwise loadtycho loadsupercos dumpskycells findskycell
+all: addstar addstar_client sedstar load2mass loadstarpar loadstarpar_client loadICRF loadICRF_client skycells mkcmf loadwise loadtycho loadsupercos dumpskycells findskycell
+
+INSTALL = addstar addstar_client sedstar load2mass loadstarpar loadstarpar_client loadICRF loadICRF_client skycells mkcmf loadwise loadtycho loadsupercos dumpskycells findskycell
 
 # I need to fix the client/server version of addstar now that I have dropped Stars

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

@@ -3 +3 @@
 AddstarFile *LoadFilenames (int *nfile, char *filename, AddstarClientOptions *options) {
 
-  int i, Nfile, NFILE;
+  int i, n, Nfile, NFILE;
   glob_t globList;
   AddstarFile *file;
@@ -16 +16 @@
     }
 
+    Nfile = 0;
     NFILE = 10;
     ALLOCATE (file, AddstarFile, NFILE);
     for (i = 0; (scan_line (f, line) != EOF); i++) {
       // find first non-whitespace char & skip commented lines
-      for (i = 0; OHANA_WHITESPACE (line[i]); i++);
-      if (line[i] == '#') continue;
-      if (line[i] == 0) continue;
+      for (n = 0; OHANA_WHITESPACE (line[n]); n++);
+      if (line[n] == '#') continue;
+      if (line[n] == 0) continue;
 
       // file lines may have:
@@ -39 +40 @@
           exit (3);
         }
-        file[i].filename  = strcreate (word1);
-        file[i].imagename = filebasename (word2);
+        file[Nfile].filename  = strcreate (word1);
+        file[Nfile].imagename = filebasename (word2);
       } else {
-        file[i].filename  = strcreate (word1);
-        file[i].imagename = filebasename (word1);
+        file[Nfile].filename  = strcreate (word1);
+        file[Nfile].imagename = filebasename (word1);
       }
-      CHECK_REALLOCATE (file, AddstarFile, NFILE, i, 10);
+      ohana_memcheck (TRUE);
+      fprintf (stderr, "file: %s = %s\n", file[Nfile].filename, file[Nfile].imagename);
+      Nfile ++;
+      CHECK_REALLOCATE (file, AddstarFile, NFILE, Nfile, 10);
     }
     fclose (f);
-    Nfile = i;
   } else {
     // parse the filename as a glob

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

@@ -280 +280 @@
   // validate the square dimensions??
 
-  int Nx = nearbyint((MajorMax - MajorMin) / MajorDel) + 1;
-  int Ny = nearbyint((MinorMax - MinorMin) / MinorDel) + 1;
+  // int Nx = nearbyint((MajorMax - MajorMin) / MajorDel) + 1;
+  // int Ny = nearbyint((MinorMax - MinorMin) / MinorDel) + 1;
+
+  int Nx = lrint((MajorMax - MajorMin) / MajorDel) + 1;
+  int Ny = lrint((MinorMax - MinorMin) / MinorDel) + 1;
+
   myAssert (Nx*Ny == Npts, "inconsistent grid");