Index: trunk/ippdb/src/ippdb.h
===================================================================
--- trunk/ippdb/src/ippdb.h	(revision 9307)
+++ trunk/ippdb/src/ippdb.h	(revision 9423)
@@ -1,5 +1,24 @@
 /*
- *
- * This file was generated by glueforge 0.25
+ * header.c
+ *
+ * Copyright (C) 2006  Joshua Hoblitt
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * program; see the file COPYING. If not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/*
+ *
+ * This file was generated by glueforge 0.29
  *
  * Do NOT directly edit this file.
@@ -29,5 +48,6 @@
     const char      *user,              ///< Database username
     const char      *passwd,            ///< Database password
-    const char      *dbname             ///< Database table.namespace
+    const char      *dbname,            ///< Database table.namespace
+    unsigned int    port                ///< Database port
 );
 
@@ -182,20 +202,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool weatherPop(
-    psDB            *dbh,               ///< Database handle
-    psF32           *temp01,
-    psF32           *humi01,
-    psF32           *temp02,
-    psF32           *humi02,
-    psF32           *temp03,
-    psF32           *humi03,
-    psF32           *pressure
-);
-
 /** Insert a single weatherRow object into a table
  *
@@ -220,13 +224,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of weatherRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new weatherRow on success or NULL on failure.
- */
-
-weatherRow *weatherPopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -244,18 +239,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool weatherPopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -421,20 +402,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool skyp_transparencyPop(
-    psDB            *dbh,               ///< Database handle
-    char            **filter,
-    psF64           *trans,
-    psS32           *nstars,
-    psF64           *ra,
-    psF64           *decl,
-    psF32           *exptime,
-    psF64           *sky_bright
-);
-
 /** Insert a single skyp_transparencyRow object into a table
  *
@@ -459,13 +424,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of skyp_transparencyRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new skyp_transparencyRow on success or NULL on failure.
- */
-
-skyp_transparencyRow *skyp_transparencyPopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -483,18 +439,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool skyp_transparencyPopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -666,22 +608,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool skyp_absorptionPop(
-    psDB            *dbh,               ///< Database handle
-    char            **disperser_id,
-    psF32           *atmcomp1,
-    psF32           *atmcomp2,
-    psF32           *atmcomp3,
-    psS32           *nstars,
-    psF64           *ra,
-    psF64           *decl,
-    psF32           *exptime,
-    psF64           *sky_bright
-);
-
 /** Insert a single skyp_absorptionRow object into a table
  *
@@ -706,13 +630,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of skyp_absorptionRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new skyp_absorptionRow on success or NULL on failure.
- */
-
-skyp_absorptionRow *skyp_absorptionPopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -730,18 +645,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool skyp_absorptionPopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -904,19 +805,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool skyp_emissionPop(
-    psDB            *dbh,               ///< Database handle
-    char            **disperser_id,
-    psF32           *atmcomp1,
-    psF32           *atmcomp2,
-    psF32           *atmcomp3,
-    psF32           *continuum,
-    psF32           *exptime
-);
-
 /** Insert a single skyp_emissionRow object into a table
  *
@@ -941,13 +827,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of skyp_emissionRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new skyp_emissionRow on success or NULL on failure.
- */
-
-skyp_emissionRow *skyp_emissionPopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -965,18 +842,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool skyp_emissionPopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -1142,20 +1005,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool dimmPop(
-    psDB            *dbh,               ///< Database handle
-    psF32           *sigmax,
-    psF32           *sigmay,
-    psF32           *fwhm,
-    psF64           *ra,
-    psF64           *decl,
-    psF32           *expttime,
-    char            **telescope_id
-);
-
 /** Insert a single dimmRow object into a table
  *
@@ -1180,13 +1027,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of dimmRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new dimmRow on success or NULL on failure.
- */
-
-dimmRow *dimmPopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -1204,18 +1042,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool dimmPopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -1378,19 +1202,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool skyp_irPop(
-    psDB            *dbh,               ///< Database handle
-    psF64           *sky_bright,
-    psF64           *sky_var,
-    psF64           *ra,
-    psF64           *decl,
-    psF32           *fov_x,
-    psF32           *fov_y
-);
-
 /** Insert a single skyp_irRow object into a table
  *
@@ -1415,13 +1224,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of skyp_irRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new skyp_irRow on success or NULL on failure.
- */
-
-skyp_irRow *skyp_irPopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -1439,18 +1239,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool skyp_irPopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -1607,17 +1393,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool domePop(
-    psDB            *dbh,               ///< Database handle
-    psF32           *az,
-    bool            *open,
-    bool            *light,
-    bool            *track
-);
-
 /** Insert a single domeRow object into a table
  *
@@ -1642,13 +1415,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of domeRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new domeRow on success or NULL on failure.
- */
-
-domeRow *domePopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -1666,18 +1430,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool domePopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -1837,18 +1587,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool telescopePop(
-    psDB            *dbh,               ///< Database handle
-    char            **guide,
-    psF32           *alt,
-    psF32           *az,
-    psF64           *ra,
-    psF64           *decl
-);
-
 /** Insert a single telescopeRow object into a table
  *
@@ -1873,13 +1609,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of telescopeRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new telescopeRow on success or NULL on failure.
- */
-
-telescopeRow *telescopePopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -1897,18 +1624,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool telescopePopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -2068,18 +1781,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool summitExpPop(
-    psDB            *dbh,               ///< Database handle
-    char            **exp_id,
-    char            **camera,
-    char            **telescope,
-    char            **exp_type,
-    char            **uri
-);
-
 /** Insert a single summitExpRow object into a table
  *
@@ -2104,13 +1803,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of summitExpRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new summitExpRow on success or NULL on failure.
- */
-
-summitExpRow *summitExpPopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -2128,18 +1818,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool summitExpPopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -2299,18 +1975,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool pzPendingExpPop(
-    psDB            *dbh,               ///< Database handle
-    char            **exp_id,
-    char            **camera,
-    char            **telescope,
-    char            **exp_type,
-    psS32           *imfiles
-);
-
 /** Insert a single pzPendingExpRow object into a table
  *
@@ -2335,13 +1997,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of pzPendingExpRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new pzPendingExpRow on success or NULL on failure.
- */
-
-pzPendingExpRow *pzPendingExpPopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -2359,18 +2012,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool pzPendingExpPopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -2539,21 +2178,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool pzPendingImfilePop(
-    psDB            *dbh,               ///< Database handle
-    char            **exp_id,
-    char            **camera,
-    char            **telescope,
-    psS32           *bytes,
-    char            **md5sum,
-    char            **class,
-    char            **class_id,
-    char            **uri
-);
-
 /** Insert a single pzPendingImfileRow object into a table
  *
@@ -2578,13 +2200,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of pzPendingImfileRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new pzPendingImfileRow on success or NULL on failure.
- */
-
-pzPendingImfileRow *pzPendingImfilePopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -2602,18 +2215,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool pzPendingImfilePopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -2776,19 +2375,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool newExpPop(
-    psDB            *dbh,               ///< Database handle
-    char            **exp_tag,
-    char            **exp_id,
-    char            **camera,
-    char            **telescope,
-    char            **exp_type,
-    psS32           *imfiles
-);
-
 /** Insert a single newExpRow object into a table
  *
@@ -2813,13 +2397,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of newExpRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new newExpRow on success or NULL on failure.
- */
-
-newExpRow *newExpPopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -2837,18 +2412,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool newExpPopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -3005,17 +2566,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool newImfilePop(
-    psDB            *dbh,               ///< Database handle
-    char            **exp_tag,
-    char            **class,
-    char            **class_id,
-    char            **uri
-);
-
 /** Insert a single newImfileRow object into a table
  *
@@ -3040,13 +2588,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of newImfileRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new newImfileRow on success or NULL on failure.
- */
-
-newImfileRow *newImfilePopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -3064,18 +2603,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool newImfilePopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -3274,31 +2799,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool rawDetrendExpPop(
-    psDB            *dbh,               ///< Database handle
-    char            **exp_tag,
-    char            **camera,
-    char            **telescope,
-    char            **exp_type,
-    psS32           *imfiles,
-    char            **filter,
-    psF32           *airmass,
-    psF64           *ra,
-    psF64           *decl,
-    psF32           *exp_time,
-    psF64           *bg,
-    psF64           *bg_stdev,
-    psF64           *bg_mean_stdev,
-    psF64           *alt,
-    psF64           *az,
-    psF32           *ccd_temp,
-    psF64           *posang,
-    char            **object
-);
-
 /** Insert a single rawDetrendExpRow object into a table
  *
@@ -3323,13 +2821,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of rawDetrendExpRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new rawDetrendExpRow on success or NULL on failure.
- */
-
-rawDetrendExpRow *rawDetrendExpPopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -3347,18 +2836,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool rawDetrendExpPopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -3557,31 +3032,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool rawScienceExpPop(
-    psDB            *dbh,               ///< Database handle
-    char            **exp_tag,
-    char            **camera,
-    char            **telescope,
-    char            **exp_type,
-    psS32           *imfiles,
-    char            **filter,
-    psF32           *airmass,
-    psF64           *ra,
-    psF64           *decl,
-    psF32           *exp_time,
-    psF64           *bg,
-    psF64           *bg_stdev,
-    psF64           *bg_mean_stdev,
-    psF64           *alt,
-    psF64           *az,
-    psF32           *ccd_temp,
-    psF64           *posang,
-    char            **object
-);
-
 /** Insert a single rawScienceExpRow object into a table
  *
@@ -3606,13 +3054,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of rawScienceExpRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new rawScienceExpRow on success or NULL on failure.
- */
-
-rawScienceExpRow *rawScienceExpPopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -3630,18 +3069,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool rawScienceExpPopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -3840,31 +3265,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool rawImfilePop(
-    psDB            *dbh,               ///< Database handle
-    char            **exp_tag,
-    char            **class,
-    char            **class_id,
-    char            **uri,
-    char            **exp_type,
-    char            **filter,
-    psF32           *airmass,
-    psF64           *ra,
-    psF64           *decl,
-    psF32           *exp_time,
-    psF64           *bg,
-    psF64           *bg_stdev,
-    psF64           *bg_mean_stdev,
-    psF64           *alt,
-    psF64           *az,
-    psF32           *ccd_temp,
-    psF64           *posang,
-    char            **object
-);
-
 /** Insert a single rawImfileRow object into a table
  *
@@ -3889,13 +3287,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of rawImfileRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new rawImfileRow on success or NULL on failure.
- */
-
-rawImfileRow *rawImfilePopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -3913,18 +3302,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool rawImfilePopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -4078,16 +3453,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool p1PendingExpPop(
-    psDB            *dbh,               ///< Database handle
-    char            **exp_tag,
-    char            **recipe,
-    psS32           *p1_version
-);
-
 /** Insert a single p1PendingExpRow object into a table
  *
@@ -4112,13 +3475,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of p1PendingExpRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new p1PendingExpRow on success or NULL on failure.
- */
-
-p1PendingExpRow *p1PendingExpPopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -4136,18 +3490,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool p1PendingExpPopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -4304,17 +3644,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool p2PendingExpPop(
-    psDB            *dbh,               ///< Database handle
-    char            **exp_tag,
-    char            **recipe,
-    psS32           *p1_version,
-    psS32           *p2_version
-);
-
 /** Insert a single p2PendingExpRow object into a table
  *
@@ -4339,13 +3666,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of p2PendingExpRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new p2PendingExpRow on success or NULL on failure.
- */
-
-p2PendingExpRow *p2PendingExpPopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -4363,18 +3681,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool p2PendingExpPopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -4537,19 +3841,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool p2PendingImfilePop(
-    psDB            *dbh,               ///< Database handle
-    char            **exp_tag,
-    char            **class_id,
-    char            **uri,
-    char            **recipe,
-    psS32           *p1_version,
-    psS32           *p2_version
-);
-
 /** Insert a single p2PendingImfileRow object into a table
  *
@@ -4574,13 +3863,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of p2PendingImfileRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new p2PendingImfileRow on success or NULL on failure.
- */
-
-p2PendingImfileRow *p2PendingImfilePopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -4598,18 +3878,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool p2PendingImfilePopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -4763,16 +4029,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool p2ProcessedExpPop(
-    psDB            *dbh,               ///< Database handle
-    char            **exp_tag,
-    psS32           *p1_version,
-    psS32           *p2_version
-);
-
 /** Insert a single p2ProcessedExpRow object into a table
  *
@@ -4797,13 +4051,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of p2ProcessedExpRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new p2ProcessedExpRow on success or NULL on failure.
- */
-
-p2ProcessedExpRow *p2ProcessedExpPopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -4821,18 +4066,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool p2ProcessedExpPopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -5010,24 +4241,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool p2ProcessedImfilePop(
-    psDB            *dbh,               ///< Database handle
-    char            **exp_tag,
-    char            **class_id,
-    char            **uri,
-    char            **recipe,
-    psF64           *bg,
-    psF64           *bg_stdev,
-    psF64           *bg_mean_stdev,
-    char            **b1_uri,
-    char            **b2_uri,
-    psS32           *p1_version,
-    psS32           *p2_version
-);
-
 /** Insert a single p2ProcessedImfileRow object into a table
  *
@@ -5052,13 +4263,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of p2ProcessedImfileRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new p2ProcessedImfileRow on success or NULL on failure.
- */
-
-p2ProcessedImfileRow *p2ProcessedImfilePopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -5076,18 +4278,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool p2ProcessedImfilePopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -5241,16 +4429,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool p3PendingExpPop(
-    psDB            *dbh,               ///< Database handle
-    char            **exp_tag,
-    psS32           *p2_version,
-    psS32           *p3_version
-);
-
 /** Insert a single p3PendingExpRow object into a table
  *
@@ -5275,13 +4451,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of p3PendingExpRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new p3PendingExpRow on success or NULL on failure.
- */
-
-p3PendingExpRow *p3PendingExpPopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -5299,18 +4466,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool p3PendingExpPopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -5500,28 +4653,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool p3ProcessedExpPop(
-    psDB            *dbh,               ///< Database handle
-    char            **exp_tag,
-    char            **uri,
-    char            **recipe,
-    psF64           *bg,
-    psF64           *bg_stdev,
-    psF64           *bg_mean_stdev,
-    psF32           *sigma_ra,
-    psF32           *sigma_dec,
-    psS32           *nastro,
-    char            **b1_uri,
-    char            **b2_uri,
-    psF32           *zp_mean,
-    psF32           *zp_stdev,
-    psS32           *p2_version,
-    psS32           *p3_version
-);
-
 /** Insert a single p3ProcessedExpRow object into a table
  *
@@ -5546,13 +4675,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of p3ProcessedExpRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new p3ProcessedExpRow on success or NULL on failure.
- */
-
-p3ProcessedExpRow *p3ProcessedExpPopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -5572,18 +4692,4 @@
 );
 
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool p3ProcessedExpPopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
-);
-
 /** Selects up to limit from the database and returns them in a binary FITS table
  *
@@ -5676,4 +4782,5 @@
 
 typedef struct {
+    psS32           det_id;
     psS32           iteration;
     char            *det_type;
@@ -5687,4 +4794,5 @@
 
 detRunRow *detRunRowAlloc(
+    psS32           det_id,
     psS32           iteration,
     const char      *det_type,
@@ -5719,4 +4827,5 @@
 bool detRunInsert(
     psDB            *dbh,               ///< Database handle
+    psS32           det_id,
     psS32           iteration,
     const char      *det_type,
@@ -5735,16 +4844,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool detRunPop(
-    psDB            *dbh,               ///< Database handle
-    psS32           *iteration,
-    char            **det_type,
-    char            **state
-);
-
 /** Insert a single detRunRow object into a table
  *
@@ -5769,13 +4866,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of detRunRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new detRunRow on success or NULL on failure.
- */
-
-detRunRow *detRunPopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -5793,18 +4881,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool detRunPopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -5961,17 +5035,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool detInputExpPop(
-    psDB            *dbh,               ///< Database handle
-    psS32           *det_id,
-    psS32           *iteration,
-    char            **exp_tag,
-    bool            *include
-);
-
 /** Insert a single detInputExpRow object into a table
  *
@@ -5996,13 +5057,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of detInputExpRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new detInputExpRow on success or NULL on failure.
- */
-
-detInputExpRow *detInputExpPopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -6020,18 +5072,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool detInputExpPopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -6206,23 +5244,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool detProcessedImfilePop(
-    psDB            *dbh,               ///< Database handle
-    psS32           *det_id,
-    char            **exp_tag,
-    char            **class_id,
-    char            **uri,
-    char            **recipe,
-    psF64           *bg,
-    psF64           *bg_stdev,
-    psF64           *bg_mean_stdev,
-    char            **b1_uri,
-    char            **b2_uri
-);
-
 /** Insert a single detProcessedImfileRow object into a table
  *
@@ -6247,13 +5266,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of detProcessedImfileRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new detProcessedImfileRow on success or NULL on failure.
- */
-
-detProcessedImfileRow *detProcessedImfilePopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -6271,18 +5281,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool detProcessedImfilePopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -6451,21 +5447,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool detProcessedExpPop(
-    psDB            *dbh,               ///< Database handle
-    psS32           *det_id,
-    char            **exp_tag,
-    char            **recipe,
-    psF64           *bg,
-    psF64           *bg_stdev,
-    psF64           *bg_mean_stdev,
-    char            **b1_uri,
-    char            **b2_uri
-);
-
 /** Insert a single detProcessedExpRow object into a table
  *
@@ -6490,13 +5469,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of detProcessedExpRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new detProcessedExpRow on success or NULL on failure.
- */
-
-detProcessedExpRow *detProcessedExpPopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -6514,18 +5484,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool detProcessedExpPopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -6694,21 +5650,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool detStackedImfilePop(
-    psDB            *dbh,               ///< Database handle
-    psS32           *det_id,
-    psS32           *iteration,
-    char            **class_id,
-    char            **uri,
-    char            **recipe,
-    psF64           *bg,
-    psF64           *bg_stdev,
-    psF64           *bg_mean_stdev
-);
-
 /** Insert a single detStackedImfileRow object into a table
  *
@@ -6733,13 +5672,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of detStackedImfileRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new detStackedImfileRow on success or NULL on failure.
- */
-
-detStackedImfileRow *detStackedImfilePopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -6757,18 +5687,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool detStackedImfilePopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -6925,17 +5841,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool detNormalizedStatImfilePop(
-    psDB            *dbh,               ///< Database handle
-    psS32           *det_id,
-    psS32           *iteration,
-    char            **class_id,
-    psF32           *norm
-);
-
 /** Insert a single detNormalizedStatImfileRow object into a table
  *
@@ -6960,13 +5863,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of detNormalizedStatImfileRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new detNormalizedStatImfileRow on success or NULL on failure.
- */
-
-detNormalizedStatImfileRow *detNormalizedStatImfilePopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -6984,18 +5878,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool detNormalizedStatImfilePopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -7167,22 +6047,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool detNormalizedImfilePop(
-    psDB            *dbh,               ///< Database handle
-    psS32           *det_id,
-    psS32           *iteration,
-    char            **class_id,
-    char            **uri,
-    psF64           *bg,
-    psF64           *bg_stdev,
-    psF64           *bg_mean_stdev,
-    char            **b1_uri,
-    char            **b2_uri
-);
-
 /** Insert a single detNormalizedImfileRow object into a table
  *
@@ -7207,13 +6069,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of detNormalizedImfileRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new detNormalizedImfileRow on success or NULL on failure.
- */
-
-detNormalizedImfileRow *detNormalizedImfilePopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -7231,18 +6084,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool detNormalizedImfilePopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -7411,21 +6250,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool detNormalizedExpPop(
-    psDB            *dbh,               ///< Database handle
-    psS32           *det_id,
-    psS32           *iteration,
-    char            **recipe,
-    psF64           *bg,
-    psF64           *bg_stdev,
-    psF64           *bg_mean_stdev,
-    char            **b1_uri,
-    char            **b2_uri
-);
-
 /** Insert a single detNormalizedExpRow object into a table
  *
@@ -7450,13 +6272,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of detNormalizedExpRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new detNormalizedExpRow on success or NULL on failure.
- */
-
-detNormalizedExpRow *detNormalizedExpPopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -7474,18 +6287,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool detNormalizedExpPopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -7639,16 +6438,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool detMasterFramePop(
-    psDB            *dbh,               ///< Database handle
-    psS32           *det_id,
-    psS32           *iteration,
-    char            **comment
-);
-
 /** Insert a single detMasterFrameRow object into a table
  *
@@ -7673,13 +6460,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of detMasterFrameRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new detMasterFrameRow on success or NULL on failure.
- */
-
-detMasterFrameRow *detMasterFramePopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -7697,18 +6475,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool detMasterFramePopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -7865,17 +6629,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool detMasterImfilePop(
-    psDB            *dbh,               ///< Database handle
-    psS32           *det_id,
-    char            **class_id,
-    char            **uri,
-    char            **recipe
-);
-
 /** Insert a single detMasterImfileRow object into a table
  *
@@ -7900,13 +6651,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of detMasterImfileRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new detMasterImfileRow on success or NULL on failure.
- */
-
-detMasterImfileRow *detMasterImfilePopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -7924,18 +6666,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool detMasterImfilePopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -8113,24 +6841,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool detResidImfilePop(
-    psDB            *dbh,               ///< Database handle
-    psS32           *det_id,
-    psS32           *iteration,
-    char            **exp_tag,
-    char            **class_id,
-    char            **uri,
-    char            **recipe,
-    psF64           *bg,
-    psF64           *bg_stdev,
-    psF64           *bg_mean_stdev,
-    char            **b1_uri,
-    char            **b2_uri
-);
-
 /** Insert a single detResidImfileRow object into a table
  *
@@ -8155,13 +6863,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of detResidImfileRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new detResidImfileRow on success or NULL on failure.
- */
-
-detResidImfileRow *detResidImfilePopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -8179,18 +6878,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool detResidImfilePopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -8365,23 +7050,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool detResidExpPop(
-    psDB            *dbh,               ///< Database handle
-    psS32           *det_id,
-    psS32           *iteration,
-    char            **exp_tag,
-    char            **recipe,
-    psF64           *bg,
-    psF64           *bg_stdev,
-    psF64           *bg_mean_stdev,
-    char            **b1_uri,
-    char            **b2_uri,
-    bool            *accept
-);
-
 /** Insert a single detResidExpRow object into a table
  *
@@ -8406,13 +7072,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of detResidExpRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new detResidExpRow on success or NULL on failure.
- */
-
-detResidExpRow *detResidExpPopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -8430,18 +7087,4 @@
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
-);
-
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool detResidExpPopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -8604,19 +7247,4 @@
 );
 
-/** Removes the last row from the database and returns it
- *
- * @return true on success
- */
-
-bool detRunSummaryPop(
-    psDB            *dbh,               ///< Database handle
-    psS32           *det_id,
-    psS32           *iteration,
-    psF64           *bg,
-    psF64           *bg_stdev,
-    psF64           *bg_mean_stdev,
-    bool            *accept
-);
-
 /** Insert a single detRunSummaryRow object into a table
  *
@@ -8641,13 +7269,4 @@
     psDB            *dbh,               ///< Database handle
     psArray         *objects            ///< array of detRunSummaryRow objects
-);
-
-/** Removes the last row from the database and returns it
- *
- * @return A new detRunSummaryRow on success or NULL on failure.
- */
-
-detRunSummaryRow *detRunSummaryPopObject(
-    psDB            *dbh                ///< Database handle
 );
 
@@ -8667,18 +7286,4 @@
 );
 
-/** Removes the last limit row from the database and returns them in a binary FITS table.
- *
- * This function assumes an empty psFits object and will create a FITS table as
- * the first extension. 
- *
- * @return true on success
- */
-
-bool detRunSummaryPopFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    unsigned long long limit            ///< Maximum number of elements to return
-);
-
 /** Selects up to limit from the database and returns them in a binary FITS table
  *