Changeset 33406

Timestamp:

Mar 4, 2012, 5:51:34 PM (14 years ago)

Author:

eugene

Message:

fix usage of M_80, M_20, ubercalDist for PS1_V3 secfilt

Location:

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src

Files:

• ImageOps.c (modified) (1 diff)
• MosaicOps.c (modified) (1 diff)
• StarOps.c (modified) (2 diffs)
• setMrelFinal.c (modified) (1 diff)

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

@@ -464 +464 @@
       int Nsec = GetPhotcodeNsec (code->equiv);
       if (Nsec == -1) goto skip;
-      minUbercalDist = MIN (catalog[c].secfilt[n*Nsecfilt + Nsec].M_80, minUbercalDist); // M_80 == ubercalDist
+      minUbercalDist = MIN (catalog[c].secfilt[n*Nsecfilt + Nsec].ubercalDist, minUbercalDist);
 
       // fprintf (stderr, "%1d, %3d : %3d, %3d : %10.6f %10.6f : %6.3f  %6.3f  %6.3f  %6.3f  %6.3f\n", (int) i, (int) j, (int) c, (int) m, catalog[c].averageT[n].R, catalog[c].averageT[n].D, Msys, Mrel, Mmos, Mgrid, Mflat);

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

@@ -496 +496 @@
       int Nsec = GetPhotcodeNsec (code->equiv);
       if (Nsec == -1) goto skip;
-      minUbercalDist = MIN (catalog[c].secfilt[n*Nsecfilt + Nsec].M_80, minUbercalDist); // M_80 == ubercalDist
+      minUbercalDist = MIN (catalog[c].secfilt[n*Nsecfilt + Nsec].ubercalDist, minUbercalDist);
 
     skip:

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

@@ -144 +144 @@
         catalog[i].secfilt[Nsecfilt*j+Nsec].Xm = (stats.Nmeas > 1) ? 100.0*log10(stats.chisq + 1e-4) : NAN_S_SHORT;
         
-        catalog[i].secfilt[Nsecfilt*j+Nsec].M_80 = minUbercalDist; // M_80 == ubercalDist
+        catalog[i].secfilt[Nsecfilt*j+Nsec].ubercalDist = minUbercalDist;
       }
     }
@@ -285 +285 @@
         catalog[i].secfilt[Nsecfilt*j+Nsec].Nused = stats.Nmeas;
 
-        catalog[i].secfilt[Nsecfilt*j+Nsec].M_80 = stats.Upper80;
-        catalog[i].secfilt[Nsecfilt*j+Nsec].M_20 = stats.Lower20;
+        catalog[i].secfilt[Nsecfilt*j+Nsec].M_80 = 1000 * stats.Upper80;
+        catalog[i].secfilt[Nsecfilt*j+Nsec].M_20 = 1000 * stats.Lower20;
         catalog[i].secfilt[Nsecfilt*j+Nsec].ubercalDist = minUbercalDist;
       }

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

@@ -43 +43 @@
         catalog[0].secfilt[N].Nused = 0;
         catalog[0].secfilt[N].flags &= ~PHOTOM_PASSES;
+        catalog[0].secfilt[N].ubercalDist = 1000;
 
         off_t m = catalog[0].average[i].measureOffset;