Changeset 37907

Timestamp:

Feb 13, 2015, 3:06:58 PM (11 years ago)

Author:

eugene

Message:

include all diff measurements in primary skycell; add mode to distinguish diff and stack/warp

Location:

trunk/Ohana/src/relphot

Files:

• include/relphot.h (modified) (1 diff)
• src/args.c (modified) (2 diffs)
• src/extra.c (modified) (1 diff)
• src/reload_catalogs.c (modified) (1 diff)
• src/setMrelCatalog.c (modified) (5 diffs)

trunk/Ohana/src/relphot/include/relphot.h

@@ -191 +191 @@
 
 int SET_MREL_VERSION;
+int IS_DIFF_DB;
 
 double MAG_LIM;

trunk/Ohana/src/relphot/src/args.c

@@ -64 +64 @@
   }
 
+  IS_DIFF_DB = FALSE;
+  if ((N = get_argument (argc, argv, "-is-diff-db"))) {
+    remove_argument (N, &argc, argv);
+    IS_DIFF_DB = TRUE;
+  }
+
   USE_FULL_OVERLAP = TRUE;
   if ((N = get_argument (argc, argv, "-sloppy-image-overlap"))) {
@@ -499 +505 @@
     UserPatch.Dmax = atof (argv[N]);
     remove_argument (N, &argc, argv);
+  }
+
+  IS_DIFF_DB = FALSE;
+  if ((N = get_argument (argc, argv, "-is-diff-db"))) {
+    remove_argument (N, &argc, argv);
+    IS_DIFF_DB = TRUE;
   }
 

trunk/Ohana/src/relphot/src/extra.c

@@ -30 +30 @@
 int isGPC1warp (int photcode) {
 
+  // diff warps get stack-like photcodes (kind of lame)
+  if (IS_DIFF_DB) {
+    if (photcode == 11000) return TRUE; // g-band
+    if (photcode == 11100) return TRUE; // r-band
+    if (photcode == 11200) return TRUE; // i-band
+    if (photcode == 11300) return TRUE; // z-band
+    if (photcode == 11400) return TRUE; // y-band
+    if (photcode == 11500) return TRUE; // w-band
+    return FALSE;
+  }
+
   if (photcode == 12000) return TRUE; // g-band
   if (photcode == 12100) return TRUE; // r-band

trunk/Ohana/src/relphot/src/reload_catalogs.c

@@ -226 +226 @@
     if (RESET_ZEROPTS)    { snprintf (tmpline, 1024, "%s -reset-zpts",          command);                                         strcpy (command, tmpline); }
     if (UPDATE)           { snprintf (tmpline, 1024, "%s -update",              command);                                         strcpy (command, tmpline); }
+    if (IS_DIFF_DB)       { snprintf (tmpline, 1024, "%s -is-diff-db",          command);                                         strcpy (command, tmpline); }
     if (!KEEP_UBERCAL)    { snprintf (tmpline, 1024, "%s -reset-ubercal",       command);                                         strcpy (command, tmpline); }
     if (UPDATE_CATFORMAT) { snprintf (tmpline, 1024, "%s -update-catformat %s", command, UPDATE_CATFORMAT);                       strcpy (command, tmpline); }

trunk/Ohana/src/relphot/src/setMrelCatalog.c

@@ -62 +62 @@
 
     // only apply Stack operation on setMrelFinal in first pass 
-    if (isSetMrelFinal && (pass == 0)) {
+    if (isSetMrelFinal && (pass == 0) && !IS_DIFF_DB) {
       setMrelAverageStack (m, Nc, flatcorr, results, average, secfilt, &catalog[Nc].measure[m], catalog[Nc].Nmeasure);
       setGlobalObjStats (&catalog[Nc].average[j], &catalog[Nc].measure[m]);
@@ -703 +703 @@
   }
 
+  // for a diff db, we just want primary, if available or not
+  int priTessID, priProjID, priSkycellID;
+  if (IS_DIFF_DB) {
+    get_tess_ids(&priTessID, &priProjID, &priSkycellID, average[0].R, average[0].D);
+  }
+
   int Ns;
   for (Ns = 0; Ns < Nphotcodes; Ns++) {
@@ -718 +724 @@
     int stkTessID, stkProjID, stkSkycellID;
 
-    myAssert (secfilt[Nsec].stackBestOff <= Nmeasure, "stackBestOff out of range");
-    if (!FindImageSkycellID (secfilt[Nsec].stackBestOff, cat, &stkTessID, &stkProjID, &stkSkycellID)) continue;
+    if (!IS_DIFF_DB) {
+      myAssert (secfilt[Nsec].stackBestOff <= Nmeasure, "stackBestOff out of range");
+      if (!FindImageSkycellID (secfilt[Nsec].stackBestOff, cat, &stkTessID, &stkProjID, &stkSkycellID)) continue;
+    }
 
     off_t meas = measureOffset;
@@ -744 +752 @@
       measure[k].dbFlags &= ~ID_MEAS_WARP_USED;
 
-      if (!MatchImageSkycellID (meas, cat, stkTessID, stkProjID, stkSkycellID)) continue;
-
+      if (IS_DIFF_DB) {
+        if (!MatchImageSkycellID (meas, cat, priTessID, priProjID, priSkycellID)) continue;
+      } else {
+        if (!MatchImageSkycellID (meas, cat, stkTessID, stkProjID, stkSkycellID)) continue;
+      }
+ 
       if (measure[k].dbFlags & MEAS_BAD) SKIP_THIS_MEAS(Nbad); 
 
@@ -811 +823 @@
       }
     }
-    if (Npsf < 1) continue;
+    if (Npsf < 1) {
+      secfilt[Nsec].Nwarp        = Nwarp;
+      secfilt[Nsec].NwarpGood    = NwarpGood;
+      secfilt[Nsec].NusedWrp     = Npsf;
+      secfilt[Nsec].NusedApWrp   = Nap;
+      secfilt[Nsec].NusedKronWrp = Nkron;
+      continue;
+    }
 
     found[Nsec] = TRUE;