Changeset 40244 for branches/eam_branches/ohana.20170822/src/addstar/src/find_proper.c

Timestamp:

Dec 5, 2017, 6:04:35 AM (9 years ago)

Author:

eugene

Message:

split measure->Mcal into McalPSF and McalAPER

File:

• branches/eam_branches/ohana.20170822/src/addstar/src/find_proper.c (modified) (1 diff)

branches/eam_branches/ohana.20170822/src/addstar/src/find_proper.c

@@ -104 +104 @@
         
         /** add measurements for this star **/
-        catalog[0].measure[Nmeas].dR  = 360000.0*(catalog[0].average[n].R - usno[N].R);
-        catalog[0].measure[Nmeas].dD  = 360000.0*(catalog[0].average[n].D - usno[N].D);
-        catalog[0].measure[Nmeas].M   = 1000.0*fabs(usno[N].r);
-        catalog[0].measure[Nmeas].Mcal= 0;    /* above measurement is exact */
-        catalog[0].measure[Nmeas].dM  = 100;  /* error in input files stored in thousandths of mag */
-        catalog[0].measure[Nmeas].t   = 0;    /* a flag: if 0, image is not in database */
-        catalog[0].measure[Nmeas].averef  = n;
-        catalog[0].measure[Nmeas].photcode = USNO_RED; 
-        catalog[0].measure[Nmeas+1].dR  = catalog[0].measure[Nmeas].dR;
-        catalog[0].measure[Nmeas+1].dD  = catalog[0].measure[Nmeas].dD;
-        catalog[0].measure[Nmeas+1].M   = 1000.0*fabs(usno[N].b);
-        catalog[0].measure[Nmeas+1].Mcal= 0;    /* above measurement is exact */
-        catalog[0].measure[Nmeas+1].dM  = 100;  /* error in input files stored in thousandths of mag */
-        catalog[0].measure[Nmeas+1].t   = 0;    /* a flag: if 0, image is not in database */
-        catalog[0].measure[Nmeas+1].averef  = n;
+        catalog[0].measure[Nmeas].dR         = 360000.0*(catalog[0].average[n].R - usno[N].R);
+        catalog[0].measure[Nmeas].dD         = 360000.0*(catalog[0].average[n].D - usno[N].D);
+        catalog[0].measure[Nmeas].M          = 1000.0*fabs(usno[N].r);
+        catalog[0].measure[Nmeas].McalPSF    = 0;    /* above measurement is exact */
+        catalog[0].measure[Nmeas].McalAPER   = 0;    /* above measurement is exact */
+        catalog[0].measure[Nmeas].dM         = 100;  /* error in input files stored in thousandths of mag */
+        catalog[0].measure[Nmeas].t          = 0;    /* a flag: if 0, image is not in database */
+        catalog[0].measure[Nmeas].averef     = n;
+        catalog[0].measure[Nmeas].photcode   = USNO_RED; 
+        catalog[0].measure[Nmeas+1].dR       = catalog[0].measure[Nmeas].dR;
+        catalog[0].measure[Nmeas+1].dD       = catalog[0].measure[Nmeas].dD;
+        catalog[0].measure[Nmeas+1].M        = 1000.0*fabs(usno[N].b);
+        catalog[0].measure[Nmeas+1].McalPSF  = 0;    /* above measurement is exact */
+        catalog[0].measure[Nmeas+1].McalAPER = 0;    /* above measurement is exact */
+        catalog[0].measure[Nmeas+1].dM       = 100;  /* error in input files stored in thousandths of mag */
+        catalog[0].measure[Nmeas+1].t        = 0;    /* a flag: if 0, image is not in database */
+        catalog[0].measure[Nmeas+1].averef   = n;
         catalog[0].measure[Nmeas+1].photcode = USNO_BLUE; 
         /* add flag in average to mark as matched with the USNO catalog */