Changeset 23942

Timestamp:

Apr 21, 2009, 2:02:28 AM (17 years ago)

Author:

Sebastian Jester

Message:

Initial version that skips objects that are not OK_RUN - untested

File:

• branches/sj_branches/sj_SDSSaddstar_branch_r23928_20090420/Ohana/src/addstar/src/ReadStarsSDSS.c (modified) (6 diffs)

branches/sj_branches/sj_SDSSaddstar_branch_r23928_20090420/Ohana/src/addstar/src/ReadStarsSDSS.c

@@ -4 +4 @@
 
 # define NFILTER 5
+# define AR_OBJECT_STATUS_OK_RUN 0x10
 # define dCOS(A)   ((double) cos ((double)RAD_DEG*A))
 # define dSIN(A)   ((double) sin ((double)RAD_DEG*A))
@@ -33 +34 @@
 Stars *ReadStarsSDSS (FILE *f, char *name, Header *header, Header *in_theader, Image *images, int *nimages, unsigned int *nstars) {
 
-  int i, j, N, Nskip, Nstars, camcol;
+  int i, j, N, Nskip, Nstars, Nstars_used, camcol;
   char type[80];
   Header theader;
@@ -146 +147 @@
   // compensate for the difference.
 
+  Nstars_used = Nstars;
   for (i = 0; i < Nstars; i++) {
+    // Skip objects that are not OK_RUN
+    if ( ((status[i]) & AR_OBJECT_STATUS_OK_RUN) != 0) {
+      Nstars_used--;
+      continue;
+    }
     for (j = 0; j < NFILTER; j++) {
       N = NFILTER*i + j;
@@ -199 +206 @@
   }
 
+  // Throw away unneeded trailing (I hope) part of Stars
+  REALLOCATE (stars, Stars, NFILTER*Nstars_used);
+
   for (i = 0; i < NFILTER; i++) {
 
@@ -292 +302 @@
     images[N].flags = 0;
 
-    images[N].nstar = Nstars;
+    images[N].nstar = Nstars_used;
 
     images[N].imageID = N;
@@ -303 +313 @@
 
   *nimages += NFILTER;
-  *nstars = Nstars*NFILTER;
+  *nstars = Nstars_used*NFILTER;
   return (stars);
 }