Changeset 37803 for branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/loadwise_rawdata.c

Timestamp:

Jan 11, 2015, 2:02:45 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20140904/Ohana

Files:

• . (modified) (1 prop)
• src/addstar/src/loadwise_rawdata.c (modified) (2 diffs)

branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/loadwise_rawdata.c

@@ -10 +10 @@
 # define DEBUG 0
 
-int loadwise_rawdata (SkyList *skytable, char *filename, AddstarClientOptions options, int ALLSKY) {
+int loadwise_rawdata (SkyList *skytable, char *filename, AddstarClientOptions options) {
   
   int i, j, verbose;
@@ -159 +159 @@
         stars[Nstars+3][0].average.D = tstars[j].D;
         
-        if (ALLSKY) {
-          loadwise_star_allsky (&stars[Nstars], &buffer[offset], Nbyte - offset);
-        } else {
-          loadwise_star_prelim (&stars[Nstars], &buffer[offset], Nbyte - offset);
+        switch (MODE) {
+          case MODE_PRELIM:
+            loadwise_star_prelim (&stars[Nstars], &buffer[offset], Nbyte - offset);
+            break;
+          case MODE_ALLSKY:
+            loadwise_star_allsky (&stars[Nstars], &buffer[offset], Nbyte - offset);
+            break;
+          case MODE_ALLWISE:
+          default:
+            // loadwise_star_allwise (&stars[Nstars], &buffer[offset], Nbyte - offset);
+            break;
         }