Changeset 33169 for branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/StarOps.c

Timestamp:

Jan 27, 2012, 10:06:11 AM (14 years ago)

Author:

eugene

Message:

setphot / relphot now seem to work well with the ubercal input zero table

File:

• branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/StarOps.c (modified) (3 diffs)

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

@@ -84 +84 @@
             continue;
           }
-
-          // XXX include the ubercal measurements?  yes, of course!  these are the well-determined values, supposedly!
 
           // XXX allow REF stars (no Image Entry) to be included in the calculation this
@@ -118 +116 @@
           dlist[N] = MAX (catalog[i].measureT[m].dM, MIN_ERROR);
 
+          // up-weight the ubercal values (or convergence can take a long time...)
+          if (catalog[i].measureT[m].dbFlags & ID_MEAS_PHOTOM_UBERCAL) {
+            dlist[N] = MAX (0.1*catalog[i].measureT[m].dM, MIN_ERROR);
+          }
+
           // tie down reference photometry if the -refcode (code) option is selected
+          // XXX re-think this...
           if (refPhotcode) {
             if (GetPhotcodeEquivCodebyCode(catalog[i].measureT[m].photcode) == refPhotcode[0].equiv) {
@@ -140 +144 @@
         catalog[i].secfilt[Nsecfilt*j+Nsec].M  = stats.mean;
         catalog[i].secfilt[Nsecfilt*j+Nsec].dM = stats.sigma;
-        catalog[i].secfilt[Nsecfilt*j+Nsec].Xm = (stats.Nmeas > 1) ? 100.0*log10(stats.chisq) : NAN_S_SHORT;
+        catalog[i].secfilt[Nsecfilt*j+Nsec].Xm = (stats.Nmeas > 1) ? 100.0*log10(stats.chisq + 1e-4) : NAN_S_SHORT;
       }
     }