Changeset 38062 for trunk/Ohana/src/uniphot/include/setastrom.h

Timestamp:

Mar 29, 2015, 6:52:41 AM (11 years ago)

Author:

eugene

Message:

merge changes from ipp-20150112

Location:

trunk

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/uniphot/include/setastrom.h (modified) (3 diffs)

trunk/Ohana/src/uniphot/include/setastrom.h

@@ -10 +10 @@
   double *y2;
 } Spline;
+
+// we have one correction (an image) for each filter and chip
+typedef struct {
+  int Nx;       // number of chips in x
+  int Ny;       // number of chips in y
+  int Nfilter;  // number of filters
+  int Ndir;     // number of correction dimensions
+
+  int Nchips;   // chip offset (Nx*Ny)
+  int Ngroup;   // direction offset (Nx*Ny*Nfilters)
+  int Nvalues;  // Nx*Ny*Nfilters*Ndir
+
+  int dX;       // superpixel size
+  int dY;       // superpixel size
+
+  int NxCCD;    // number of pixels
+  int NyCCD;    // number of pixels
+
+  Matrix **matrix; // allocate an array of pointers
+  // index = ix + iy*Nx + filter*Nchips + dir*Ngroup
+} CamCorrection;
 
 /* global variables set in parameter file */
@@ -27 +48 @@
 char        *KH_FILE;
 char        *DCR_FILE;
+char        *CAM_FILE;
 
 int          KH_RESET;
 int          DCR_RESET;
+int          CAM_RESET;
 
 SkyRegion    UserPatch;
@@ -65 +88 @@
 int load_dcr_correction (char *filename);
 int get_dcr_correction (int filter, double *dX, double *dY, float Color);
+
+int load_cam_correction (char *filename);
+int get_cam_correction (int chipID, int filter, float Xccd, float Yccd, double *dX, double *dY);