Changeset 34749 for trunk/Ohana/src/delstar/include/delstar.h

Timestamp:

Nov 30, 2012, 10:06:05 AM (13 years ago)

Author:

eugene

Message:

merge from eam/20120905 (updates to delstar, setposangle, update to ps1-v4 schema to add measure.Xoff,Yoff)

File:

• trunk/Ohana/src/delstar/include/delstar.h (modified) (5 diffs)

trunk/Ohana/src/delstar/include/delstar.h

@@ -12 +12 @@
 
 /* global variables set in parameter file */
-char   ImageCat[256];
-char   ImageTemplate[256];
-char   CatTemplate[256];
-char   GSCFILE[256];
-char   CATDIR[256];
+char   ImageCat[DVO_MAX_PATH];
+char   ImageTemplate[DVO_MAX_PATH];
+char   CatTemplate[DVO_MAX_PATH];
+char   GSCFILE[DVO_MAX_PATH];
+
+char  *CATDIR;
+
 char   CATMODE[16];    /* raw, mef, split, mysql */
 char   CATFORMAT[16];  /* internal, elixir, loneos, panstarrs */
+
+char  *IMAGENAME;
+
 double NSIGMA;
 double ALPHA;
@@ -24 +29 @@
 int    ORPHAN;
 int    MISSED;
-char   SKY_TABLE[256];
+char   SKY_TABLE[DVO_MAX_PATH];
 int    SKY_DEPTH;  /** XXX EAM : depth of catalog tables, fix usage */
+
+int    PARALLEL;
+int    PARALLEL_MANUAL;
+int    PARALLEL_SERIAL;
+
+int          HOST_ID;
+char        *HOSTDIR;
 
 time_t    START;
@@ -31 +43 @@
 PhotCode *PHOTCODE;
 
+char *PHOTCODE_LIST;
+
 int    MODE;
-enum {MODE_IMAGENAME, MODE_IMAGEFILE, MODE_TIME, MODE_ORPHAN, MODE_MISSED};
+enum {MODE_NONE, MODE_IMAGENAME, MODE_IMAGEFILE, MODE_TIME, MODE_ORPHAN, MODE_MISSED, MODE_PHOTCODES};
 
 char DateKeyword[64], DateMode[64], UTKeyword[64], MJDKeyword[64], JDKeyword[64];
+
+SkyRegion UserPatch;
 
 /*** delstar prototypes ***/
@@ -46 +62 @@
 int        Shutdown               PROTO((char *format, ...)) OHANA_FORMAT(printf, 1, 2);
 void       TrapSignal             PROTO((int sig));
-int        args                   PROTO((int *argc, char **argv));
+int        args                   PROTO((int argc, char **argv));
 void       check_permissions      PROTO((char *basefile));
-void       delete_imagefile       PROTO((FITS_DB *db, char *filename));
-void       delete_imagename       PROTO((FITS_DB *db, char *name));
+void       delete_imagefile       PROTO((FITS_DB *db));
+void       delete_imagename       PROTO((FITS_DB *db));
 void       delete_times           PROTO((FITS_DB *db));
 int        edge_check             PROTO((double *x1, double *y1, double *x2, double *y2));
@@ -72 +88 @@
 
 void set_db (FITS_DB *in);
+
+int args_client (int argc, char **argv);
+
+void SortAveMeasMatch (off_t *MEAS, off_t *AVE, off_t N);
+
+int delete_photcodes (int hostID, char *hostpath);
+int delete_photcodes_parallel (SkyList *sky);
+int delete_photcodes_catalog (Catalog *catalog, PhotCode **photcodes, int Nphotcodes);
+int delete_image_photcodes (FITS_DB *db);