Changeset 34867

Timestamp:

Dec 21, 2012, 7:49:17 AM (14 years ago)

Author:

eugene

Message:

working on setastrom

Location:

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

Files:

• Makefile (modified) (2 diffs)
• include/setastrom.h (added)
• src/astrom_correction.c (modified) (4 diffs)
• src/initialize_setastrom.c (modified) (1 diff)

branches/eam_branches/ipp-20121219/Ohana/src/uniphot/Makefile

@@ -23 +23 @@
 setposangle: $(BIN)/setposangle.$(ARCH)
 setposangle_client: $(BIN)/setposangle_client.$(ARCH)
+setastrom: $(BIN)/setastrom.$(ARCH)
+setastrom_client: $(BIN)/setastrom_client.$(ARCH)
 
 install: $(DESTBIN)/uniphot $(DESTBIN)/setfwhm $(DESTBIN)/setphot $(DESTBIN)/setphot_client $(DESTBIN)/setposangle $(DESTBIN)/setposangle_client
@@ -99 +101 @@
 $(BIN)/setposangle_client.$(ARCH): $(SETPOSANGLE_CLIENT)
 
+SETASTROM = \
+$(SRC)/setastrom.$(ARCH).o          \
+$(SRC)/initialize_setastrom.$(ARCH).o \
+$(SRC)/astrom_correction.$(ARCH).o \
+$(SRC)/update_dvo_setastrom.$(ARCH).o \
+$(SRC)/update_catalog_setastrom.$(ARCH).o \
+$(SRC)/SetSignals.$(ARCH).o         \
+$(SRC)/Shutdown.$(ARCH).o           
+
+$(SETASTROM): $(INC)/setastrom.h
+$(BIN)/setastrom.$(ARCH): $(SETASTROM)
+
+SETASTROM_CLIENT = \
+$(SRC)/setastrom_client.$(ARCH).o           \
+$(SRC)/update_dvo_setastrom.$(ARCH).o \
+$(SRC)/update_catalog_setastrom.$(ARCH).o \
+$(SRC)/astrom_correction.$(ARCH).o \
+$(SRC)/initialize_setastrom_client.$(ARCH).o
+
+$(SETASTROM_CLIENT): $(INC)/setastrom.h
+$(BIN)/setastrom_client.$(ARCH): $(SETASTROM_CLIENT)
+
 SETFWHM =                           \
 $(SRC)/setfwhm.$(ARCH).o            \

branches/eam_branches/ipp-20121219/Ohana/src/uniphot/src/astrom_correction.c

@@ -7 +7 @@
 // extensions have names of the form XYnn.Dx.Td
 
-// where nn = 00 - 77, the chip number
-// x is X or Y, the correction direction
-// d is 0 or 1, pre or post camera correction
+// where nn = 00 - 77, the chip number 
+// x is X or Y, the correction direction (dir)
+// d is 0 or 1, pre or post camera correction (sub)
 
-// the interpolating spline has valu
+// these are stored in an N-D array of (Spline *) splineset[sub][dir][chip]
+
+// the interpolating spline information: this is based on the spline used by opihi/cmd.data/spline.c
 typedef struct {
   int Nknots;
-  opihi_flt *xk;
-  opihi_flt *yk;
-  opihi_flt *y2;
+  double *xk;
+  double *yk;
+  double *y2;
   char *name;
 } Spline;
+
+# define N_SUB 2
+# define N_DIR 2
+# define N_CHIP 78
+// note that we are allocating pointers for XY00 - XY77, but only the octal elements are set (and not the 00,07,70,77 ones)
+
+Spline ****splineset;
 
 int load_astrom_correction (char *filename) {
@@ -26 +35 @@
   FTable ftable;
 
-  FILE *f = NULL;
-
   /* open file for input */
-  f = fopen (filename, "r");
+  FILE *f = fopen (filename, "r");
   if (f == (FILE *) NULL) {
     gprint (GP_ERR, "can't open file for read : %s\n", filename);
@@ -44 +51 @@
   ftable.header = &theader;
 
+  int sub, dir, chip;
+
   // we have a N-D array of splines:
   // splineset[subset][dir][chip]
@@ -57 +66 @@
   }
 
-  for () {
-    /* load data for this header */
-    if (!gfits_load_header (f, &theader)) return (FALSE);
+  while (TRUE) {
+    // load data for this header : if not found, assume we hit the end of the file
+    if (!gfits_load_header (f, &theader)) break;
     
     if (!gfits_fread_ftable_data (f, &table, FALSE)) return (FALSE);

branches/eam_branches/ipp-20121219/Ohana/src/uniphot/src/initialize_setastrom.c

@@ -53 +53 @@
   }
 
-  // XXX I want to avoid running this on all data all the time
-  // some options: gpc1 only (hardwired), require photcodes (fairly tedious),
-  // exclude some photcodes?
-  // XXX for now, hardwire gpc1 photcodes
-
   PARALLEL = FALSE;
   if ((N = get_argument (argc, argv, "-parallel"))) {