Changeset 34569

Timestamp:

Oct 24, 2012, 3:53:58 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120905/Ohana/src

Files:

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

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

@@ -131 +131 @@
   ID_MEAS_UNDEF_5        = 0x00004000,  // unused 
   ID_MEAS_PHOTOM_UBERCAL = 0x00008000,  // externally-supplied zero point from ubercal analysis
+  ID_MEAS_STACK_PRIMARY  = 0x00010000,  // externally-supplied zero point from ubercal analysis
 } DVOMeasureFlags;
 

branches/eam_branches/ipp-20120905/Ohana/src/relphot/src/StarOps.c

@@ -424 +424 @@
         if (code->equiv != thisCode) { continue; }
         Ncode ++;
+
+        catalog[Nc].measure[m].dbFlags &= ~ID_MEAS_STACK_PRIMARY;
 
         if (catalog[Nc].measureT[m].dbFlags & MEAS_BAD) SKIP_THIS_MEAS(Nbad); 
@@ -692 +694 @@
 
           catalog[Nc].secfilt[Nsecfilt*j+Nsec].stackID   = ID;
+
+          catalog[Nc].measure[m].dbFlags |= ID_MEAS_STACK_PRIMARY;
         }