Changeset 34405 for trunk/Ohana/src/relastro

Timestamp:

Sep 5, 2012, 4:25:56 PM (14 years ago)

Author:

eugene

Message:

merging change from eam_branches/ipp-20120805: adding psfQF, psfQFperf to both average and measure; deprecate average.Xp

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/relastro/src/BrightCatalog.c (modified) (7 diffs)
• src/relastro/src/UpdateObjectOffsets.c (modified) (1 diff)
• src/relastro/src/UpdateObjects.c (modified) (1 diff)
• src/relastro/src/load_catalogs.c (modified) (1 diff)
• src/relastro/src/relastro_objects.c (modified) (1 diff)

trunk/Ohana/src/relastro/src/BrightCatalog.c

@@ -154 +154 @@
     GET_COLUMN(Tmean,          "MEAN_EPOCH",  int);
     GET_COLUMN(Trange,         "TIME_RANGE",  int);
-    GET_COLUMN(Xp,             "SIGMA_POS",   float);
+    GET_COLUMN(stargal,        "STARGAL_SEP", float);
     GET_COLUMN(Npos,           "NUMBER_POS",  short);
     GET_COLUMN(Nmeasure,       "NMEASURE",    short);
@@ -189 +189 @@
       average[i].Tmean           = Tmean[i]           ;
       average[i].Trange          = Trange[i]          ;
-      average[i].Xp              = Xp[i]              ;
+      average[i].stargal         = stargal[i]         ;
       average[i].Npos            = Npos[i]            ;
       average[i].Nmeasure        = Nmeasure[i]        ;
@@ -221 +221 @@
     free (Tmean);
     free (Trange);
-    free (Xp);
+    free (stargal);
     free (Npos);
     free (Nmeasure);
@@ -487 +487 @@
     int      *Tmean         ; ALLOCATE (Tmean         , int     , catalog->Naverage);
     int      *Trange        ; ALLOCATE (Trange        , int     , catalog->Naverage);
-    float    *Xp            ; ALLOCATE (Xp            , float   , catalog->Naverage);
+    float    *stargal       ; ALLOCATE (stargal       , float   , catalog->Naverage);
     short    *Npos          ; ALLOCATE (Npos          , short   , catalog->Naverage);
     short    *Nmeasure      ; ALLOCATE (Nmeasure      , short   , catalog->Naverage);
@@ -520 +520 @@
       Tmean[i]           = average[i].Tmean           ;
       Trange[i]          = average[i].Trange          ;
-      Xp[i]              = average[i].Xp              ;
+      stargal[i]         = average[i].stargal         ;
       Npos[i]            = average[i].Npos            ;
       Nmeasure[i]        = average[i].Nmeasure        ;
@@ -552 +552 @@
     gfits_set_bintable_column (&theader, &ftable, "MEAN_EPOCH",  Tmean,           catalog->Naverage);
     gfits_set_bintable_column (&theader, &ftable, "TIME_RANGE",  Trange,          catalog->Naverage);
-    gfits_set_bintable_column (&theader, &ftable, "SIGMA_POS",   Xp,              catalog->Naverage);
+    gfits_set_bintable_column (&theader, &ftable, "STARGAL_SEP", stargal,         catalog->Naverage);
     gfits_set_bintable_column (&theader, &ftable, "NUMBER_POS",  Npos,            catalog->Naverage);
     gfits_set_bintable_column (&theader, &ftable, "NMEASURE",    Nmeasure,        catalog->Naverage);
@@ -582 +582 @@
     free (Tmean);
     free (Trange);
-    free (Xp);
+    free (stargal);
     free (Npos);
     free (Nmeasure);

trunk/Ohana/src/relastro/src/UpdateObjectOffsets.c

@@ -95 +95 @@
     // RESET (-reset)
     // TimeSelect -time
-    // (note that psfQual is applied rigidly at 0.85, as is the galaxy test)
+    // (note that psfQF is applied rigidly at 0.85, as is the galaxy test)
     // ImagSelect, ImagMin, ImagMax
     // MaxDensityUse, MaxDensityValue

trunk/Ohana/src/relastro/src/UpdateObjects.c

@@ -352 +352 @@
       catalog[i].average[j].dP  = fit.dp; // parallax error in arcsec
 
-      // Xp is supposed to be the position scatter, not the chisq : fix this:
-      // catalog[i].average[j].Xp  = (fit.Nfit > 1) ? 100.0*log10(fit.chisq) : NAN_S_SHORT;
       catalog[i].average[j].ChiSqAve  = fitAve.chisq;
       catalog[i].average[j].ChiSqPM   = fitPM.chisq;
       catalog[i].average[j].ChiSqPar  = fitPAR.chisq;
-      catalog[i].average[j].Xp        = 0.0;
       catalog[i].average[j].Tmean = (Tmean * 86400 * 365.26) + T2000;
       catalog[i].average[j].Trange = (Trange * 86400 * 365.26);

trunk/Ohana/src/relastro/src/load_catalogs.c

@@ -137 +137 @@
     // RESET (-reset)
     // TimeSelect -time
-    // (note that psfQual is applied rigidly at 0.85, as is the galaxy test)
+    // (note that psfQF is applied rigidly at 0.85, as is the galaxy test)
     // ImagSelect, ImagMin, ImagMax
     // MaxDensityUse, MaxDensityValue

trunk/Ohana/src/relastro/src/relastro_objects.c

@@ -123 +123 @@
     // RESET (-reset)
     // TimeSelect -time
-    // (note that psfQual is applied rigidly at 0.85, as is the galaxy test)
+    // (note that psfQF is applied rigidly at 0.85, as is the galaxy test)
     // ImagSelect, ImagMin, ImagMax
     // MaxDensityUse, MaxDensityValue