Changeset 34223

Timestamp:

Jul 30, 2012, 8:35:56 PM (14 years ago)

Author:

eugene

Message:

calling init functions for average, secfilt, measure

Location:

branches/eam_branches/ipp-20120627/Ohana/src/addstar/src

Files:

• find_matches.c (modified) (2 diffs)
• find_matches_closest.c (modified) (1 diff)
• find_matches_closest_refstars.c (modified) (1 diff)
• find_matches_refstars.c (modified) (1 diff)

branches/eam_branches/ipp-20120627/Ohana/src/addstar/src/find_matches.c

@@ -250 +250 @@
     if (!IN_REGION (stars[i].average.R, stars[i].average.D)) continue;
 
+    InitAverage (&catalog[0].average[Nave]);
     catalog[0].average[Nave].R             = stars[i].average.R;
     catalog[0].average[Nave].D             = stars[i].average.D;
-    catalog[0].average[Nave].dR            = 0;
-    catalog[0].average[Nave].dD            = 0;
-
     catalog[0].average[Nave].Nmeasure      = NSTAR_GROUP;
-    catalog[0].average[Nave].Nmissing      = 0;
-    catalog[0].average[Nave].Nextend       = 0;
-
     catalog[0].average[Nave].measureOffset = Nmeas;
-    catalog[0].average[Nave].missingOffset = -1;
-    catalog[0].average[Nave].extendOffset  = -1;
-
-    catalog[0].average[Nave].uR            = 0;
-    catalog[0].average[Nave].uD            = 0;
-    catalog[0].average[Nave].duR           = 0;
-    catalog[0].average[Nave].duD           = 0;
-    catalog[0].average[Nave].P             = 0;
-    catalog[0].average[Nave].dP            = 0;
-
-    catalog[0].average[Nave].Xp            = 0;
-    catalog[0].average[Nave].ChiSqAve      = 0.0;
-    catalog[0].average[Nave].ChiSqPM       = 0.0;
-    catalog[0].average[Nave].ChiSqPar      = 0.0;
-    catalog[0].average[Nave].Tmean         = 0;
-    catalog[0].average[Nave].Trange        = 0;
-    catalog[0].average[Nave].Npos          = 0;
-
     catalog[0].average[Nave].objID         = objID;
     catalog[0].average[Nave].catID         = catID;
-    catalog[0].average[Nave].flags         = 0;
+
     if (PSPS_ID) {
         catalog[0].average[Nave].extID = CreatePSPSObjectID(catalog[0].average[Nave].R,
@@ -291 +268 @@
 
     for (j = 0; j < Nsecfilt; j++) {
-      catalog[0].secfilt[Nave*Nsecfilt+j].M           = NAN;
-      catalog[0].secfilt[Nave*Nsecfilt+j].Map         = NAN;
-      catalog[0].secfilt[Nave*Nsecfilt+j].dM          = NAN;
-      catalog[0].secfilt[Nave*Nsecfilt+j].Mstdev      = NAN_S_SHORT;
-      catalog[0].secfilt[Nave*Nsecfilt+j].Xm          = NAN_S_SHORT;
-      catalog[0].secfilt[Nave*Nsecfilt+j].M_20        = NAN_S_SHORT;
-      catalog[0].secfilt[Nave*Nsecfilt+j].M_80        = NAN_S_SHORT;
-      catalog[0].secfilt[Nave*Nsecfilt+j].Ncode       = 0;
-      catalog[0].secfilt[Nave*Nsecfilt+j].Nused       = 0;
-      catalog[0].secfilt[Nave*Nsecfilt+j].ubercalDist = 1000;
-      catalog[0].secfilt[Nave*Nsecfilt+j].flags       = 0;
+      InitSecFilt (&catalog[0].secfilt[Nave*Nsecfilt+j]);
     }
 

branches/eam_branches/ipp-20120627/Ohana/src/addstar/src/find_matches_closest.c

@@ -292 +292 @@
 
     for (j = 0; j < Nsecfilt; j++) {
-      catalog[0].secfilt[Nave*Nsecfilt+j].M           = NAN;
-      catalog[0].secfilt[Nave*Nsecfilt+j].Map         = NAN;
-      catalog[0].secfilt[Nave*Nsecfilt+j].dM          = NAN;
-      catalog[0].secfilt[Nave*Nsecfilt+j].Mstdev      = NAN_S_SHORT;
-      catalog[0].secfilt[Nave*Nsecfilt+j].Xm          = NAN_S_SHORT;
-      catalog[0].secfilt[Nave*Nsecfilt+j].M_20        = NAN_S_SHORT;
-      catalog[0].secfilt[Nave*Nsecfilt+j].M_80        = NAN_S_SHORT;
-      catalog[0].secfilt[Nave*Nsecfilt+j].Ncode       = 0;
-      catalog[0].secfilt[Nave*Nsecfilt+j].Nused       = 0;
-      catalog[0].secfilt[Nave*Nsecfilt+j].ubercalDist = 1000;
-      catalog[0].secfilt[Nave*Nsecfilt+j].flags       = 0;
+      InitSecFilt (&catalog[0].secfilt[Nave*Nsecfilt+j]);
     }
 

branches/eam_branches/ipp-20120627/Ohana/src/addstar/src/find_matches_closest_refstars.c

@@ -308 +308 @@
 
     for (j = 0; j < Nsecfilt; j++) {
-      catalog[0].secfilt[Nave*Nsecfilt+j].M     = NAN;
-      catalog[0].secfilt[Nave*Nsecfilt+j].dM    = NAN;
-      catalog[0].secfilt[Nave*Nsecfilt+j].Xm    = NAN_S_SHORT;
-      catalog[0].secfilt[Nave*Nsecfilt+j].M_20  = NAN_S_SHORT;
-      catalog[0].secfilt[Nave*Nsecfilt+j].M_80  = NAN_S_SHORT;
-      catalog[0].secfilt[Nave*Nsecfilt+j].Ncode = 0;
-      catalog[0].secfilt[Nave*Nsecfilt+j].Nused = 0;
+      InitSecFilt (&catalog[0].secfilt[Nave*Nsecfilt+j]);
     }
 

branches/eam_branches/ipp-20120627/Ohana/src/addstar/src/find_matches_refstars.c

@@ -281 +281 @@
 
     for (j = 0; j < Nsecfilt; j++) {
-      catalog[0].secfilt[Nave*Nsecfilt+j].M     = NAN;
-      catalog[0].secfilt[Nave*Nsecfilt+j].dM    = NAN;
-      catalog[0].secfilt[Nave*Nsecfilt+j].Xm    = NAN_S_SHORT;
-      catalog[0].secfilt[Nave*Nsecfilt+j].M_20  = NAN_S_SHORT;
-      catalog[0].secfilt[Nave*Nsecfilt+j].M_80  = NAN_S_SHORT;
-      catalog[0].secfilt[Nave*Nsecfilt+j].Ncode = 0;
-      catalog[0].secfilt[Nave*Nsecfilt+j].Nused = 0;
+      InitSecFilt (&catalog[0].secfilt[Nave*Nsecfilt+j]);
     }