Changeset 35416 for trunk/Ohana/src/relphot/src/bcatalog.c

Timestamp:

Apr 19, 2013, 4:31:05 PM (13 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20130307 : parallelize dvosecfilt, use dvo_average,measure,secfilt_init functions more broadly; move image calibration to relphot_images; add synthetic photometry referece (w-band); put relphot MARKTIME & INITTIME in macros; in dvo_clients, mextract fields which need image data use a subset image metadata table (instead of loading full Images.dat table); create FIELD and MOSAIC fields for mextract; somewhat better rules for photcode:ave & similar selections in mextract; add hpm_* concept in relastro (high-speed proper motions); fix precision errors in dvopsps; check for dvopsps exit conditions; error-bar clipping to limits of plotting window; parallelize delstar -dup-images; do NOT delete parents (because parent IDs are broken after dvomerge); minor handshake when setting up KAPA connection; avextract and related do not need to launch remote jobs on all clients if region does not include tables from all hosts; add fitplx and xsection functions to mana; enable addstar of diff cmfs (at least PS1_DV3)

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/relphot/src/bcatalog.c (modified) (2 diffs)

trunk/Ohana/src/relphot/src/bcatalog.c

@@ -179 +179 @@
         REALLOCATE (subcatalog[0].measureT, MeasureTiny, NMEASURE);
       }
+      myAssert (Nmeasure < NMEASURE, "realloc failure");
     }
 
@@ -204 +205 @@
       continue; 
     }
+
+    // for w-band photometry (& other cases?) convert gri photometry
+    // to a synthetic w-band magnitude
+    add_synthetic_mags (&subcatalog[0].averageT[Naverage], 
+                        &subcatalog[0].secfilt[Nsecfilt*Naverage], 
+                        &subcatalog[0].measureT[Nmeasure],
+                        &Nmeasure,
+                        &Nm);
+    if (Nmeasure == NMEASURE) {
+      NMEASURE += 1000;
+      REALLOCATE (subcatalog[0].measureT, MeasureTiny, NMEASURE);
+    }
+    myAssert (Nmeasure < NMEASURE, "realloc failure");
 
     subcatalog[0].averageT[Naverage].Nmeasure = Nm;