Changeset 12332 for trunk/Ohana/src/relastro/src/setMrelFinal.c

Timestamp:

Mar 8, 2007, 12:21:18 PM (19 years ago)

Author:

eugene

Message:

complete merge from branch dvo-mods-2007-02

File:

• trunk/Ohana/src/relastro/src/setMrelFinal.c (modified) (5 diffs)

trunk/Ohana/src/relastro/src/setMrelFinal.c

@@ -1 @@
-# include "relphot.h"
+# include "relastro.h"
 
 void setMrelFinal (Catalog *catalog) {
@@ -11 +11 @@
 
     for (i = 0; i < catalog[0].Naverage; i++) {
-      p = (PhotPrimary) ? &catalog[0].average[i].M  : &catalog[0].secfilt[PhotNsec*i+PhotSec].M_PS;
+      p = (PhotPrimary) ? &catalog[0].average[i].M  : &catalog[0].secfilt[PhotNsec*i+PhotSec].M;
       *p = NO_MAG;
-      p = (PhotPrimary) ? &catalog[0].average[i].dM : &catalog[0].secfilt[PhotNsec*i+PhotSec].dM_PS;
+      p = (PhotPrimary) ? &catalog[0].average[i].dM : &catalog[0].secfilt[PhotNsec*i+PhotSec].dM;
       *p = NO_MAG;
       q = (PhotPrimary) ? &catalog[0].average[i].Xm : &catalog[0].secfilt[PhotNsec*i+PhotSec].Xm;
@@ -22 +22 @@
         
         /* select measurements by photcode */
-        ecode = GetPhotcodeEquivCodebyCode (catalog[0].measure[m].source);
+        ecode = GetPhotcodeEquivCodebyCode (catalog[0].measure[m].photcode);
         if (ecode != photcode[0].code) continue;
         
@@ -31 +31 @@
         }
         
-        catalog[0].measure[m].Mcal_PS = 0;
+        catalog[0].measure[m].Mcal = 0;
         catalog[0].measure[m].flags &= 0xff00;
         catalog[0].measure[m].flags &= ~ID_MEAS_POOR;
@@ -97 +97 @@
       /** never use these measurements (wrong photcode, bad time range) */
       /* skipped via NOCAL, don't mark as skipped */
-      ecode = GetPhotcodeEquivCodebyCode (catalog[0].measure[m].source);
+      ecode = GetPhotcodeEquivCodebyCode (catalog[0].measure[m].photcode);
       if (ecode != photcode[0].code) continue;