Changeset 38101

Timestamp:

Apr 9, 2015, 8:47:31 AM (11 years ago)

Author:

eugene

Message:

set R5,R6,R7 to use the SDSS apertures 5, 6, 7 = psphot cmf 2, 3, 4

Location:

branches/eam_branches/ipp-20150405/Ohana/src

Files:

• addstar/src/ReadXradFITS.c (modified) (1 diff)
• kapa2/src/InterpretKeys.c (modified) (2 diffs)

branches/eam_branches/ipp-20150405/Ohana/src/addstar/src/ReadXradFITS.c

@@ -72 +72 @@
     }
 
-    stars[i].lensing-> F_ApR5 = AperFlux   [Nap*Ncol + 3];
-    stars[i].lensing->dF_ApR5 = AperFluxErr[Nap*Ncol + 3];
-    stars[i].lensing->sF_ApR5 = AperFluxStd[Nap*Ncol + 3];
-    stars[i].lensing->fF_ApR5 = AperFill   [Nap*Ncol + 3];
+    // XXX this is all hard-wired and should make use of the headers. 
+    // psphot cmfs have 5 radial apertures:
+    // array 0, 1, 2, 3, 4
+    // SDSS  3, 4, 5, 6, 7
 
-    stars[i].lensing-> F_ApR6 = AperFlux   [Nap*Ncol + 4];
-    stars[i].lensing->dF_ApR6 = AperFluxErr[Nap*Ncol + 4];
-    stars[i].lensing->sF_ApR6 = AperFluxStd[Nap*Ncol + 4];
-    stars[i].lensing->fF_ApR6 = AperFill   [Nap*Ncol + 4];
+    stars[i].lensing-> F_ApR5 = AperFlux   [Nap*Ncol + 2];
+    stars[i].lensing->dF_ApR5 = AperFluxErr[Nap*Ncol + 2];
+    stars[i].lensing->sF_ApR5 = AperFluxStd[Nap*Ncol + 2];
+    stars[i].lensing->fF_ApR5 = AperFill   [Nap*Ncol + 2];
+
+    stars[i].lensing-> F_ApR6 = AperFlux   [Nap*Ncol + 3];
+    stars[i].lensing->dF_ApR6 = AperFluxErr[Nap*Ncol + 3];
+    stars[i].lensing->sF_ApR6 = AperFluxStd[Nap*Ncol + 3];
+    stars[i].lensing->fF_ApR6 = AperFill   [Nap*Ncol + 3];
+
+    stars[i].lensing-> F_ApR7 = AperFlux   [Nap*Ncol + 4];
+    stars[i].lensing->dF_ApR7 = AperFluxErr[Nap*Ncol + 4];
+    stars[i].lensing->sF_ApR7 = AperFluxStd[Nap*Ncol + 4];
+    stars[i].lensing->fF_ApR7 = AperFill   [Nap*Ncol + 4];
     Nap ++;
   }

branches/eam_branches/ipp-20150405/Ohana/src/kapa2/src/InterpretKeys.c

@@ -1 +1 @@
 # include "Ximage.h"
+# define FILTER_MODS 1
 
 int InterpretKeys (Graphic *graphic, XKeyEvent *event) {
@@ -32 +33 @@
     // skip the following keys: 
     if (name == NULL) goto skip_cursor;
-    if (!strcmp (name, "Shift_L")) goto skip_cursor;
-    if (!strcmp (name, "Shift_R")) goto skip_cursor;
-    if (!strcmp (name, "Control_L")) goto skip_cursor;
-    if (!strcmp (name, "Control_R")) goto skip_cursor;
-    if (!strcmp (name, "Alt_L")) goto skip_cursor;
-    if (!strcmp (name, "Alt_R")) goto skip_cursor;
-    if (!strcmp (name, "Super_L")) goto skip_cursor;
-    if (!strcmp (name, "Super_R")) goto skip_cursor;
-    if (!strcmp (name, "Caps_Lock")) goto skip_cursor;
-    if (!strcmp (name, "Pause")) goto skip_cursor;
-    if (!strcmp (name, "Continue")) goto skip_cursor;
-    if (!strcmp (name, "Num_Lock")) goto skip_cursor;
-    if (!strcmp (name, "Scroll_Lock")) goto skip_cursor;
-    if (!strcmp (name, "Print")) goto skip_cursor;
-    if (!strcmp (name, "(null)")) goto skip_cursor;
+    if (FILTER_MODS) {
+      if (!strcmp (name, "Shift_L")) goto skip_cursor;
+      if (!strcmp (name, "Shift_R")) goto skip_cursor;
+      if (!strcmp (name, "Control_L")) goto skip_cursor;
+      if (!strcmp (name, "Control_R")) goto skip_cursor;
+      if (!strcmp (name, "Alt_L")) goto skip_cursor;
+      if (!strcmp (name, "Alt_R")) goto skip_cursor;
+      if (!strcmp (name, "Super_L")) goto skip_cursor;
+      if (!strcmp (name, "Super_R")) goto skip_cursor;
+      if (!strcmp (name, "Caps_Lock")) goto skip_cursor;
+      if (!strcmp (name, "Pause")) goto skip_cursor;
+      if (!strcmp (name, "Continue")) goto skip_cursor;
+      if (!strcmp (name, "Num_Lock")) goto skip_cursor;
+      if (!strcmp (name, "Scroll_Lock")) goto skip_cursor;
+      if (!strcmp (name, "Print")) goto skip_cursor;
+      if (!strcmp (name, "(null)")) goto skip_cursor;
+    }
 
     Z = -1;