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

Timestamp:

Jan 11, 2015, 2:14:39 PM (12 years ago)

Author:

eugene

Message:

merge changes from eam branch ipp-20140904

Location:

trunk/Ohana

Files:

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

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

@@ -25 +25 @@
 char        *SINGLE_CPT;
 
+char        *KH_FILE;
+char        *DCR_FILE;
+
+int          KH_RESET;
+int          DCR_RESET;
+
 SkyRegion    UserPatch;
 
@@ -46 +52 @@
 // int           SetSignals                      PROTO((void));
 
-int           update_dvo_setastrom            PROTO((char *corrfile));
-int           update_dvo_setastrom_parallel   PROTO((SkyTable *sky, char *corrfile));
+int           update_dvo_setastrom            PROTO(());
+int           update_dvo_setastrom_parallel   PROTO((SkyTable *sky));
 
 int           update_catalog_setastrom        PROTO((Catalog *catalog));
 
 // spline correction functions
-int load_astrom_correction (char *filename);
-int get_astrom_correction (int sub, int chip, double *dX, double *dY, float Minst);
 double spline_apply_dbl (double *x, double *y, double *y2, int N, double X);
+
+int load_kh_correction (char *filename);
+int get_kh_correction (int sub, int chip, double *dX, double *dY, float Minst);
+
+int load_dcr_correction (char *filename);
+int get_dcr_correction (int filter, double *dX, double *dY, float Color);