Changeset 34735 for branches/eam_branches/ipp-20120905/Ohana

Timestamp:

Nov 29, 2012, 2:15:01 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120905

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/addstar/src/psps_ids.c (modified) (2 diffs)
• Ohana/src/libdvo/include/dvo.h (modified) (1 diff)
• Ohana/src/opihi/cmd.astro (modified) (1 prop)

branches/eam_branches/ipp-20120905/Ohana/src/addstar/src/psps_ids.c

@@ -21 +21 @@
 CreatePSPSStackDetectionID(int sourceID, int imageID, int detID)
 {
-  // sourceID : ID of database + table that tracked the image (< 0x100 = 256)
+  // sourceID : ID of database + table that tracked the image (< 0x7f = 127)
   // imageID : external ID of the image which provided the detections (< 0x1000.0000 ~ 2.7e8)
   // detID : detection sequence in image (< 0x1000.0000 ~ 2.7e8)
@@ -27 +27 @@
   assert (detID    < 0x10000000);
   assert (imageID  < 0x10000000);
-  assert (sourceID < 0x100);
+  assert (sourceID < 0x7f);
   
   uint64_t detectid = ((uint64_t)sourceID << 56) + ((uint64_t)imageID << 28) + (uint64_t)detID;

branches/eam_branches/ipp-20120905/Ohana/src/libdvo/include/dvo.h

@@ -193 +193 @@
   ID_PHOTOM_PASS_3    = 0x00000800, // average magnitude calculated in 3th pass
   ID_PHOTOM_PASS_4    = 0x00001000, // average magnitude calculated in 4th pass
+  ID_PSPS_OBJ_EXT     = 0x00002000, // In PSPS ID_SECF_OBJ_EXT is moved here so it fits within 16 bits
   ID_SECF_OBJ_EXT     = 0x01000000, // extended in this band
 } DVOSecfiltFlags;