Changeset 33362

Timestamp:

Feb 24, 2012, 7:51:06 AM (14 years ago)

Author:

eugene

Message:

fix zero point offsets

Location:

branches/eam_branches/ipp-20111122/Ohana/src/uniphot/src

Files:

• initialize_setphot.c (modified) (4 diffs)
• load_zpt_table.c (modified) (1 diff)

branches/eam_branches/ipp-20111122/Ohana/src/uniphot/src/initialize_setphot.c

@@ -1 +1 @@
 # include "setphot.h"
+
+static char *ZPT_OFFSETS_FILTERS = NULL;
+static char *ZPT_OFFSETS_VALUES = NULL;
 
 void initialize_setphot (int argc, char **argv) {
@@ -22 +25 @@
     exit (1);
   }
+
+  // if we have a zpt offset list, parse it here
+  parse_zpt_offsets (ZPT_OFFSETS_FILTERS, ZPT_OFFSETS_VALUES);
 }
 
@@ -86 +92 @@
   // -zpt-offsets code[,code,etc] value[,value,etc]
   // eg: -zpt-offsets g,r,i 0.01,0.02,-0.02
-  char *ZPT_OFFSETS_FILTERS = NULL;
-  char *ZPT_OFFSETS_VALUES = NULL;
   if ((N = get_argument (argc, argv, "-zpt-offsets"))) {
     remove_argument (N, &argc, argv);
@@ -94 +98 @@
     ZPT_OFFSETS_VALUES = strcreate (argv[N]);
     remove_argument (N, &argc, argv);
-    
-    parse_zpt_offsets (ZPT_OFFSETS_FILTERS, ZPT_OFFSETS_VALUES);
   }
   

branches/eam_branches/ipp-20111122/Ohana/src/uniphot/src/load_zpt_table.c

@@ -358 +358 @@
 int parse_zpt_offsets (char *ZPT_OFFSET_FILTERS, char *ZPT_OFFSET_VALUES) {
 
+  if (!ZPT_OFFSET_FILTERS) return TRUE;
   assert (ZPT_OFFSET_FILTERS);
   assert (ZPT_OFFSET_VALUES);