Index: trunk/ippdb/src/ippdb.h
===================================================================
--- trunk/ippdb/src/ippdb.h	(revision 8266)
+++ trunk/ippdb/src/ippdb.h	(revision 8283)
@@ -3004,5 +3004,11 @@
     psF64           decl;
     psF32           exp_time;
-    psF64           background;
+    psF64           bg;
+    psF64           bg_stdev;
+    psF64           bg_mean_stdev;
+    psF64           alt;
+    psF64           az;
+    psF32           ccd_temp;
+    psF64           posang;
 } rawDetrendExpRow;
 
@@ -3023,5 +3029,11 @@
     psF64           decl,
     psF32           exp_time,
-    psF64           background
+    psF64           bg,
+    psF64           bg_stdev,
+    psF64           bg_mean_stdev,
+    psF64           alt,
+    psF64           az,
+    psF32           ccd_temp,
+    psF64           posang
 );
 
@@ -3063,5 +3075,11 @@
     psF64           decl,
     psF32           exp_time,
-    psF64           background
+    psF64           bg,
+    psF64           bg_stdev,
+    psF64           bg_mean_stdev,
+    psF64           alt,
+    psF64           az,
+    psF32           ccd_temp,
+    psF64           posang
 );
 
@@ -3094,5 +3112,11 @@
     psF64           *decl,
     psF32           *exp_time,
-    psF64           *background
+    psF64           *bg,
+    psF64           *bg_stdev,
+    psF64           *bg_mean_stdev,
+    psF64           *alt,
+    psF64           *az,
+    psF32           *ccd_temp,
+    psF64           *posang
 );
 
@@ -3247,5 +3271,11 @@
     psF64           decl;
     psF32           exp_time;
-    psF64           background;
+    psF64           bg;
+    psF64           bg_stdev;
+    psF64           bg_mean_stdev;
+    psF64           alt;
+    psF64           az;
+    psF32           ccd_temp;
+    psF64           posang;
 } rawScienceExpRow;
 
@@ -3266,5 +3296,11 @@
     psF64           decl,
     psF32           exp_time,
-    psF64           background
+    psF64           bg,
+    psF64           bg_stdev,
+    psF64           bg_mean_stdev,
+    psF64           alt,
+    psF64           az,
+    psF32           ccd_temp,
+    psF64           posang
 );
 
@@ -3306,5 +3342,11 @@
     psF64           decl,
     psF32           exp_time,
-    psF64           background
+    psF64           bg,
+    psF64           bg_stdev,
+    psF64           bg_mean_stdev,
+    psF64           alt,
+    psF64           az,
+    psF32           ccd_temp,
+    psF64           posang
 );
 
@@ -3337,5 +3379,11 @@
     psF64           *decl,
     psF32           *exp_time,
-    psF64           *background
+    psF64           *bg,
+    psF64           *bg_stdev,
+    psF64           *bg_mean_stdev,
+    psF64           *alt,
+    psF64           *az,
+    psF32           *ccd_temp,
+    psF64           *posang
 );
 
@@ -3744,14 +3792,4 @@
 typedef struct {
     char            *exp_id;
-    char            *camera;
-    char            *telescope;
-    char            *exp_type;
-    psS32           imfiles;
-    char            *filter;
-    psF32           airmass;
-    psF64           ra;
-    psF64           decl;
-    psF32           exp_time;
-    psF64           background;
     char            *recipe;
     psS32           p1_version;
@@ -3765,14 +3803,4 @@
 p1PendingExpRow *p1PendingExpRowAlloc(
     const char      *exp_id,
-    const char      *camera,
-    const char      *telescope,
-    const char      *exp_type,
-    psS32           imfiles,
-    const char      *filter,
-    psF32           airmass,
-    psF64           ra,
-    psF64           decl,
-    psF32           exp_time,
-    psF64           background,
     const char      *recipe,
     psS32           p1_version
@@ -3807,14 +3835,4 @@
     psDB            *dbh,               ///< Database handle
     const char      *exp_id,
-    const char      *camera,
-    const char      *telescope,
-    const char      *exp_type,
-    psS32           imfiles,
-    const char      *filter,
-    psF32           airmass,
-    psF64           ra,
-    psF64           decl,
-    psF32           exp_time,
-    psF64           background,
     const char      *recipe,
     psS32           p1_version
@@ -3840,14 +3858,4 @@
     psDB            *dbh,               ///< Database handle
     char            **exp_id,
-    char            **camera,
-    char            **telescope,
-    char            **exp_type,
-    psS32           *imfiles,
-    char            **filter,
-    psF32           *airmass,
-    psF64           *ra,
-    psF64           *decl,
-    psF32           *exp_time,
-    psF64           *background,
     char            **recipe,
     psS32           *p1_version
@@ -3995,14 +4003,4 @@
 typedef struct {
     char            *exp_id;
-    char            *camera;
-    char            *telescope;
-    char            *exp_type;
-    psS32           imfiles;
-    char            *filter;
-    psF32           airmass;
-    psF32           ra;
-    psF64           decl;
-    psF64           exp_time;
-    psF64           background;
     char            *recipe;
     psS32           p1_version;
@@ -4017,14 +4015,4 @@
 p2PendingExpRow *p2PendingExpRowAlloc(
     const char      *exp_id,
-    const char      *camera,
-    const char      *telescope,
-    const char      *exp_type,
-    psS32           imfiles,
-    const char      *filter,
-    psF32           airmass,
-    psF32           ra,
-    psF64           decl,
-    psF64           exp_time,
-    psF64           background,
     const char      *recipe,
     psS32           p1_version,
@@ -4060,14 +4048,4 @@
     psDB            *dbh,               ///< Database handle
     const char      *exp_id,
-    const char      *camera,
-    const char      *telescope,
-    const char      *exp_type,
-    psS32           imfiles,
-    const char      *filter,
-    psF32           airmass,
-    psF32           ra,
-    psF64           decl,
-    psF64           exp_time,
-    psF64           background,
     const char      *recipe,
     psS32           p1_version,
@@ -4094,14 +4072,4 @@
     psDB            *dbh,               ///< Database handle
     char            **exp_id,
-    char            **camera,
-    char            **telescope,
-    char            **exp_type,
-    psS32           *imfiles,
-    char            **filter,
-    psF32           *airmass,
-    psF32           *ra,
-    psF64           *decl,
-    psF64           *exp_time,
-    psF64           *background,
     char            **recipe,
     psS32           *p1_version,
@@ -4473,14 +4441,4 @@
 typedef struct {
     char            *exp_id;
-    char            *camera;
-    char            *telescope;
-    char            *exp_type;
-    psS32           imfiles;
-    char            *filter;
-    psF32           airmass;
-    psF64           ra;
-    psF64           decl;
-    psF32           exp_time;
-    psF64           background;
     char            *recipe;
     psS32           p1_version;
@@ -4495,14 +4453,4 @@
 p2DoneExpRow *p2DoneExpRowAlloc(
     const char      *exp_id,
-    const char      *camera,
-    const char      *telescope,
-    const char      *exp_type,
-    psS32           imfiles,
-    const char      *filter,
-    psF32           airmass,
-    psF64           ra,
-    psF64           decl,
-    psF32           exp_time,
-    psF64           background,
     const char      *recipe,
     psS32           p1_version,
@@ -4538,14 +4486,4 @@
     psDB            *dbh,               ///< Database handle
     const char      *exp_id,
-    const char      *camera,
-    const char      *telescope,
-    const char      *exp_type,
-    psS32           imfiles,
-    const char      *filter,
-    psF32           airmass,
-    psF64           ra,
-    psF64           decl,
-    psF32           exp_time,
-    psF64           background,
     const char      *recipe,
     psS32           p1_version,
@@ -4572,14 +4510,4 @@
     psDB            *dbh,               ///< Database handle
     char            **exp_id,
-    char            **camera,
-    char            **telescope,
-    char            **exp_type,
-    psS32           *imfiles,
-    char            **filter,
-    psF32           *airmass,
-    psF64           *ra,
-    psF64           *decl,
-    psF32           *exp_time,
-    psF64           *background,
     char            **recipe,
     psS32           *p1_version,
@@ -4951,13 +4879,4 @@
 typedef struct {
     char            *exp_id;
-    char            *camera;
-    char            *exp_type;
-    psS32           imfiles;
-    char            *filter;
-    psF32           airmass;
-    psF64           ra;
-    psF64           decl;
-    psF32           exp_time;
-    psF64           background;
     char            *recipe;
     psS32           p2_version;
@@ -4972,13 +4891,4 @@
 p3PendingExpRow *p3PendingExpRowAlloc(
     const char      *exp_id,
-    const char      *camera,
-    const char      *exp_type,
-    psS32           imfiles,
-    const char      *filter,
-    psF32           airmass,
-    psF64           ra,
-    psF64           decl,
-    psF32           exp_time,
-    psF64           background,
     const char      *recipe,
     psS32           p2_version,
@@ -5014,13 +4924,4 @@
     psDB            *dbh,               ///< Database handle
     const char      *exp_id,
-    const char      *camera,
-    const char      *exp_type,
-    psS32           imfiles,
-    const char      *filter,
-    psF32           airmass,
-    psF64           ra,
-    psF64           decl,
-    psF32           exp_time,
-    psF64           background,
     const char      *recipe,
     psS32           p2_version,
@@ -5047,13 +4948,4 @@
     psDB            *dbh,               ///< Database handle
     char            **exp_id,
-    char            **camera,
-    char            **exp_type,
-    psS32           *imfiles,
-    char            **filter,
-    psF32           *airmass,
-    psF64           *ra,
-    psF64           *decl,
-    psF32           *exp_time,
-    psF64           *background,
     char            **recipe,
     psS32           *p2_version,
@@ -5411,14 +5303,6 @@
     psS32           iteration;
     char            *exp_id;
-    char            *camera;
-    char            *telescope;
-    char            *exp_type;
-    psS32           imfiles;
-    char            *filter;
-    psF32           airmass;
-    psF64           ra;
-    psF64           decl;
-    psF32           exp_time;
-    psF64           background;
+    bool            include;
+    bool            accept;
 } detInputExpRow;
 
@@ -5432,14 +5316,6 @@
     psS32           iteration,
     const char      *exp_id,
-    const char      *camera,
-    const char      *telescope,
-    const char      *exp_type,
-    psS32           imfiles,
-    const char      *filter,
-    psF32           airmass,
-    psF64           ra,
-    psF64           decl,
-    psF32           exp_time,
-    psF64           background
+    bool            include,
+    bool            accept
 );
 
@@ -5474,14 +5350,6 @@
     psS32           iteration,
     const char      *exp_id,
-    const char      *camera,
-    const char      *telescope,
-    const char      *exp_type,
-    psS32           imfiles,
-    const char      *filter,
-    psF32           airmass,
-    psF64           ra,
-    psF64           decl,
-    psF32           exp_time,
-    psF64           background
+    bool            include,
+    bool            accept
 );
 
@@ -5507,14 +5375,6 @@
     psS32           *iteration,
     char            **exp_id,
-    char            **camera,
-    char            **telescope,
-    char            **exp_type,
-    psS32           *imfiles,
-    char            **filter,
-    psF32           *airmass,
-    psF64           *ra,
-    psF64           *decl,
-    psF32           *exp_time,
-    psF64           *background
+    bool            *include,
+    bool            *accept
 );