Changeset 39142 for trunk/Ohana/src/dvomerge/src/merge_catalogs_old.c

Timestamp:

Nov 15, 2015, 10:13:54 AM (11 years ago)

Author:

eugene

Message:

add galphot to the merge options

File:

• trunk/Ohana/src/dvomerge/src/merge_catalogs_old.c (modified) (9 diffs)

trunk/Ohana/src/dvomerge/src/merge_catalogs_old.c

@@ -14 +14 @@
   double *X1, *Y1, *X2, *Y2;
   double dX, dY, dR;
-  off_t *N1, *N2, *next_meas, *next_lens, *next_star;
-  off_t Nave, NAVE, Nmeas, NMEAS, Nmatch, Nlens, NLENS, Nstar, NSTAR;
+  off_t *N1, *N2, *next_meas, *next_lens, *next_star, *next_galp;
+  off_t Nave, NAVE, Nmeas, NMEAS, Nmatch, Nlens, NLENS, Nstar, NSTAR, Ngalp, NGALP;
   int NsecfiltIn;
   int NsecfiltOut;
@@ -199 +199 @@
       NGALP = Ngalp + input[0].average[N].Ngalphot + 1000;
       REALLOCATE (next_galp, off_t, NGALP);
-      REALLOCATE (output[0].galphot, Galphot, NGALP);
+      REALLOCATE (output[0].galphot, GalPhot, NGALP);
     }
 
@@ -222 +222 @@
       if (REPLACE_BY_PHOTCODE) {
         // index to first measure for this object
-        // XXX this does not support lensing measurements
+        // XXX this does not support lensing, starpar, or galphot measurements
         if (replace_match (&output[0].average[n], output[0].measure, next_meas, &input[0].average[N], &input[0].measure[offset])) {
           input[0].found_t[N] = output[0].average[n].measureOffset;  
@@ -315 +315 @@
     }
 
+    // if galphot measurements exist, add them too
+    if (output[0].galphot) {
+      for (Nin = 0; Nin < input[0].average[N].Ngalphot; Nin++) {
+        /* add to end of galphot list */
+        add_galp_link (&output[0].average[n], next_galp, Ngalp, NGALP);
+        
+        // set the new galphot
+        off_t galpoff = input[0].average[N].galphotOffset + Nin;
+        output[0].galphot[Ngalp] = input[0].galphot[galpoff];
+
+        output[0].galphot[Ngalp].averef   = n;
+        output[0].galphot[Ngalp].objID    = output[0].average[n].objID;
+        output[0].galphot[Ngalp].catID    = output[0].catID;
+        output[0].average[n].Ngalphot ++;
+        Ngalp ++;
+      }
+    }
+
     // update the average properties to reflect the incoming entries:
     // if the original value is NAN but the input value is not, accept the input:
@@ -365 +383 @@
       REALLOCATE (output[0].starpar, StarPar, NSTAR);
     }
+    if (Ngalp + input[0].average[N].Ngalphot >= NGALP) {
+      NGALP = Ngalp + input[0].average[N].Ngalphot + 1000;
+      REALLOCATE (next_galp, off_t, NGALP);
+      REALLOCATE (output[0].galphot, GalPhot, NGALP);
+    }
     if (Nave >= NAVE) {
       NAVE = Nave + 1000;
@@ -488 +511 @@
     }
 
+    /** add galphot for this input average object **/
+    if (output[0].galphot) {
+      output[0].average[Nave].galphotOffset  = Ngalp;
+      for (Nin = 0; Nin < input[0].average[N].Ngalphot; Nin ++) {
+        // supply the galphot values from this detection
+        off_t galpoff = input[0].average[N].galphotOffset + Nin;
+        output[0].galphot[Ngalp]           = input[0].galphot[galpoff];
+
+        // the following galphot elements cannot be set until here:
+        output[0].galphot[Ngalp].averef   = Nave;
+        output[0].galphot[Ngalp].objID    = output[0].average[Nave].objID;
+        output[0].galphot[Ngalp].catID    = output[0].catID;
+
+        // as we add galphot, update Ngalphot to match
+        output[0].average[Nave].Ngalphot ++;
+
+        /* we set next[Ngalp] to -1 here, and update correctly below */
+        next_galp[Ngalp] = -1;
+        Ngalp ++;
+      }
+      int Ngroup = input[0].average[N].Ngalphot;
+      for (j = 0; j < Ngroup - 1; j++) {
+        next_galp[Ngalp - Ngroup + j] = Ngalp - Ngroup + j + 1;
+      }
+    }
+
     Nave ++;
   }
@@ -497 +546 @@
   REALLOCATE (output[0].lensing, Lensing, Nlens);
   REALLOCATE (output[0].starpar, StarPar, Nstar);
+  REALLOCATE (output[0].galphot, GalPhot, Ngalp);
  
 # define NOSORT 0
@@ -506 +556 @@
     output[0].lensing = sort_lensing (output[0].average, Nave, output[0].lensing, Nlens, next_lens);
     output[0].starpar = sort_starpar (output[0].average, Nave, output[0].starpar, Nstar, next_star);
+    output[0].galphot = sort_galphot (output[0].average, Nave, output[0].galphot, Ngalp, next_galp);
   }
 
@@ -523 +574 @@
   output[0].Nlensing = Nlens;
   output[0].Nstarpar = Nstar;
+  output[0].Ngalphot = Ngalp;
   output[0].Nsecfilt_mem = Nave*NsecfiltOut;
-  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas, Nlens: "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT", ("OFF_T_FMT" matches)\n",  Nstars,  Nave,  Nmeas,  Nlens, Nmatch);
+  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas, Nlens, Ngalp: "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT", ("OFF_T_FMT" matches)\n",  Nstars,  Nave,  Nmeas,  Nlens, Ngalp, Nmatch);
 
   free (next_meas);
   free (next_lens);
   free (next_star);
+  free (next_galp);
 
   free (X2);