Changeset 37045

Timestamp:

Jul 17, 2014, 10:17:10 AM (12 years ago)

Author:

eugene

Message:

measure.dR,dR -> measure.R,D

Location:

trunk/Ohana/src/photdbc

Files:

• include/photdbc.h (modified) (1 diff)
• src/get_mags.c (modified) (2 diffs)
• src/join_stars.c (modified) (5 diffs)
• src/make_subcatalog.c (modified) (2 diffs)

trunk/Ohana/src/photdbc/include/photdbc.h

@@ -27 +27 @@
   double Dc;
 } SkyRegionCoords;
-
-# define MARKTIME(MSG,...) {                    \
-    gettimeofday (&stopTimer, (void *) NULL);   \
-    float dtime = DTIME (stopTimer, startTimer);        \
-    fprintf (stderr, MSG, __VA_ARGS__); }
-
-# define INITTIME \
-  struct timeval startTimer, stopTimer; \
-  gettimeofday (&startTimer, (void *) NULL);
 
 int    PARALLEL;

trunk/Ohana/src/photdbc/src/get_mags.c

@@ -22 +22 @@
       catalog[0].secfilt[i*Nsecfilt+j].M  = NAN;
       catalog[0].secfilt[i*Nsecfilt+j].dM = NAN;
-      catalog[0].secfilt[i*Nsecfilt+j].Xm = NAN_S_SHORT;
+      catalog[0].secfilt[i*Nsecfilt+j].Mchisq = NAN;
     }
   }
@@ -56 +56 @@
       Mval = (Nsec == -1) ? &catalog[0].average[i].dM : &catalog[0].secfilt[i*Nsecfilt+Nsec].dM;
       *Mval = stats.sigma;
-      Mval = (Nsec == -1) ? &catalog[0].average[i].Xm : &catalog[0].secfilt[i*Nsecfilt+Nsec].Xm;
-      *Mval = 100.0*log10(stats.chisq);
+      Mval = (Nsec == -1) ? &catalog[0].average[i].Mchisq : &catalog[0].secfilt[i*Nsecfilt+Nsec].Mchisq;
+      *Mval = stats.chisq;
     }
   }

trunk/Ohana/src/photdbc/src/join_stars.c

@@ -3 +3 @@
 void join_stars (Catalog *catalog) {
 
-  off_t i, j, k, m, M, Ni, Nj, first_j, Nfirst;
+  off_t i, j, k, m, Ni, Nj, first_j;
   off_t Naves, Nmeas, Ncurr;
   off_t Naverage, Nmeasure, *index;
@@ -109 +109 @@
         mpointer[Nmeas].measure = m;
         mpointer[Nmeas].averef  = Naves;
-        mpointer[Nmeas].R       = average[Ni].R - measure[m].dR / 3600.0;
-        mpointer[Nmeas].D       = average[Ni].D - measure[m].dD / 3600.0;
+        mpointer[Nmeas].R       = measure[m].R;
+        mpointer[Nmeas].D       = measure[m].D;
         Nmeas ++;
       }
@@ -155 +155 @@
           mpointer[Nmeas].measure = m;
           mpointer[Nmeas].averef  = Ncurr;
-          mpointer[Nmeas].R       = average[Nj].R - measure[m].dR / 3600.0;
-          mpointer[Nmeas].D       = average[Nj].D - measure[m].dD / 3600.0;
+          mpointer[Nmeas].R       = measure[m].R;
+          mpointer[Nmeas].D       = measure[m].D;
           Nmeas ++;
         }
-        Nfirst = average[Nj].Nmeasure;
         naverage[Ncurr].Nmeasure += average[Nj].Nmeasure;
         found[j] = TRUE;
@@ -178 +177 @@
 
         /* update original measurement offsets for new detections */
-        for (k = Nfirst; k < naverage[Ncurr].Nmeasure; k++) {
-          m = naverage[Ncurr].measureOffset + k;
-          M = mpointer[m].measure;
-          measure[M].dR = 3600.0*(Sr - mpointer[m].R);
-          measure[M].dD = 3600.0*(Sd - mpointer[m].D);
-        }
+        // for (k = Nfirst; k < naverage[Ncurr].Nmeasure; k++) {
+        //   m = naverage[Ncurr].measureOffset + k;
+        //   M = mpointer[m].measure;
+        //   measure[M].dR = 3600.0*(Sr - mpointer[m].R);
+        //   measure[M].dD = 3600.0*(Sd - mpointer[m].D);
+        // }
 
         /* update current reference star position */
@@ -189 +188 @@
 # else
         /* update original measurement offsets for new detections */
-        for (k = Nfirst; k < naverage[Ncurr].Nmeasure; k++) {
-          m = naverage[Ncurr].measureOffset + k;
-          M = mpointer[m].measure;
-          measure[M].dR = 3600.0*(naverage[Ncurr].R - mpointer[m].R);
-          measure[M].dD = 3600.0*(naverage[Ncurr].D - mpointer[m].D);
-        }
+        // now not needed measure[M] carries R,D
+        // for (k = Nfirst; k < naverage[Ncurr].Nmeasure; k++) {
+        //   m = naverage[Ncurr].measureOffset + k;
+        //   M = mpointer[m].measure;
+        //   measure[M].dR = 3600.0*(naverage[Ncurr].R - mpointer[m].R);
+        //   measure[M].dD = 3600.0*(naverage[Ncurr].D - mpointer[m].D);
+        // }
 # endif
       }

trunk/Ohana/src/photdbc/src/make_subcatalog.c

@@ -123 +123 @@
       // select measurements by mag limit -- drop exactly this measurement  
       if (ExcludeByInstMag) {
-        mag = PhotInst (&catalog[0].measure[offset]);
+        mag = PhotInst (&catalog[0].measure[offset], MAG_CLASS_PSF);
         if (mag < INST_MAG_MIN) continue;
         if (mag > INST_MAG_MAX) continue;
@@ -135 +135 @@
       // check measurements for this object -- drop object if no measurements pass
       if (ExcludeByMaxMinMag) {
-        mag = PhotSys (&catalog[0].measure[offset], &catalog[0].average[i], &catalog[0].secfilt[i*Nsecfilt]);
+        mag = PhotSys (&catalog[0].measure[offset], &catalog[0].average[i], &catalog[0].secfilt[i*Nsecfilt], MAG_CLASS_PSF);
         minMag = MIN (minMag, mag);
       }