Changeset 38467 for trunk/Ohana/src/addstar/src/loadwise_rawdata.c

Timestamp:

Jun 12, 2015, 10:29:47 PM (11 years ago)

Author:

eugene

Message:

merge changes from EAM branch ipp-20150419

File:

• trunk/Ohana/src/addstar/src/loadwise_rawdata.c (modified) (2 diffs)

trunk/Ohana/src/addstar/src/loadwise_rawdata.c

@@ -12 +12 @@
 int loadwise_rawdata (SkyList *skytable, char *filename, AddstarClientOptions options) {
   
-  int i, j, verbose;
+  int i, j, k, verbose;
   int Nstars, NSTARS, Ntstars, NTSTARS;
   int Nbyte, Nextra, offset;
@@ -140 +140 @@
         offset = tstars[j].offset;
 
-        ALLOCATE (stars[Nstars+0], Stars, 1);
-        ALLOCATE (stars[Nstars+1], Stars, 1);
-        ALLOCATE (stars[Nstars+2], Stars, 1);
-        ALLOCATE (stars[Nstars+3], Stars, 1);
-
-        InitStar (stars[Nstars+0]);
-        InitStar (stars[Nstars+1]);
-        InitStar (stars[Nstars+2]);
-        InitStar (stars[Nstars+3]);
-
-        stars[Nstars+0][0].average.R = tstars[j].R;
-        stars[Nstars+0][0].average.D = tstars[j].D;
-        stars[Nstars+1][0].average.R = tstars[j].R;
-        stars[Nstars+1][0].average.D = tstars[j].D;
-        stars[Nstars+2][0].average.R = tstars[j].R;
-        stars[Nstars+2][0].average.D = tstars[j].D;
-        stars[Nstars+3][0].average.R = tstars[j].R;
-        stars[Nstars+3][0].average.D = tstars[j].D;
+        for (k = 0; k < 4; k++) {
+          ALLOCATE (stars[Nstars + k], Stars, 1);
+          InitStar (stars[Nstars + k]);
+          stars[Nstars+k][0].average.R = tstars[j].R;
+          stars[Nstars+k][0].average.D = tstars[j].D;
+          stars[Nstars+k][0].measure.R = tstars[j].R;
+          stars[Nstars+k][0].measure.D = tstars[j].D;
+        }         
         
         switch (MODE) {