Changeset 20936 for trunk/Ohana/src/opihi/include/dvoshell.h

Timestamp:

Dec 7, 2008, 3:31:01 PM (18 years ago)

Author:

eugene

Message:

big update from eam_branch_20081124 with updates to Opihi math

File:

• trunk/Ohana/src/opihi/include/dvoshell.h (modified) (9 diffs)

trunk/Ohana/src/opihi/include/dvoshell.h

@@ -5 +5 @@
 # ifndef DVOSHELL_H
 # define DVOSHELL_H
+
+typedef enum {
+  DB_STACK_NONE  = 0,
+  DB_STACK_INT   = 0x01,
+  DB_STACK_FIELD = 0x02,
+  DB_STACK_TEMP  = 0x04,
+  DB_STACK_VALUE = 0x08,
+  DB_STACK_CLOSE_PAR = 0x10,
+  DB_STACK_OPEN_PAR,
+  DB_STACK_LOGIC,
+  DB_STACK_COMPARE,
+  DB_STACK_BITWISE,
+  DB_STACK_SUM,
+  DB_STACK_MULTIPLY,
+  DB_STACK_POWER,
+  DB_STACK_UNARY,
+} dbStackTypes;
 
 /* magnitude types */
@@ -74 +91 @@
       MEAS_XCCD, 
       MEAS_YCCD, 
+      MEAS_XCCD_ERR, 
+      MEAS_YCCD_ERR, 
       MEAS_XMOSAIC, 
       MEAS_YMOSAIC, 
@@ -115 +134 @@
       AVE_TYPE, 
       AVE_TYPEFRAC,
-      AVE_OBJID
+      AVE_OBJID,
+      AVE_CATID
 };
 
-enum {DVO_TABLE_AVERAGE, DVO_TABLE_MEASURE};
+enum {IMAGE_ZERO, 
+      IMAGE_RA, 
+      IMAGE_DEC, 
+      IMAGE_GLON, 
+      IMAGE_GLAT, 
+      IMAGE_ELON, 
+      IMAGE_ELAT, 
+      IMAGE_XM, 
+      IMAGE_AIRMASS, 
+      IMAGE_MCAL, 
+      IMAGE_dMCAL, 
+      IMAGE_PHOTCODE, 
+      IMAGE_TIME, 
+      IMAGE_FWHM, 
+      IMAGE_EXPTIME, 
+      IMAGE_NSTAR, 
+      IMAGE_NCAL, 
+      IMAGE_SKY, 
+      IMAGE_FLAG, 
+      IMAGE_CCDNUM, 
+      IMAGE_NX_PIX, 
+      IMAGE_NY_PIX, 
+      IMAGE_THETA, 
+      IMAGE_SKEW, 
+      IMAGE_SCALE, 
+      IMAGE_DSCALE, 
+      IMAGE_APRESID,
+      IMAGE_DAPRESID,
+      IMAGE_SIDTIME,
+      IMAGE_LATITUDE,
+      IMAGE_DET_LIMIT,
+      IMAGE_SAT_LIMIT,
+      IMAGE_CERROR,
+      IMAGE_FWHM_MAJ,
+      IMAGE_FWHM_MIN,
+      IMAGE_TRATE,
+      IMAGE_IMAGE_ID,
+      IMAGE_EXTERN_ID,
+      IMAGE_SOURCE_ID,
+      IMAGE_X_LL_CHIP,
+      IMAGE_X_LR_CHIP,
+      IMAGE_X_UL_CHIP,
+      IMAGE_X_UR_CHIP,
+      IMAGE_Y_LL_CHIP,
+      IMAGE_Y_LR_CHIP,
+      IMAGE_Y_UL_CHIP,
+      IMAGE_Y_UR_CHIP,
+      IMAGE_X_LL_FP,
+      IMAGE_X_LR_FP,
+      IMAGE_X_UL_FP,
+      IMAGE_X_UR_FP,
+      IMAGE_Y_LL_FP,
+      IMAGE_Y_LR_FP,
+      IMAGE_Y_UL_FP,
+      IMAGE_Y_UR_FP,
+};
+
+
+enum {DVO_TABLE_AVERAGE, DVO_TABLE_MEASURE, DVO_TABLE_IMAGE};
 enum {DVO_DB_CMDLINE_ERROR, DVO_DB_CMDLINE_IS_END, DVO_DB_CMDLINE_IS_WHERE, DVO_DB_CMDLINE_IS_MATCH}; 
 
@@ -136 +214 @@
   int ID;
   int magMode;
+  char type;
   PhotCode *photcode;
 } dbField;
@@ -144 +223 @@
   char    type;
   int     field;
-  float   Float;
+  opihi_flt FltValue;
+  opihi_int IntValue;
 } dbStack;
+
+typedef struct {
+  opihi_flt Flt;
+  opihi_int Int;
+} dbValue;
 
 typedef struct {
@@ -225 +310 @@
 // dvo DB field functions
 dbField     *dbCmdlineFields        PROTO((int argc, char **argv, int table, int *last, int *nfields));
+int          dbCmdlineConditions    PROTO((int argc, char **argv, int first, int *nextField));
 dbStack     *dbRPN                  PROTO((int argc, char **argv, int *nstack));
 int          dbCheckStack           PROTO((dbStack *stack, int Nstack, int table, dbField **inFields, int *Nfields));
-int          dbBooleanCond          PROTO((dbStack *inStack, int NinStack, float *fields));
+int          dbBooleanCond          PROTO((dbStack *inStack, int NinStack, dbValue *fields));
 void         dbInitStack            PROTO((dbStack *stack));
 void         dbFreeStack            PROTO((dbStack *stack, int Nstack));
@@ -233 +319 @@
 void         dbFreeTempEntry        PROTO((dbStack *stack));
 
-dbStack     *dbBinary               PROTO((dbStack *V1, dbStack *V2, char *op, float *fields));
-dbStack     *dbUnary                PROTO((dbStack *V1, char *op, float *fields));
+dbStack     *dbBinary               PROTO((dbStack *V1, dbStack *V2, char *op, dbValue *fields));
+dbStack     *dbUnary                PROTO((dbStack *V1, char *op, dbValue *fields));
 
 int          GetMagMode             PROTO((char *string));
@@ -240 +326 @@
 int          ParseMeasureField      PROTO((dbField *field, char *fieldName));
 int          ParseAverageField      PROTO((dbField *field, char *fieldName));
-
-double       dbExtractAverages      PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field));
-double       dbExtractMeasures      PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field));
-void         dbExtractMeasuresInit  PROTO(());
+int          ParseImageField        PROTO((dbField *field, char *fieldName));
+
+dbValue      dbExtractAverages      PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field));
+dbValue      dbExtractMeasures      PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field));
+dbValue      dbExtractImages        PROTO((Image *image, int Nimage, int N, dbField *field));
 
 void         dbInitField            PROTO((dbField *field));
@@ -257 +344 @@
 int wordhash (char *word);
 
-int dbExtractAverageInitTransform (CoordTransformSystem target);
-int dbExtractAverageInit ();
-
 int dbExtractMeasuresInitTransform (CoordTransformSystem target);
 int dbExtractMeasuresInitAve ();
 int dbExtractMeasuresInitMeas ();
+int dbExtractMeasuresInit ();
 
 int dbExtractAveragesInitTransform (CoordTransformSystem target);
 int dbExtractAveragesInit ();
 
+int dbExtractImagesInitTransform (CoordTransformSystem target);
+int dbExtractImagesInit ();
+int dbExtractImagesReset ();
+
 # endif