Changeset 40266

Timestamp:

Dec 9, 2017, 11:32:09 AM (9 years ago)

Author:

eugene

Message:

report Mrel:kron,aper in gstar; fix wording for SECF flags

Location:

branches/eam_branches/ohana.20170822/src

Files:

• libdvo/include/dvo.h (modified) (1 diff)
• opihi/dvo/gstar.c (modified) (1 diff)

branches/eam_branches/ohana.20170822/src/libdvo/include/dvo.h

@@ -235 +235 @@
   ID_SECF_RANK_4                 = 0x00001000, // average magnitude uses rank 4 values
   ID_SECF_OBJ_EXT_PSPS           = 0x00002000, // In PSPS ID_SECF_OBJ_EXT is moved here so it fits within 16 bits 
-  ID_SECF_STACK_PRIMARY          = 0x00004000, // PS1 stack photometry comes from primary skycell
+  ID_SECF_STACK_PRIMARY          = 0x00004000, // PS1 stack photometry includes a primary skycell
   ID_SECF_STACK_BESTDET          = 0x00008000, // PS1 stack best measurement is a detection (not forced)
   ID_SECF_STACK_PRIMDET          = 0x00010000, // PS1 stack primary measurement is a detection (not forced)

branches/eam_branches/ohana.20170822/src/opihi/dvo/gstar.c

@@ -763 +763 @@
               gprint (GP_LOG, "%6.3f ", catalog.measure[Nv].McalAPER);
               gprint (GP_LOG, "%6.3f ", catalog.measure[Nv].Mflat);
-              gprint (GP_LOG, "%6.3f ", catalog.measure[Nv].Map);
-              gprint (GP_LOG, "%6.3f ", catalog.measure[Nv].Mkron);
+              Mrel = PhotRel (&catalog.measure[Nv], &catalog.average[k], &catalog.secfilt[k*Nsecfilt], MAG_CLASS_APER);
+              gprint (GP_LOG, "%6.3f ", Mrel);
+              Mrel = PhotRel (&catalog.measure[Nv], &catalog.average[k], &catalog.secfilt[k*Nsecfilt], MAG_CLASS_KRON);
+              gprint (GP_LOG, "%6.3f ", Mrel);
               gprint (GP_LOG, "%6.3f ", catalog.measure[Nv].dMkron);
               gprint (GP_LOG, "%5.1f ", pow(10.0, 0.4*catalog.measure[Nv].dt));