Changeset 34621 for trunk/Ohana

Timestamp:

Oct 28, 2012, 2:26:50 PM (14 years ago)

Author:

eugene

Message:

merge from eam_branches/ipp-20120905: secfilt->stackID is not secfilt->stackDetectID, and comes from the psps detection ID

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/cmd.astro (modified) (1 prop)
• src/relphot/src/StarOps.c (modified) (5 diffs)

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

@@ -401 +401 @@
 
       float stackCenterOffsetMin = 1e9;
-      int stackCenterIDmin = -1;
+      // int stackCenterIDmin = -1;
       off_t stackCenterMeasureMin = -1;
 
       float stackPrimaryOffsetMin = 1e9;
-      int stackPrimaryIDmin = -1;
+      // int stackPrimaryIDmin = -1;
       off_t stackPrimaryMeasureMin = -1;
 
@@ -497 +497 @@
               if (stackPrimaryOffset < stackPrimaryOffsetMin) {
                 stackPrimaryOffsetMin = stackPrimaryOffset;
-                stackPrimaryIDmin = stackImageID;
+                // stackPrimaryIDmin = stackImageID;
                 stackPrimaryMeasureMin = m;
               }
@@ -506 +506 @@
             if (stackCenterOffset < stackCenterOffsetMin) {
               stackCenterOffsetMin = stackCenterOffset;
-              stackCenterIDmin = stackImageID;
+              // stackCenterIDmin = stackImageID;
               stackCenterMeasureMin = m;
             }
@@ -650 +650 @@
         if (haveStack) {
           m  = (stackPrimaryMeasureMin >= 0) ? stackPrimaryMeasureMin : stackCenterMeasureMin;
-          ID = (stackPrimaryMeasureMin >= 0) ? stackPrimaryIDmin      : stackCenterIDmin;
+
+          // we are now populating stackDetectID not stack Image ID in secfilt
+          // ID = (stackPrimaryMeasureMin >= 0) ? stackPrimaryIDmin      : stackCenterIDmin;
+          ID = catalog[Nc].measure[m].extID; // for the stack, this is the stackDetectID
 
           // get the zero point for the selected image
@@ -693 +696 @@
           catalog[Nc].secfilt[Nsecfilt*j+Nsec].dFluxKron = zpFactor * catalog[Nc].measure[m].dFluxKron;
 
-          catalog[Nc].secfilt[Nsecfilt*j+Nsec].stackID   = ID;
+          catalog[Nc].secfilt[Nsecfilt*j+Nsec].stackDetectID = ID;
 
           catalog[Nc].measure[m].dbFlags |= ID_MEAS_STACK_PHOT_SRC;