Changeset 40291 for trunk/Ohana/src/checkastro

Timestamp:

Dec 13, 2017, 10:53:48 AM (9 years ago)

Author:

eugene

Message:

merge EAM development branch changes for DR2 into trunk (add PS1_V6 dvo format; change Mcal to McalPSF, McalAPER; change opihi int vectors to 64bit)

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/checkastro/src/BrightCatalog.c (modified) (9 diffs)

trunk/Ohana/src/checkastro/src/BrightCatalog.c

@@ -71 +71 @@
     GET_COLUMN(dD,        "DEC_OFF",    float);
     GET_COLUMN(M,         "MAG_SYS",    float);
-    GET_COLUMN(Mcal,      "MAG_CAL",    float);
+    GET_COLUMN(McalPSF,   "MCAL_PSF",   float);
+    GET_COLUMN(McalAPER,  "MCAL_APER",  float);
     GET_COLUMN(dM,        "MAG_ERR",    float);
     GET_COLUMN(airmass,   "AIRMASS",    float);
@@ -95 +96 @@
       measure[i].dD        = dD[i];
       measure[i].M         = M[i];
-      measure[i].Mcal      = Mcal[i];
+      measure[i].McalPSF   = McalPSF[i];
+      measure[i].McalAPER  = McalAPER[i];
       measure[i].dM        = dM[i];
       measure[i].airmass   = airmass[i];
@@ -116 +118 @@
     free (dD      );
     free (M       );
-    free (Mcal    );
+    free (McalPSF );
+    free (McalAPER);
     free (dM      );
     free (airmass );
@@ -270 +273 @@
     ALLOCATE (secfilt, SecFilt, Nrow);
     for (i = 0; i < Nrow; i++) {
-      secfilt[i].M     = M[i];         
-      secfilt[i].dM    = dM[i];
-      secfilt[i].Mchisq= Mchisq[i];
-      secfilt[i].flags = flags[i];
-      secfilt[i].Ncode = Ncode[i];
-      secfilt[i].Nused = Nused[i];
-      secfilt[i].M_20  = M_20[i];
-      secfilt[i].M_80  = M_80[i];
+      secfilt[i].MpsfChp  = M[i];         
+      secfilt[i].dMpsfChp = dM[i];
+      secfilt[i].Mchisq   = Mchisq[i];
+      secfilt[i].flags    = flags[i];
+      secfilt[i].Ncode    = Ncode[i];
+      secfilt[i].Nused    = Nused[i];
+      secfilt[i].M_20     = M_20[i];
+      secfilt[i].M_80     = M_80[i];
     }
     fprintf (stderr, "loaded data for %lld averages\n", (long long) Nrow);
@@ -366 +369 @@
     float *dD        ; ALLOCATE (dD       ,  float, catalog->Nmeasure);
     float *M         ; ALLOCATE (M        ,  float, catalog->Nmeasure);
-    float *Mcal      ; ALLOCATE (Mcal     ,  float, catalog->Nmeasure);
+    float *McalPSF   ; ALLOCATE (McalPSF  ,  float, catalog->Nmeasure);
+    float *McalAPER  ; ALLOCATE (McalAPER ,  float, catalog->Nmeasure);
     float *dM        ; ALLOCATE (dM       ,  float, catalog->Nmeasure);
     float *airmass   ; ALLOCATE (airmass  ,  float, catalog->Nmeasure);
@@ -388 +392 @@
       dD[i]       = measure[i].dD       ;
       M[i]        = measure[i].M        ;
-      Mcal[i]     = measure[i].Mcal     ;
+      McalPSF[i]  = measure[i].McalPSF  ;
+      McalAPER[i] = measure[i].McalAPER ;
       dM[i]       = measure[i].dM       ;
       airmass[i]  = measure[i].airmass  ;
@@ -409 +414 @@
     gfits_set_bintable_column (&theader, &ftable, "DEC_OFF",    dD,        catalog->Nmeasure);
     gfits_set_bintable_column (&theader, &ftable, "MAG_SYS",    M,         catalog->Nmeasure);
-    gfits_set_bintable_column (&theader, &ftable, "MAG_CAL",    Mcal,      catalog->Nmeasure);
+    gfits_set_bintable_column (&theader, &ftable, "MCAL_PSF",   McalPSF,   catalog->Nmeasure);
+    gfits_set_bintable_column (&theader, &ftable, "MCAL_APER",  McalAPER,  catalog->Nmeasure);
     gfits_set_bintable_column (&theader, &ftable, "MAG_ERR",    dM,        catalog->Nmeasure);
     gfits_set_bintable_column (&theader, &ftable, "AIRMASS",    airmass,   catalog->Nmeasure);
@@ -428 +434 @@
     free (dD      );
     free (M       );
-    free (Mcal    );
+    free (McalPSF );
+    free (McalAPER);
     free (dM      );
     free (airmass );
@@ -652 +659 @@
     SecFilt *secfilt = catalog->secfilt;
     for (i = 0; i < Nsec; i++) {
-      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   ;
+      M     [i]       = secfilt[i].MpsfChp ;
+      dM    [i]       = secfilt[i].dMpsfChp;
+      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    ;
     }