Changeset 36979

Timestamp:

Jul 7, 2014, 11:01:24 AM (12 years ago)

Author:

eugene

Message:

change secfilt.Xm to secfilt.Mchisq

Location:

branches/eam_branches/ipp-20140610/Ohana/src

Files:

• checkastro/src/BrightCatalog.c (modified) (5 diffs)
• dvopsps/src/insert_objects_dvopsps_catalog.c (modified) (1 diff)
• opihi/dvo/gstar.c (modified) (1 diff)
• opihi/dvo/imextract.c (modified) (1 diff)
• photdbc/src/get_mags.c (modified) (2 diffs)

branches/eam_branches/ipp-20140610/Ohana/src/checkastro/src/BrightCatalog.c

@@ -258 +258 @@
     GET_COLUMN(M,     "MAG",      float);
     GET_COLUMN(dM,    "MAG_ERR",  float);
-    GET_COLUMN(Xm,    "MAG_CHI",  float);
+    GET_COLUMN(Mchisq,"MAG_CHI",  float);
     GET_COLUMN(flags, "FLAGS",    int);
     GET_COLUMN(Ncode, "NCODE",    short);
@@ -272 +272 @@
       secfilt[i].M     = M[i];         
       secfilt[i].dM    = dM[i];
-      secfilt[i].Xm    = Xm[i];
+      secfilt[i].Mchisq= Mchisq[i];
       secfilt[i].flags = flags[i];
       secfilt[i].Ncode = Ncode[i];
@@ -281 +281 @@
     fprintf (stderr, "loaded data for %lld averages\n", (long long) Nrow);
 
-    free (M    );
-    free (dM   );
-    free (Xm   );
-    free (flags);
-    free (Ncode);
-    free (Nused);
-    free (M_20 );
-    free (M_80 );
+    free (M     );
+    free (dM    );
+    free (Mchisq);
+    free (flags );
+    free (Ncode );
+    free (Nused );
+    free (M_20  );
+    free (M_80  );
     catalog->secfilt = secfilt;
     // assert Nsecfilt * Naverage = Nrow?
@@ -642 +642 @@
     float *M        ; ALLOCATE (M      ,  float, Nsec);
     float *dM       ; ALLOCATE (dM     ,  float, Nsec);
-    float *Xm       ; ALLOCATE (Xm     ,  float, Nsec);
+    float *Mchisq   ; ALLOCATE (Mchisq ,  float, Nsec);
     int   *flags    ; ALLOCATE (flags  ,  int,   Nsec);
     short *Ncode    ; ALLOCATE (Ncode  ,  short, Nsec);
@@ -652 +652 @@
     SecFilt *secfilt = catalog->secfilt;
     for (i = 0; i < Nsec; i++) {
-      M     [i]       = secfilt[i]. M      ;
-      dM    [i]       = secfilt[i]. dM     ;
-      Xm    [i]       = secfilt[i]. Xm     ;
-      flags [i]       = secfilt[i]. flags  ;
-      Ncode [i]       = secfilt[i]. Ncode  ;
-      Nused [i]       = secfilt[i]. Nused  ;
-      M_20  [i]       = secfilt[i]. M_20   ;
-      M_80  [i]       = secfilt[i]. M_80   ;
+      M     [i]       = secfilt[i].M      ;
+      dM    [i]       = secfilt[i].dM     ;
+      Mchisq[i]       = secfilt[i].Mchisq ;
+      flags [i]       = secfilt[i].flags  ;
+      Ncode [i]       = secfilt[i].Ncode  ;
+      Nused [i]       = secfilt[i].Nused  ;
+      M_20  [i]       = secfilt[i].M_20   ;
+      M_80  [i]       = secfilt[i].M_80   ;
     }
 
     // add the columns to the output array
-    gfits_set_bintable_column (&theader, &ftable, "MAG",      M    , Nsec);
-    gfits_set_bintable_column (&theader, &ftable, "MAG_ERR",  dM   , Nsec);
-    gfits_set_bintable_column (&theader, &ftable, "MAG_CHI",  Xm   , Nsec);
-    gfits_set_bintable_column (&theader, &ftable, "FLAGS",    flags, Nsec);
-    gfits_set_bintable_column (&theader, &ftable, "NCODE",    Ncode, Nsec);
-    gfits_set_bintable_column (&theader, &ftable, "NUSED",    Nused, Nsec);
-    gfits_set_bintable_column (&theader, &ftable, "MAG_20",   M_20 , Nsec);
-    gfits_set_bintable_column (&theader, &ftable, "MAG_80",   M_80 , Nsec);
+    gfits_set_bintable_column (&theader, &ftable, "MAG",      M     , Nsec);
+    gfits_set_bintable_column (&theader, &ftable, "MAG_ERR",  dM    , Nsec);
+    gfits_set_bintable_column (&theader, &ftable, "MAG_CHI",  Mchisq, Nsec);
+    gfits_set_bintable_column (&theader, &ftable, "FLAGS",    flags , Nsec);
+    gfits_set_bintable_column (&theader, &ftable, "NCODE",    Ncode , Nsec);
+    gfits_set_bintable_column (&theader, &ftable, "NUSED",    Nused , Nsec);
+    gfits_set_bintable_column (&theader, &ftable, "MAG_20",   M_20  , Nsec);
+    gfits_set_bintable_column (&theader, &ftable, "MAG_80",   M_80  , Nsec);
 
     free (M      );
     free (dM     );
-    free (Xm     );
+    free (Mchisq );
     free (flags  );
     free (Ncode  );

branches/eam_branches/ipp-20140610/Ohana/src/dvopsps/src/insert_objects_dvopsps_catalog.c

@@ -347 +347 @@
     PRINT_FLOAT(sec_buffer, meanKronMagErr,  "%.6f, "); // umag precision
     PRINT_FLOAT(sec_buffer, meanPSFMagErr,   "%.6f, "); // umag precision
-    PRINT_FLOAT(sec_buffer, secfilt->Xm,     "%.6f, ");
+    PRINT_FLOAT(sec_buffer, secfilt->Mchisq, "%.6f, ");
     PRINT_FLOAT(sec_buffer, stackPSFMag,     "%.6f, "); // umag precision
     PRINT_FLOAT(sec_buffer, stackPSFMagErr,  "%.6f, "); // umag precision

branches/eam_branches/ipp-20140610/Ohana/src/opihi/dvo/gstar.c

@@ -565 +565 @@
     case GSTAR_AVE_MAG_CHISQ: /* average mag chisq */
       if (seq == -1) {
-        print_short (NAN_S_SHORT, NAN_S_SHORT);
-      } else {
-        print_short (pow (10.0, 0.01*secfilt[seq].Xm), secfilt[seq].Xm);
+        print_double (NAN);
+      } else {
+        print_double (secfilt[seq].Mchisq);
       }
       break;

branches/eam_branches/ipp-20140610/Ohana/src/opihi/dvo/imextract.c

@@ -185 +185 @@
     gprint (GP_ERR, "  Mcal : photometry calibration (mags)\n");
     gprint (GP_ERR, "  dMcal : photometry calibration error (mags)\n");
-    gprint (GP_ERR, "  Xm : chisq of photometry calibration\n");
+    gprint (GP_ERR, "  Mchisq : chisq of photometry calibration\n");
     gprint (GP_ERR, "  photcode : numeric photcode value for image\n");
     gprint (GP_ERR, "  exptime : exposure duration (seconds)\n");

branches/eam_branches/ipp-20140610/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;
     }
   }