Changeset 26711

Timestamp:

Jan 28, 2010, 4:42:14 PM (16 years ago)

Author:

eugene

Message:

updates from the trunk

Location:

branches/eam_branches/20091201/Ohana/src/addstar

Files:

• Makefile (modified) (4 diffs)
• include/addstar.h (modified) (1 diff)
• src/FilterStars.c (modified) (2 diffs)
• src/LoadData.c (modified) (2 diffs)
• src/PSPS_IDs.c (deleted)
• src/ReadImageHeader.c (modified) (2 diffs)
• src/UpdateImageIDs.c (modified) (1 diff)
• src/build_links.c (modified) (5 diffs)
• src/find_matches.c (modified) (1 diff)
• src/find_matches_closest.c (modified) (1 diff)
• src/find_matches_closest_refstars.c (modified) (1 diff)
• src/find_matches_refstars.c (modified) (2 diffs)
• src/psps_ids.c (copied) (copied from trunk/Ohana/src/addstar/src/psps_ids.c )

branches/eam_branches/20091201/Ohana/src/addstar/Makefile

@@ -81 +81 @@
 $(SRC)/ReadImageHeader.$(ARCH).o \
 $(SRC)/UpdateImageIDs.$(ARCH).o \
-$(SRC)/update_coords.$(ARCH).o
+$(SRC)/update_coords.$(ARCH).o \
+$(SRC)/psps_ids.$(ARCH).o
 
 ADDSTARD = \
@@ -118 +119 @@
 $(SRC)/opening_angle.$(ARCH).o \
 $(SRC)/replace_match.$(ARCH).o \
-$(SRC)/update_coords.$(ARCH).o
+$(SRC)/update_coords.$(ARCH).o \
+$(SRC)/psps_ids.$(ARCH).o
 
 ADDSTART = \
@@ -157 +159 @@
 $(SRC)/NewImage_Thread.$(ARCH).o \
 $(SRC)/NewReflist_Thread.$(ARCH).o \
-$(SRC)/NewRefcat_Thread.$(ARCH).o 
+$(SRC)/NewRefcat_Thread.$(ARCH).o \
+$(SRC)/psps_ids.$(ARCH).o
 
 ADDSTARC = \
@@ -206 +209 @@
 $(SRC)/ConfigInit.$(ARCH).o \
 $(SRC)/Shutdown.$(ARCH).o \
-$(SRC)/SetSignals.$(ARCH).o
+$(SRC)/SetSignals.$(ARCH).o \
+$(SRC)/psps_ids.$(ARCH).o
 
 SEDSTAR = \

branches/eam_branches/20091201/Ohana/src/addstar/include/addstar.h

@@ -289 +289 @@
 PhotCode *pmm_get_photcode (char *emulsion, char *filter);
 
+#define PSPS_ID TRUE
+uint64_t CreatePSPSDetectionID(double tobs, int ccdid, int detID);
+uint64_t CreatePSPSObjectID(double ra, double dec);
+
 // this is a gnu extension?? caution!
 void *memrchr(const void *s, int c, size_t n);

branches/eam_branches/20091201/Ohana/src/addstar/src/FilterStars.c

@@ -1 +1 @@
 # include "addstar.h"
-# define EXTERNAL_ID FALSE
+# define EXTERNAL_ID TRUE
 
 /* exclude some detections based on various filter options:
@@ -88 +88 @@
     }
 
-# if (0) 
     if (PSPS_ID) {
       double mjd;
       mjd = ohana_sec_to_mjd (image[0].tzero);
-      // XXX this is clearly wrong : what does PSPS want?
-      stars[N].measure.extID = PSPS_create_detectid (mjd, imageID);
+      stars[N].measure.extID = CreatePSPSDetectionID(mjd, image[0].ccdnum, stars[N].measure.detID);
+    } else {
+      stars[N].measure.extID = 0;
     }
-# endif
 
-    stars[N].measure.imageID = imageID; // this value is update in UpdateImageIDs
+    stars[N].measure.imageID = imageID; // this value is updated in UpdateImageIDs
 
     N ++;

branches/eam_branches/20091201/Ohana/src/addstar/src/LoadData.c

@@ -10 +10 @@
   char *name;
   int i, j, Nvalid, Nhead, Ndata, Nskip;
+  uint32_t parentID = UINT32_MAX;
   Stars *inStars;
 
@@ -58 +59 @@
     // skip the table if there is no data segment (eg, mosaic WRP image)
     if (!strcmp(headerSets[i].extdata, "NONE")) {
+      if (!strcmp(headerSets[i].exthead, "PHU") && (Nimages > 1)) {
+        // This image is the parent of subsequent images
+        parentID = Nvalid;
+        images[0][Nvalid].parentID = UINT32_MAX;
+      }
       Nvalid++;
       CHECK_REALLOCATE (images[0], Image, NVALID, Nvalid, 10);
       continue;
     }
+    images[0][Nvalid].parentID = parentID;
 
     // advance the pointer to the start of the corresponding table block

branches/eam_branches/20091201/Ohana/src/addstar/src/ReadImageHeader.c

@@ -5 +5 @@
 int ReadImageHeader (Header *header, Image *image, int photcode) {
 
-  int Nastro, ccdnum, hour, min, Nx, Ny, haveNx, haveNy, sourceID;
+  int Nastro, hour, min, Nx, Ny, haveNx, haveNy, sourceID;
   double tmp, sec, Cerror, ZeroPt, FWHM_X, FWHM_Y;
-  char *c, photname[64], line[80];
+  char *c, photname[64], line[80], ccdnum[64];
   PhotCode *photcodeData = NULL;
 
@@ -174 +174 @@
   } 
 
-  if (!gfits_scan (header, CCDNumKeyword, "%d", 1, &ccdnum)) {
-    image[0].ccdnum = 0xff;
-  } else {
-    image[0].ccdnum = ccdnum;
+  if (!gfits_scan (header, CCDNumKeyword, "%s", 1, ccdnum)) {
+    fprintf (stderr, "CCDNumKeyword %s not found\n", CCDNumKeyword);
+    return FALSE;
+  } else {
+    // CCDNumKeyword (EXTNAME) is a string yet we need an integer
+    // RULE: ccdnum is the value of the first string of digits in CCDNumKeyword
+    // For example: ccdnum(XY42.hdr) = 42, ccdnum(XY01.hdr) = 1
+    char *p = ccdnum;
+    // get rid of any leading non-digit characters
+    while (*p && !isdigit(*p)) p++;
+    if (*p == 0) {
+      fprintf (stderr, "invalid ccdnum %s\n", ccdnum);
+      return FALSE;
+    }
+    image[0].ccdnum = atoi(p);
   }
 

branches/eam_branches/20091201/Ohana/src/addstar/src/UpdateImageIDs.c

@@ -40 +40 @@
   for (i = 0; i < Nimages; i++) {
     images[i].imageID += imageID;
+    if (images[i].parentID == UINT32_MAX) {
+        images[i].parentID = 0;
+    } else {
+        images[i].parentID += imageID;
+    }
   }
 

branches/eam_branches/20091201/Ohana/src/addstar/src/build_links.c

@@ -1 +1 @@
 # include "addstar.h"
+
+/* 
+
+There are two modes for the measure table: sorted and unsorted. 
+
+In sorted mode, all measures associated with a given average are in a single block.  The block
+is pointed to by average->measureOffset and the range is average->Nmeasure
+
+In unsorted mode, it is not possible to go directly from average to measure without scanning.
+In this case, it is necessary to use the value measure->averef to find the corresponding
+average entry.  
+
+Note that average->measureOffset and measure->averef are only valid for a given load of the
+data: they refer to the sequence number in the data blocks.
+
+next_meas is a list of the equivalent sequence of the measure block as if it were sorted.
+
+to find the sequence of measurements for a given average:
+n_0 = average->measureOffset
+n_1 = next_meas[n_0]
+n_i = next_meas[n_i-1]
+
+*/
 
 /* build the initial links assuming the table is sorted, 
@@ -31 +54 @@
 }
 
+/* construct measure links which are valid FOR THIS LOAD
+ * - if we have a full load, we will get links which can
+ *   be used by other programs (eg, relphot, etc)
+ * - if we have a partial load, the links are only valid
+ *   for that partial load
+ */ 
+
+int *build_measure_links (Average *average, int Naverage, Measure *measure, int Nmeasure) {
+
+  int i, m, k, Nm, averef;
+  int *next;
+
+  ALLOCATE (next, int, Nmeasure);
+
+  /* reset the Nm, offset values for average */
+  for (i = 0; i < Naverage; i++) {
+    average[i].measureOffset = -1;
+    average[i].Nmeasure     =  0;
+  }
+
+  for (Nm = 0; Nm < Nmeasure; Nm++) {
+    averef = measure[Nm].averef;
+    m = average[averef].measureOffset;  
+    next[Nm] = -1;
+
+    if (m == -1) { /* no links yet for source */
+      average[averef].measureOffset = Nm;
+      average[averef].Nmeasure     = 1;
+      continue;
+    }
+
+    for (k = 0; next[m] != -1; k++) {
+      m = next[m];
+      if (m >= Nmeasure) {
+        fprintf (stderr, "WARNING: m out of bounds (1)\n");
+      }
+    }
+
+    average[averef].Nmeasure = k + 2;
+    next[m] = Nm;
+    if (m >= Nmeasure) {
+      fprintf (stderr, "WARNING: m out of bounds (2)\n");
+    }
+  }
+  return (next);
+}
+
+/* average[].measureOffset, average[].Nmeasure are valid within an addstar run */
+int add_meas_link (Average *average, int *next, int Nmeasure, int NMEASURE) {
+
+  int k, m;
+
+  /* if we have trouble, check validity of next[m] : m < Nmeasure */
+  m = average[0].measureOffset;  
+
+  for (k = 0; k < average[0].Nmeasure - 1; k++)  {
+    m = next[m];
+    if (m >= NMEASURE) {
+      fprintf (stderr, "WARNING: m out of bounds (3)\n");
+    }
+  }
+
+  /* set up references */
+  next[Nmeasure] = -1;
+  if (Nmeasure >= NMEASURE) {
+    fprintf (stderr, "WARNING: Nmeasure out of bounds (1)\n");
+  }
+
+  if (m == -1) {
+    average[0].measureOffset = Nmeasure;
+  } else {
+    next[m] = Nmeasure;
+    if (m >= NMEASURE) {
+      fprintf (stderr, "WARNING: m out of bounds (4)\n");
+    }
+  }
+
+  return (TRUE);
+}
+
+/* Missing does not carry enough information to reconstruct the links
+   we must always save the missing table, if it exists */
+
+Measure *sort_measure (Average *average, int Naverage, Measure *measure, int Nmeasure, int *next) {
+
+  int i, k, n, N;
+  Measure *tmpmeasure;
+
+  /* fix order of Measure (memory intensive, but fast) */
+  N = 0; 
+  ALLOCATE (tmpmeasure, Measure, Nmeasure);
+  for (i = 0; i < Naverage; i++) {
+    n = average[i].measureOffset;
+    average[i].measureOffset = N;
+    for (k = 0; k < average[i].Nmeasure; k++, N++) {
+      if (n == -1) abort();
+      tmpmeasure[N] = measure[n]; 
+      if (measure[n].averef != i) abort();
+      tmpmeasure[N].averef = i;
+      n = next[n];
+    }
+  }
+  free (measure);
+  return (tmpmeasure);
+}
+
 /* build the initial links assuming the table is sorted */
 int *init_missing_links (Average *average, int Naverage, Missing *missing, int Nmissing) {
@@ -57 +186 @@
 }
 
-/* average[].measureOffset, average[].Nmeasure are valid within an addstar run */
-int add_meas_link (Average *average, int *next, int Nmeasure, int NMEASURE) {
-
-  int k, m;
-
-  /* if we have trouble, check validity of next[m] : m < Nmeasure */
-  m = average[0].measureOffset;  
-
-  for (k = 0; k < average[0].Nmeasure - 1; k++)  {
-    m = next[m];
-    if (m >= NMEASURE) {
-      fprintf (stderr, "WARNING: m out of bounds (3)\n");
-    }
-  }
-
-  /* set up references */
-  next[Nmeasure] = -1;
-  if (Nmeasure >= NMEASURE) {
-    fprintf (stderr, "WARNING: Nmeasure out of bounds (1)\n");
-  }
-
-  if (m == -1) {
-    average[0].measureOffset = Nmeasure;
-  } else {
-    next[m] = Nmeasure;
-    if (m >= NMEASURE) {
-      fprintf (stderr, "WARNING: m out of bounds (4)\n");
-    }
-  }
-
-  return (TRUE);
-}
-
 int add_miss_link (Average *average, int *next, int Nmissing) {
 
@@ -109 +205 @@
 }
 
-/* construct measure links which are valid FOR THIS LOAD
- * - if we have a full load, we will get links which can
- *   be used by other programs (eg, relphot, etc)
- * - if we have a partial load, the links are only valid
- *   for that partial load
- */ 
-
-int *build_measure_links (Average *average, int Naverage, Measure *measure, int Nmeasure) {
-
-  int i, m, k, Nm, averef;
-  int *next;
-
-  ALLOCATE (next, int, Nmeasure);
-
-  /* reset the Nm, offset values for average */
-  for (i = 0; i < Naverage; i++) {
-    average[i].measureOffset = -1;
-    average[i].Nmeasure     =  0;
-  }
-
-  for (Nm = 0; Nm < Nmeasure; Nm++) {
-    averef = measure[Nm].averef;
-    m = average[averef].measureOffset;  
-    next[Nm] = -1;
-
-    if (m == -1) { /* no links yet for source */
-      average[averef].measureOffset = Nm;
-      average[averef].Nmeasure     = 1;
-      continue;
-    }
-
-    for (k = 0; next[m] != -1; k++) {
-      m = next[m];
-      if (m >= Nmeasure) {
-        fprintf (stderr, "WARNING: m out of bounds (1)\n");
-      }
-    }
-
-    average[averef].Nmeasure = k + 2;
-    next[m] = Nm;
-    if (m >= Nmeasure) {
-      fprintf (stderr, "WARNING: m out of bounds (2)\n");
-    }
-  }
-  return (next);
-}
-
-/* Missing does not carry enough information to reconstruct the links
-   we must always save the missing table, if it exists */
-
-Measure *sort_measure (Average *average, int Naverage, Measure *measure, int Nmeasure, int *next) {
-
-  int i, k, n, N;
-  Measure *tmpmeasure;
-
-  /* fix order of Measure (memory intensive, but fast) */
-  N = 0; 
-  ALLOCATE (tmpmeasure, Measure, Nmeasure);
-  for (i = 0; i < Naverage; i++) {
-    n = average[i].measureOffset;
-    average[i].measureOffset = N;
-    for (k = 0; k < average[i].Nmeasure; k++, N++) {
-      tmpmeasure[N] = measure[n]; 
-      tmpmeasure[N].averef = i;
-      n = next[n];
-    }
-  }
-  free (measure);
-  return (tmpmeasure);
-}
-
 Missing *sort_missing (Average *average, int Naverage, Missing *missing, int Nmissing, int *next) {
 
@@ -199 +224 @@
   return (tmpmissing);
 }
+

branches/eam_branches/20091201/Ohana/src/addstar/src/find_matches.c

@@ -271 +271 @@
     catalog[0].average[Nave].catID         = catID;
     catalog[0].average[Nave].flags         = 0;
+    if (PSPS_ID) {
+        catalog[0].average[Nave].extID = CreatePSPSObjectID(catalog[0].average[Nave].R,
+                                                            catalog[0].average[Nave].D);
+    } else {
+        catalog[0].average[Nave].extID         = 0;
+    }
 
     objID ++;

branches/eam_branches/20091201/Ohana/src/addstar/src/find_matches_closest.c

@@ -266 +266 @@
     catalog[0].average[Nave].catID         = catID;
     catalog[0].average[Nave].flags         = 0;
+    if (PSPS_ID) {
+        catalog[0].average[Nave].extID = CreatePSPSObjectID(catalog[0].average[Nave].R,
+                                                            catalog[0].average[Nave].D);
+    } else {
+        catalog[0].average[Nave].extID         = 0;
+    }
+
 
     objID ++;

branches/eam_branches/20091201/Ohana/src/addstar/src/find_matches_closest_refstars.c

@@ -291 +291 @@
     catalog[0].average[Nave].catID         = catID;
     catalog[0].average[Nave].flags         = 0;
+    if (PSPS_ID) {
+        catalog[0].average[Nave].extID = CreatePSPSObjectID(catalog[0].average[Nave].R,
+                                                            catalog[0].average[Nave].D);
+    } else {
+        catalog[0].average[Nave].extID         = 0;
+    }
 
     objID ++;

branches/eam_branches/20091201/Ohana/src/addstar/src/find_matches_refstars.c

@@ -261 +261 @@
     catalog[0].average[Nave].catID         = catID;
     catalog[0].average[Nave].flags         = 0;
+    if (PSPS_ID) {
+        catalog[0].average[Nave].extID = CreatePSPSObjectID(catalog[0].average[Nave].R,
+                                                            catalog[0].average[Nave].D);
+    } else {
+        catalog[0].average[Nave].extID         = 0;
+    }
+
 
     objID ++;
@@ -290 +297 @@
 
       stars[N][0].found = Nmeas;
-      next_meas[Nmeas] = -1;
-      Nmeas ++;
+      next_meas[Nmeas] = -1;  // initial value here, update below
+      Nmeas ++; 
+    }
+
+    for (j = 0; j < NREFSTAR_GROUP - 1; j++) {
+        next_meas[Nmeas - NREFSTAR_GROUP + j] = Nmeas - NREFSTAR_GROUP + j + 1;
     }
     Nave ++;