Changeset 34583 for trunk

Timestamp:

Oct 25, 2012, 10:23:44 AM (14 years ago)

Author:

eugene

Message:

fix primary / phot_src for stack measurements

Location:

trunk/Ohana/src

Files:

• libdvo/include/dvo.h (modified) (1 diff)
• relphot/src/StarOps.c (modified) (1 diff)

trunk/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
+  ID_MEAS_STACK_PRIMARY  = 0x00010000,  // this stack measurement is in the primary skycell
+  ID_MEAS_STACK_PHOT_SRC = 0x00020000,  // this measurement supplied the stack photometry
 } DVOMeasureFlags;
 

trunk/Ohana/src/relphot/src/StarOps.c

@@ -695 +695 @@
           catalog[Nc].secfilt[Nsecfilt*j+Nsec].stackID   = ID;
 
-          catalog[Nc].measure[m].dbFlags |= ID_MEAS_STACK_PRIMARY;
+          catalog[Nc].measure[m].dbFlags |= ID_MEAS_STACK_PHOT_SRC;
+          if (stackPrimaryMeasureMin >= 0) {
+            catalog[Nc].measure[m].dbFlags |= ID_MEAS_STACK_PRIMARY;
+          }
         }