Changeset 16810 for trunk/Ohana/src/relphot

Timestamp:

Mar 4, 2008, 12:39:41 PM (18 years ago)

Author:

eugene

Message:

merge changes from eam_branch_20080223 : updates to DVO output format, addstar (SDSS and 2MASS flags), relastro (FitChip)

Location:

trunk/Ohana/src/relphot/src

Files:

• ImageOps.c (modified) (1 diff)
• MosaicOps.c (modified) (1 diff)
• StarOps.c (modified) (9 diffs)
• bcatalog.c (modified) (3 diffs)
• plot_scatter.c (modified) (2 diffs)
• setExclusions.c (modified) (1 diff)
• setMrelFinal.c (modified) (3 diffs)

trunk/Ohana/src/relphot/src/ImageOps.c

@@ -24 +24 @@
 
   for (i = 0; i < Nimage; i++) {
-    start[i] = image[i].tzero - MAX(0.05*image[i].trate*image[i].NY, 1);
-    stop[i]  = image[i].tzero + MAX(1.05*image[i].trate*image[i].NY, 1);
+    start[i] = image[i].tzero - MAX(0.01*image[i].trate*image[i].NY, 1);
+    stop[i]  = image[i].tzero + MAX(1.01*image[i].trate*image[i].NY, 1);
   }
 }

trunk/Ohana/src/relphot/src/MosaicOps.c

@@ -41 +41 @@
 
     /* set image time range */
-    start = image[i].tzero - MAX(0.05*image[i].trate*image[i].NY, 1);
-    stop  = image[i].tzero + MAX(1.05*image[i].trate*image[i].NY, 1);
+    start = image[i].tzero - MAX(0.01*image[i].trate*image[i].NY, 1);
+    stop  = image[i].tzero + MAX(1.01*image[i].trate*image[i].NY, 1);
 
     /* find existing mosaic with this time range */

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

@@ -12 +12 @@
   for (i = 0; i < Ncatalog; i++) {
     for (j = 0; j < catalog[i].Naverage; j++) {
-      Nmax = MAX (Nmax, catalog[i].average[j].Nm);
+      Nmax = MAX (Nmax, catalog[i].average[j].Nmeasure);
     }
   }
@@ -43 +43 @@
       /* calculate the average value for a single star */
       if (catalog[i].average[j].code & STAR_BAD) continue;  
-      m = catalog[i].average[j].offset;
+      m = catalog[i].average[j].measureOffset;
 
       N = 0;
-      for (k = 0; k < catalog[i].average[j].Nm; k++, m++) {
+      for (k = 0; k < catalog[i].average[j].Nmeasure; k++, m++) {
         if (catalog[i].measure[m].dbFlags & MEAS_BAD) continue;
         // XXX allow REF stars (no Image Entry) to be included in the calculation this
@@ -94 +94 @@
   for (i = 0; i < Ncatalog; i++) {
     for (j = 0; j < catalog[i].Naverage; j++) {
-      Nmax = MAX (Nmax, catalog[i].average[j].Nm);
+      Nmax = MAX (Nmax, catalog[i].average[j].Nmeasure);
     }
   }
@@ -107 +107 @@
 
       N = 0;
-      m = catalog[i].average[j].offset;
-      for (k = 0; k < catalog[i].average[j].Nm; k++, m++) {
+      m = catalog[i].average[j].measureOffset;
+      for (k = 0; k < catalog[i].average[j].Nmeasure; k++, m++) {
         if (catalog[i].measure[m].dbFlags & MEAS_BAD) continue;
         // XXX allow REF stars (no Image Entry) to be included in the calculation this
@@ -158 +158 @@
     for (j = 0; j < catalog[i].Naverage; j++) {
 
-      m = catalog[i].average[j].offset;
-      for (k = 0; k < catalog[i].average[j].Nm; k++, m++) {
+      m = catalog[i].average[j].measureOffset;
+      for (k = 0; k < catalog[i].average[j].Nmeasure; k++, m++) {
         if (catalog[i].measure[m].dbFlags & MEAS_BAD) continue;
         Mcal  = getMcal  (m, i);
@@ -247 +247 @@
   for (i = 0; i < Ncatalog; i++) {
     for (j = 0; j < catalog[i].Naverage; j++) {
-      Nmax = MAX (Nmax, catalog[i].average[j].Nm);
+      Nmax = MAX (Nmax, catalog[i].average[j].Nmeasure);
     }
   }
@@ -270 +270 @@
 
       /* accumulate list of valid measurements */
-      m = catalog[i].average[j].offset;
+      m = catalog[i].average[j].measureOffset;
       N = 0;
-      for (k = 0; k < catalog[i].average[j].Nm; k++, m++) {
+      for (k = 0; k < catalog[i].average[j].Nmeasure; k++, m++) {
         /* if (catalog[i].measure[m].dbFlags & MEAS_BAD) continue; */
         Mcal  = getMcal  (m, i);
@@ -305 +305 @@
       image_bad = IMAGE_BAD;
       IMAGE_BAD = ID_IMAGE_NOCAL;
-      m = catalog[i].average[j].offset;
+      m = catalog[i].average[j].measureOffset;
       N = 0;
-      for (k = 0; k < catalog[i].average[j].Nm; k++, m++) {
+      for (k = 0; k < catalog[i].average[j].Nmeasure; k++, m++) {
         /* if (catalog[i].measure[m].dbFlags & MEAS_BAD) continue; */
         Mcal  = getMcal  (m, i);
@@ -362 +362 @@
       /* calculate the average value for a single star */
       if (catalog[i].average[j].code & STAR_BAD) continue;  
-      m = catalog[i].average[j].offset;
+      m = catalog[i].average[j].measureOffset;
 
       N = 0;
-      for (k = 0; k < catalog[i].average[j].Nm; k++, m++) {
+      for (k = 0; k < catalog[i].average[j].Nmeasure; k++, m++) {
         Mcal = getMcal  (m, i);
         if (isnan(Mcal)) continue;

trunk/Ohana/src/relphot/src/bcatalog.c

@@ -22 +22 @@
   /* exclude stars not in range or with too few measurements */
   for (i = 0; i < catalog[0].Naverage; i++) {
-    // if (catalog[0].average[i].Nm < 2) continue; 
+    // if (catalog[0].average[i].Nmeasure < 2) continue; 
 
     /* start with all stars good */
     subcatalog[0].average[Naverage] = catalog[0].average[i];
-    subcatalog[0].average[Naverage].offset = Nmeasure;
+    subcatalog[0].average[Naverage].measureOffset = Nmeasure;
     for (j = 0; j < PhotNsec; j++) {
       subcatalog[0].secfilt[PhotNsec*Naverage+j] = catalog[0].secfilt[PhotNsec*i+j];
@@ -39 +39 @@
 
     Nm = 0;
-    for (j = 0; j < catalog[0].average[i].Nm; j++) {
+    for (j = 0; j < catalog[0].average[i].Nmeasure; j++) {
 
-      offset = catalog[0].average[i].offset + j;
+      offset = catalog[0].average[i].measureOffset + j;
 
       /* select measurements by photcode */
@@ -96 +96 @@
     }
     # endif
-    subcatalog[0].average[Naverage].Nm = Nm;
+    subcatalog[0].average[Naverage].Nmeasure = Nm;
     Naverage ++;
     if (Naverage == NAVERAGE) {

trunk/Ohana/src/relphot/src/plot_scatter.c

@@ -11 +11 @@
   for (i = 0; i < Ncatalog; i++) {
     for (j = 0; j < catalog[i].Naverage; j++) {
-      Ntot += catalog[i].average[j].Nm;
+      Ntot += catalog[i].average[j].Nmeasure;
     }
   }
@@ -24 +24 @@
       /* calculate the average value for a single star */
       if (catalog[i].average[j].code & STAR_BAD) continue;  
-      m = catalog[i].average[j].offset;
+      m = catalog[i].average[j].measureOffset;
 
-      for (k = 0; k < catalog[i].average[j].Nm; k++, m++) {
+      for (k = 0; k < catalog[i].average[j].Nmeasure; k++, m++) {
         if (catalog[i].measure[m].dbFlags & MEAS_BAD) continue;
         Mcal = getMcal  (m, i);

trunk/Ohana/src/relphot/src/setExclusions.c

@@ -10 +10 @@
   for (i = 0; i < Ncatalog; i++) {
     for (j = 0; j < catalog[i].Naverage; j++) {
-      m = catalog[i].average[j].offset;
-      for (k = 0; k < catalog[i].average[j].Nm; k++, m++) {
+      m = catalog[i].average[j].measureOffset;
+      for (k = 0; k < catalog[i].average[j].Nmeasure; k++, m++) {
 
         /* select measurements by photcode */

trunk/Ohana/src/relphot/src/setMrelFinal.c

@@ -13 +13 @@
       catalog[0].secfilt[PhotNsec*i+PhotSec].Xm = NAN_S_SHORT;
 
-      m = catalog[0].average[i].offset;
-      for (j = 0; j < catalog[0].average[i].Nm; j++, m++) {
+      m = catalog[0].average[i].measureOffset;
+      for (j = 0; j < catalog[0].average[i].Nmeasure; j++, m++) {
         
         /* select measurements by photcode */
@@ -56 +56 @@
     catalog[0].average[i].code &= ~ID_STAR_FEW;
     catalog[0].average[i].code &= ~ID_STAR_POOR;
-    m = catalog[0].average[i].offset;
-    for (j = 0; j < catalog[0].average[i].Nm; j++, m++) {
+    m = catalog[0].average[i].measureOffset;
+    for (j = 0; j < catalog[0].average[i].Nmeasure; j++, m++) {
       catalog[0].measure[m].dbFlags &= ~ID_MEAS_NOCAL;
     }
@@ -80 +80 @@
   /* mark measures which should be ignored on second pass */
   for (i = 0; i < catalog[0].Naverage; i++) {
-    Ntot += catalog[0].average[i].Nm;
+    Ntot += catalog[0].average[i].Nmeasure;
     if (catalog[0].found[i]) continue;
 
-    m = catalog[0].average[i].offset;
-    for (k = 0; k < catalog[0].average[i].Nm; k++, m++) {
+    m = catalog[0].average[i].measureOffset;
+    for (k = 0; k < catalog[0].average[i].Nmeasure; k++, m++) {
       Ntry++;