Index: trunk/Ohana/src/uniphot/include/setastrom.h
===================================================================
--- trunk/Ohana/src/uniphot/include/setastrom.h	(revision 38986)
+++ trunk/Ohana/src/uniphot/include/setastrom.h	(revision 39288)
@@ -30,5 +30,5 @@
   Matrix **matrix; // allocate an array of pointers
   // index = ix + iy*Nx + filter*Nchips + dir*Ngroup
-} CamCorrection;
+} CamAstromCorrection;
 
 /* global variables set in parameter file */
@@ -48,6 +48,7 @@
 char        *KH_FILE;
 char        *DCR_FILE;
-char        *CAM_FILE;
 char        *TYC_FILE;
+
+char        *CAM_ASTROM_FILE;
 
 int          KH_RESET;
@@ -91,6 +92,6 @@
 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);
+int CamAstromCorrectionLoad (char *filename);
+int CamAstromCorrectionValue (int chipID, int filter, float Xccd, float Yccd, double *dX, double *dY);
 
 int load_tyc_correction (char *filename);