Changeset 37038 for trunk/Ohana/src/relastro/src/high_speed_objects.c

Timestamp:

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

Author:

eugene

Message:

lots of changes to replace measure.dR,dD with measure.R.D; updates to handle stack vs mean; ps1_v5 changes required

File:

• trunk/Ohana/src/relastro/src/high_speed_objects.c (modified) (2 diffs)

trunk/Ohana/src/relastro/src/high_speed_objects.c

@@ -241 +241 @@
           for(i1=0;i1<catalog[0].average[nv[l]].Nmeasure;i1++) {
               catalogOut.measure[Nmatchmeas]=catalog[0].measure[m+i1];
-              /*Set offset RA and Dec wrt correct average value*/
-              catalogOut.measure[Nmatchmeas].dR=catalog[0].measure[m+i1].dR+3600.0*(catalog[0].average[nv[0]].R-catalog[0].average[nv[l]].R);
-              catalogOut.measure[Nmatchmeas].dD=catalog[0].measure[m+i1].dD+3600.0*(catalog[0].average[nv[0]].D-catalog[0].average[nv[l]].D);
+              // DROP no longer necessary to repoint R,D
+              // catalogOut.measure[Nmatchmeas].dR=catalog[0].measure[m+i1].dR+3600.0*(catalog[0].average[nv[0]].R-catalog[0].average[nv[l]].R);
+              // catalogOut.measure[Nmatchmeas].dD=catalog[0].measure[m+i1].dD+3600.0*(catalog[0].average[nv[0]].D-catalog[0].average[nv[l]].D);
               catalogOut.measure[Nmatchmeas].averef = Nmatch;
               Nmatchmeasobj++;
@@ -297 +297 @@
   // XXX require a set or not?  assert (Nset > 0);
 
-  if (!finite(measure[0].dR)) return FALSE;
-  if (!finite(measure[0].dD)) return FALSE;
-  if (!finite(measure[0].M))  return FALSE;
+  if (!finite(measure[0].R)) return FALSE;
+  if (!finite(measure[0].D)) return FALSE;
+  if (!finite(measure[0].M)) return FALSE;
   
   float dX = GetAstromError (measure, ERROR_MODE_RA);