Changeset 38993 for trunk

Timestamp:

Oct 28, 2015, 2:37:56 PM (11 years ago)

Author:

eugene

Message:

accept SIMTEST photcodes for chip/stack/warp

File:

• trunk/Ohana/src/relphot/src/extra.c (modified) (4 diffs)

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

@@ -4 +4 @@
 int whichGPC1filter (int photcode) {
 
-  if ((photcode > 10000) && (photcode < 10077)) return PS1_g; // g-band
-  if ((photcode > 10100) && (photcode < 10177)) return PS1_r; // r-band
-  if ((photcode > 10200) && (photcode < 10277)) return PS1_i; // i-band
-  if ((photcode > 10300) && (photcode < 10377)) return PS1_z; // z-band
-  if ((photcode > 10400) && (photcode < 10477)) return PS1_y; // y-band
-  if ((photcode > 10500) && (photcode < 10577)) return PS1_w; // w-band
+  if (((photcode > 10000) && (photcode < 10077)) || (photcode == 4100)) return PS1_g; // g-band
+  if (((photcode > 10100) && (photcode < 10177)) || (photcode == 4200)) return PS1_r; // r-band
+  if (((photcode > 10200) && (photcode < 10277)) || (photcode == 4300)) return PS1_i; // i-band
+  if (((photcode > 10300) && (photcode < 10377)) || (photcode == 4400)) return PS1_z; // z-band
+  if (((photcode > 10400) && (photcode < 10477)) || (photcode == 4500)) return PS1_y; // y-band
+  if (((photcode > 10500) && (photcode < 10577)) || (photcode == 4600)) return PS1_w; // w-band
 
   return PS1_none;
@@ -17 +17 @@
 int isGPC1chip (int photcode) {
 
-  if ((photcode > 10000) && (photcode < 10077)) return TRUE; // g-band
-  if ((photcode > 10100) && (photcode < 10177)) return TRUE; // r-band
-  if ((photcode > 10200) && (photcode < 10277)) return TRUE; // i-band
-  if ((photcode > 10300) && (photcode < 10377)) return TRUE; // z-band
-  if ((photcode > 10400) && (photcode < 10477)) return TRUE; // y-band
-  if ((photcode > 10500) && (photcode < 10577)) return TRUE; // w-band
+  if (((photcode > 10000) && (photcode < 10077)) || (photcode == 4100)) return TRUE; // g-band
+  if (((photcode > 10100) && (photcode < 10177)) || (photcode == 4200)) return TRUE; // r-band
+  if (((photcode > 10200) && (photcode < 10277)) || (photcode == 4300)) return TRUE; // i-band
+  if (((photcode > 10300) && (photcode < 10377)) || (photcode == 4400)) return TRUE; // z-band
+  if (((photcode > 10400) && (photcode < 10477)) || (photcode == 4500)) return TRUE; // y-band
+  if (((photcode > 10500) && (photcode < 10577)) || (photcode == 4600)) return TRUE; // w-band
 
   return FALSE;
@@ -30 +30 @@
 int isGPC1stack (int photcode) {
 
-  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
+  if ((photcode == 11000) || (photcode == 14100)) return TRUE; // g-band
+  if ((photcode == 11100) || (photcode == 14200)) return TRUE; // r-band
+  if ((photcode == 11200) || (photcode == 14300)) return TRUE; // i-band
+  if ((photcode == 11300) || (photcode == 14400)) return TRUE; // z-band
+  if ((photcode == 11400) || (photcode == 14500)) return TRUE; // y-band
+  if ((photcode == 11500) || (photcode == 14600)) return TRUE; // w-band
 
   return FALSE;
@@ -45 +45 @@
   // 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
+    if ((photcode == 11000) || (photcode == 14100)) return TRUE; // g-band
+    if ((photcode == 11100) || (photcode == 14200)) return TRUE; // r-band
+    if ((photcode == 11200) || (photcode == 14300)) return TRUE; // i-band
+    if ((photcode == 11300) || (photcode == 14400)) return TRUE; // z-band
+    if ((photcode == 11400) || (photcode == 14500)) return TRUE; // y-band
+    if ((photcode == 11500) || (photcode == 14600)) return TRUE; // w-band
     return FALSE;
   }
 
-  if (photcode == 12000) return TRUE; // g-band
-  if (photcode == 12100) return TRUE; // r-band
-  if (photcode == 12200) return TRUE; // i-band
-  if (photcode == 12300) return TRUE; // z-band
-  if (photcode == 12400) return TRUE; // y-band
-  if (photcode == 12500) return TRUE; // w-band
+  if ((photcode == 12000) || (photcode == 15100)) return TRUE; // g-band
+  if ((photcode == 12100) || (photcode == 15200)) return TRUE; // r-band
+  if ((photcode == 12200) || (photcode == 15300)) return TRUE; // i-band
+  if ((photcode == 12300) || (photcode == 15400)) return TRUE; // z-band
+  if ((photcode == 12400) || (photcode == 15500)) return TRUE; // y-band
+  if ((photcode == 12500) || (photcode == 15600)) return TRUE; // w-band
 
   return FALSE;