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

Timestamp:

Jun 19, 2014, 8:11:39 AM (12 years ago)

Author:

eugene

Message:

rework dvo db photcode-related selection logic: allow fields of the form mag:psf:inst or g:ave:psf:stk, with arbitrary combinations; PhotInst, etc, now take options for mag class, etc

File:

• branches/eam_branches/ipp-20140610/Ohana/src/opihi/dvo/gstar.c (modified) (1 diff)

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

@@ -374 +374 @@
           int Nv = index[j];
 
-          Mcat = PhotCat (&catalog.measure[Nv]);
+          Mcat = PhotCat (&catalog.measure[Nv], MAG_CLASS_PSF);
           if (INST) {
-            Mrel = PhotInst (&catalog.measure[Nv]);
+            Mrel = PhotInst (&catalog.measure[Nv], MAG_CLASS_PSF);
           } else {
-            Mrel = PhotRel (&catalog.measure[Nv], &catalog.average[k], &catalog.secfilt[k*Nsecfilt]);
+            Mrel = PhotRel (&catalog.measure[Nv], &catalog.average[k], &catalog.secfilt[k*Nsecfilt], MAG_CLASS_PSF);
           }