Changeset 6683 for trunk/Ohana/src/relphot

Timestamp:

Mar 26, 2006, 10:46:32 AM (20 years ago)

Author:

eugene

Message:

adding proper motion and parallax to addstar, dropping _PS from RA and DEC in average

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) (2 diffs)
• plot_scatter.c (modified) (1 diff)
• setExclusions.c (modified) (1 diff)
• setMrelFinal.c (modified) (2 diffs)

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

@@ -111 +111 @@
       /* add this measurement to the grid cell for this chip */
       ave = measure[0].averef;
-      ra  = catalog[cat].average[ave].R_PS - measure[0].dR_PS / 3600.0;
-      dec = catalog[cat].average[ave].D_PS - measure[0].dD_PS / 3600.0;
+      ra  = catalog[cat].average[ave].R - measure[0].dR_PS / 3600.0;
+      dec = catalog[cat].average[ave].D - measure[0].dD_PS / 3600.0;
        
       /* X,Y always positive-definite in range 0,0 - dX, dY */

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

@@ -591 +591 @@
 
       ave = catalog[c].measure[m].averef;
-      xlist[N] = catalog[c].average[ave].R_PS - catalog[c].measure[m].dR_PS / 3600.0;
-      ylist[N] = catalog[c].average[ave].D_PS - catalog[c].measure[m].dD_PS / 3600.0;
+      xlist[N] = catalog[c].average[ave].R - catalog[c].measure[m].dR_PS / 3600.0;
+      ylist[N] = catalog[c].average[ave].D - catalog[c].measure[m].dD_PS / 3600.0;
       N++;
     }

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

@@ -28 +28 @@
   if (catalog[cat].average[ave].code & STAR_BAD) return (NO_MAG);  
  
-  value = PhotPrimary ? catalog[cat].average[ave].M_PS : catalog[cat].secfilt[PhotNsec*ave+PhotSec].M_PS;
+  value = PhotPrimary ? catalog[cat].average[ave].M : catalog[cat].secfilt[PhotNsec*ave+PhotSec].M_PS;
   return (value);
 }
@@ -66 +66 @@
 
       if (PhotPrimary) {
-        catalog[i].average[j].M_PS = stats.mean;
-        catalog[i].average[j].dM_PS = stats.sigma;
+        catalog[i].average[j].M = stats.mean;
+        catalog[i].average[j].dM = stats.sigma;
         catalog[i].average[j].Xm = (stats.Nmeas > 1) ? 100.0*log10(stats.chisq) : NO_MAG;
       } else {
@@ -122 +122 @@
       /* use sigma or error in dM for output? */
       if (PhotPrimary) {
-        catalog[i].average[j].M_PS = stats.mean;
-        catalog[i].average[j].dM_PS = MAX (stats.sigma, stats.error);
+        catalog[i].average[j].M = stats.mean;
+        catalog[i].average[j].dM = MAX (stats.sigma, stats.error);
         catalog[i].average[j].Xm = (stats.Nmeas > 1) ? 100.0*log10(stats.chisq) : NO_MAG;
       } else {
@@ -187 +187 @@
       Chisq = pow (10.0, 0.01*Xm);
       xlist[Ntot] = Chisq;
-      slist[Ntot] = PhotPrimary ? catalog[i].average[j].dM_PS : catalog[i].secfilt[PhotNsec*j+PhotSec].dM_PS;
+      slist[Ntot] = PhotPrimary ? catalog[i].average[j].dM : catalog[i].secfilt[PhotNsec*j+PhotSec].dM_PS;
       dlist[Ntot] = 1;
       Ntot ++;
@@ -203 +203 @@
   for (i = 0; i < Ncatalog; i++) {
     for (j = 0; j < catalog[i].Naverage; j++) {
-      dM = PhotPrimary ? catalog[i].average[j].dM_PS : catalog[i].secfilt[PhotNsec*j+PhotSec].dM_PS;
+      dM = PhotPrimary ? catalog[i].average[j].dM : catalog[i].secfilt[PhotNsec*j+PhotSec].dM_PS;
       Xm = PhotPrimary ? catalog[i].average[j].Xm    : catalog[i].secfilt[PhotNsec*j+PhotSec].Xm;
       Chisq = pow (10.0, 0.01*Xm);
@@ -423 +423 @@
       if (catalog[i].average[j].code & STAR_BAD) continue;  
 
-      dM = PhotPrimary ? catalog[i].average[j].dM_PS : catalog[i].secfilt[PhotNsec*j+PhotSec].dM_PS;
+      dM = PhotPrimary ? catalog[i].average[j].dM : catalog[i].secfilt[PhotNsec*j+PhotSec].dM_PS;
       list[n] = dM;
       dlist[n] = 1;
@@ -452 +452 @@
     for (j = 0; j < catalog[i].Naverage; j++) {
       if (catalog[i].average[j].code & STAR_BAD) continue;  
-      dMrel = PhotPrimary ? catalog[i].average[j].dM_PS : catalog[i].secfilt[PhotNsec*j+PhotSec].dM_PS;
+      dMrel = PhotPrimary ? catalog[i].average[j].dM : catalog[i].secfilt[PhotNsec*j+PhotSec].dM_PS;
       bin = dMrel / 0.00025;
       bin = MAX (0, MIN (NBIN-1, bin));
@@ -483 +483 @@
     for (j = 0; j < catalog[i].Naverage; j++) {
       if (catalog[i].average[j].code & STAR_BAD) continue;
-      xlist[N] = PhotPrimary ? catalog[i].average[j].M_PS : catalog[i].secfilt[PhotNsec*j+PhotSec].M_PS;
+      xlist[N] = PhotPrimary ? catalog[i].average[j].M : catalog[i].secfilt[PhotNsec*j+PhotSec].M_PS;
       value    = PhotPrimary ? catalog[i].average[j].Xm   : catalog[i].secfilt[PhotNsec*j+PhotSec].Xm;
       if (value == NO_MAG) continue;
@@ -517 +517 @@
   for (i = 0; i < Ncatalog; i++) {
     for (j = 0; j < catalog[i].Naverage; j++) {
-      xlist[N] = catalog[i].average[j].R_PS;
-      ylist[N] = catalog[i].average[j].D_PS;
+      xlist[N] = catalog[i].average[j].R;
+      ylist[N] = catalog[i].average[j].D;
       N++;
     }

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

@@ -18 +18 @@
   for (i = 0; i < catalog[0].Naverage; i++) {
     if (catalog[0].average[i].Nm < 2) continue; 
-    if (catalog[0].average[i].R_PS < fullregion[0].RA[0]) continue;
-    if (catalog[0].average[i].R_PS > fullregion[0].RA[1]) continue;
-    if (catalog[0].average[i].D_PS < fullregion[0].DEC[0]) continue;
-    if (catalog[0].average[i].D_PS > fullregion[0].DEC[1]) continue;
+    if (catalog[0].average[i].R < fullregion[0].RA[0]) continue;
+    if (catalog[0].average[i].R > fullregion[0].RA[1]) continue;
+    if (catalog[0].average[i].D < fullregion[0].DEC[0]) continue;
+    if (catalog[0].average[i].D > fullregion[0].DEC[1]) continue;
 
     /* start with all stars good */
@@ -32 +32 @@
     if (RESET) {
       float *p;
-      p = (PhotPrimary) ? &subcatalog[0].average[Naverage].M_PS : &subcatalog[0].secfilt[PhotNsec*Naverage+PhotSec].M_PS;
+      p = (PhotPrimary) ? &subcatalog[0].average[Naverage].M : &subcatalog[0].secfilt[PhotNsec*Naverage+PhotSec].M_PS;
       *p = NO_MAG;
-      p = (PhotPrimary) ? &subcatalog[0].average[Naverage].dM_PS : &subcatalog[0].secfilt[PhotNsec*Naverage+PhotSec].dM_PS;
+      p = (PhotPrimary) ? &subcatalog[0].average[Naverage].dM : &subcatalog[0].secfilt[PhotNsec*Naverage+PhotSec].dM_PS;
       *p = NO_MAG;
       subcatalog[0].average[Naverage].code &= ~ID_STAR_FEW;

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

@@ -32 +32 @@
         if ((Mgrid = getMgrid (m, i)) == NO_MAG) continue;
 
-        Mrel = PhotPrimary ? catalog[i].average[j].M_PS : catalog[i].secfilt[PhotNsec*j+PhotSec].M_PS;
+        Mrel = PhotPrimary ? catalog[i].average[j].M : catalog[i].secfilt[PhotNsec*j+PhotSec].M_PS;
         xlist[N] = Mrel;
         ylist[N] = PhotSys  (&catalog[i].measure[m], &catalog[i].average[j], &catalog[i].secfilt[j*PhotNsec]) - Mcal - Mmos - Mgrid - Mrel;

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

@@ -25 +25 @@
         /* select measurements by mag limit */
         if (AreaSelect) {
-          r = catalog[i].average[j].R_PS + catalog[i].measure[m].dR_PS / 3600.0;
-          d = catalog[i].average[j].D_PS + catalog[i].measure[m].dD_PS / 3600.0;
+          r = catalog[i].average[j].R + catalog[i].measure[m].dR_PS / 3600.0;
+          d = catalog[i].average[j].D + catalog[i].measure[m].dD_PS / 3600.0;
           if ((coords = getCoords (m, i)) == NULL) goto markbad;
           RD_to_XY (&x, &y, r, d, coords);

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

@@ -11 +11 @@
 
     for (i = 0; i < catalog[0].Naverage; i++) {
-      p = (PhotPrimary) ? &catalog[0].average[i].M_PS  : &catalog[0].secfilt[PhotNsec*i+PhotSec].M_PS;
+      p = (PhotPrimary) ? &catalog[0].average[i].M  : &catalog[0].secfilt[PhotNsec*i+PhotSec].M_PS;
       *p = NO_MAG;
-      p = (PhotPrimary) ? &catalog[0].average[i].dM_PS : &catalog[0].secfilt[PhotNsec*i+PhotSec].dM_PS;
+      p = (PhotPrimary) ? &catalog[0].average[i].dM : &catalog[0].secfilt[PhotNsec*i+PhotSec].dM_PS;
       *p = NO_MAG;
       q = (PhotPrimary) ? &catalog[0].average[i].Xm : &catalog[0].secfilt[PhotNsec*i+PhotSec].Xm;
@@ -143 +143 @@
 /* dophot types:
 
-   1 - star
-   2 - galaxy
-   3 - star
-   4 - weak
-   5 - edge
-   7 - weak
-   9 - weak
-   10 - sat
+1 - star
+2 - galaxy
+3 - star
+4 - weak
+5 - edge
+7 - weak
+9 - weak
+10 - sat
 */