Index: trunk/ippdb/src/ippdb.c
===================================================================
--- trunk/ippdb/src/ippdb.c	(revision 9242)
+++ trunk/ippdb/src/ippdb.c	(revision 9247)
@@ -260,18 +260,18 @@
 weatherRow *weatherRowAlloc(psF32 temp01, psF32 humi01, psF32 temp02, psF32 humi02, psF32 temp03, psF32 humi03, psF32 pressure)
 {
-    weatherRow      *object;
-
-    object = psAlloc(sizeof(weatherRow));
-    psMemSetDeallocator(object, (psFreeFunc)weatherRowFree);
-
-    object->temp01 = temp01;
-    object->humi01 = humi01;
-    object->temp02 = temp02;
-    object->humi02 = humi02;
-    object->temp03 = temp03;
-    object->humi03 = humi03;
-    object->pressure = pressure;
-
-    return object;
+    weatherRow      *_object;
+
+    _object = psAlloc(sizeof(weatherRow));
+    psMemSetDeallocator(_object, (psFreeFunc)weatherRowFree);
+
+    _object->temp01 = temp01;
+    _object->humi01 = humi01;
+    _object->temp02 = temp02;
+    _object->humi02 = humi02;
+    _object->temp03 = temp03;
+    _object->humi03 = humi03;
+    _object->pressure = pressure;
+
+    return _object;
 }
 
@@ -818,18 +818,18 @@
 skyp_transparencyRow *skyp_transparencyRowAlloc(const char *filter, psF64 trans, psS32 nstars, psF64 ra, psF64 decl, psF32 exptime, psF64 sky_bright)
 {
-    skyp_transparencyRow *object;
-
-    object = psAlloc(sizeof(skyp_transparencyRow));
-    psMemSetDeallocator(object, (psFreeFunc)skyp_transparencyRowFree);
-
-    object->filter = psStringCopy(filter);
-    object->trans = trans;
-    object->nstars = nstars;
-    object->ra = ra;
-    object->decl = decl;
-    object->exptime = exptime;
-    object->sky_bright = sky_bright;
-
-    return object;
+    skyp_transparencyRow *_object;
+
+    _object = psAlloc(sizeof(skyp_transparencyRow));
+    psMemSetDeallocator(_object, (psFreeFunc)skyp_transparencyRowFree);
+
+    _object->filter = psStringCopy(filter);
+    _object->trans = trans;
+    _object->nstars = nstars;
+    _object->ra = ra;
+    _object->decl = decl;
+    _object->exptime = exptime;
+    _object->sky_bright = sky_bright;
+
+    return _object;
 }
 
@@ -1377,20 +1377,20 @@
 skyp_absorptionRow *skyp_absorptionRowAlloc(const char *disperser_id, psF32 atmcomp1, psF32 atmcomp2, psF32 atmcomp3, psS32 nstars, psF64 ra, psF64 decl, psF32 exptime, psF64 sky_bright)
 {
-    skyp_absorptionRow *object;
-
-    object = psAlloc(sizeof(skyp_absorptionRow));
-    psMemSetDeallocator(object, (psFreeFunc)skyp_absorptionRowFree);
-
-    object->disperser_id = psStringCopy(disperser_id);
-    object->atmcomp1 = atmcomp1;
-    object->atmcomp2 = atmcomp2;
-    object->atmcomp3 = atmcomp3;
-    object->nstars = nstars;
-    object->ra = ra;
-    object->decl = decl;
-    object->exptime = exptime;
-    object->sky_bright = sky_bright;
-
-    return object;
+    skyp_absorptionRow *_object;
+
+    _object = psAlloc(sizeof(skyp_absorptionRow));
+    psMemSetDeallocator(_object, (psFreeFunc)skyp_absorptionRowFree);
+
+    _object->disperser_id = psStringCopy(disperser_id);
+    _object->atmcomp1 = atmcomp1;
+    _object->atmcomp2 = atmcomp2;
+    _object->atmcomp3 = atmcomp3;
+    _object->nstars = nstars;
+    _object->ra = ra;
+    _object->decl = decl;
+    _object->exptime = exptime;
+    _object->sky_bright = sky_bright;
+
+    return _object;
 }
 
@@ -1994,17 +1994,17 @@
 skyp_emissionRow *skyp_emissionRowAlloc(const char *disperser_id, psF32 atmcomp1, psF32 atmcomp2, psF32 atmcomp3, psF32 continuum, psF32 exptime)
 {
-    skyp_emissionRow *object;
-
-    object = psAlloc(sizeof(skyp_emissionRow));
-    psMemSetDeallocator(object, (psFreeFunc)skyp_emissionRowFree);
-
-    object->disperser_id = psStringCopy(disperser_id);
-    object->atmcomp1 = atmcomp1;
-    object->atmcomp2 = atmcomp2;
-    object->atmcomp3 = atmcomp3;
-    object->continuum = continuum;
-    object->exptime = exptime;
-
-    return object;
+    skyp_emissionRow *_object;
+
+    _object = psAlloc(sizeof(skyp_emissionRow));
+    psMemSetDeallocator(_object, (psFreeFunc)skyp_emissionRowFree);
+
+    _object->disperser_id = psStringCopy(disperser_id);
+    _object->atmcomp1 = atmcomp1;
+    _object->atmcomp2 = atmcomp2;
+    _object->atmcomp3 = atmcomp3;
+    _object->continuum = continuum;
+    _object->exptime = exptime;
+
+    return _object;
 }
 
@@ -2524,18 +2524,18 @@
 dimmRow *dimmRowAlloc(psF32 sigmax, psF32 sigmay, psF32 fwhm, psF64 ra, psF64 decl, psF32 expttime, const char *telescope_id)
 {
-    dimmRow         *object;
-
-    object = psAlloc(sizeof(dimmRow));
-    psMemSetDeallocator(object, (psFreeFunc)dimmRowFree);
-
-    object->sigmax = sigmax;
-    object->sigmay = sigmay;
-    object->fwhm = fwhm;
-    object->ra = ra;
-    object->decl = decl;
-    object->expttime = expttime;
-    object->telescope_id = psStringCopy(telescope_id);
-
-    return object;
+    dimmRow         *_object;
+
+    _object = psAlloc(sizeof(dimmRow));
+    psMemSetDeallocator(_object, (psFreeFunc)dimmRowFree);
+
+    _object->sigmax = sigmax;
+    _object->sigmay = sigmay;
+    _object->fwhm = fwhm;
+    _object->ra = ra;
+    _object->decl = decl;
+    _object->expttime = expttime;
+    _object->telescope_id = psStringCopy(telescope_id);
+
+    return _object;
 }
 
@@ -3083,17 +3083,17 @@
 skyp_irRow *skyp_irRowAlloc(psF64 sky_bright, psF64 sky_var, psF64 ra, psF64 decl, psF32 fov_x, psF32 fov_y)
 {
-    skyp_irRow      *object;
-
-    object = psAlloc(sizeof(skyp_irRow));
-    psMemSetDeallocator(object, (psFreeFunc)skyp_irRowFree);
-
-    object->sky_bright = sky_bright;
-    object->sky_var = sky_var;
-    object->ra = ra;
-    object->decl = decl;
-    object->fov_x = fov_x;
-    object->fov_y = fov_y;
-
-    return object;
+    skyp_irRow      *_object;
+
+    _object = psAlloc(sizeof(skyp_irRow));
+    psMemSetDeallocator(_object, (psFreeFunc)skyp_irRowFree);
+
+    _object->sky_bright = sky_bright;
+    _object->sky_var = sky_var;
+    _object->ra = ra;
+    _object->decl = decl;
+    _object->fov_x = fov_x;
+    _object->fov_y = fov_y;
+
+    return _object;
 }
 
@@ -3612,15 +3612,15 @@
 domeRow *domeRowAlloc(psF32 az, bool open, bool light, bool track)
 {
-    domeRow         *object;
-
-    object = psAlloc(sizeof(domeRow));
-    psMemSetDeallocator(object, (psFreeFunc)domeRowFree);
-
-    object->az = az;
-    object->open = open;
-    object->light = light;
-    object->track = track;
-
-    return object;
+    domeRow         *_object;
+
+    _object = psAlloc(sizeof(domeRow));
+    psMemSetDeallocator(_object, (psFreeFunc)domeRowFree);
+
+    _object->az = az;
+    _object->open = open;
+    _object->light = light;
+    _object->track = track;
+
+    return _object;
 }
 
@@ -4083,16 +4083,16 @@
 telescopeRow *telescopeRowAlloc(const char *guide, psF32 alt, psF32 az, psF64 ra, psF64 decl)
 {
-    telescopeRow    *object;
-
-    object = psAlloc(sizeof(telescopeRow));
-    psMemSetDeallocator(object, (psFreeFunc)telescopeRowFree);
-
-    object->guide = psStringCopy(guide);
-    object->alt = alt;
-    object->az = az;
-    object->ra = ra;
-    object->decl = decl;
-
-    return object;
+    telescopeRow    *_object;
+
+    _object = psAlloc(sizeof(telescopeRow));
+    psMemSetDeallocator(_object, (psFreeFunc)telescopeRowFree);
+
+    _object->guide = psStringCopy(guide);
+    _object->alt = alt;
+    _object->az = az;
+    _object->ra = ra;
+    _object->decl = decl;
+
+    return _object;
 }
 
@@ -4584,16 +4584,16 @@
 summitExpRow *summitExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, const char *uri)
 {
-    summitExpRow    *object;
-
-    object = psAlloc(sizeof(summitExpRow));
-    psMemSetDeallocator(object, (psFreeFunc)summitExpRowFree);
-
-    object->exp_id = psStringCopy(exp_id);
-    object->camera = psStringCopy(camera);
-    object->telescope = psStringCopy(telescope);
-    object->exp_type = psStringCopy(exp_type);
-    object->uri = psStringCopy(uri);
-
-    return object;
+    summitExpRow    *_object;
+
+    _object = psAlloc(sizeof(summitExpRow));
+    psMemSetDeallocator(_object, (psFreeFunc)summitExpRowFree);
+
+    _object->exp_id = psStringCopy(exp_id);
+    _object->camera = psStringCopy(camera);
+    _object->telescope = psStringCopy(telescope);
+    _object->exp_type = psStringCopy(exp_type);
+    _object->uri = psStringCopy(uri);
+
+    return _object;
 }
 
@@ -5089,16 +5089,16 @@
 pzPendingExpRow *pzPendingExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles)
 {
-    pzPendingExpRow *object;
-
-    object = psAlloc(sizeof(pzPendingExpRow));
-    psMemSetDeallocator(object, (psFreeFunc)pzPendingExpRowFree);
-
-    object->exp_id = psStringCopy(exp_id);
-    object->camera = psStringCopy(camera);
-    object->telescope = psStringCopy(telescope);
-    object->exp_type = psStringCopy(exp_type);
-    object->imfiles = imfiles;
-
-    return object;
+    pzPendingExpRow *_object;
+
+    _object = psAlloc(sizeof(pzPendingExpRow));
+    psMemSetDeallocator(_object, (psFreeFunc)pzPendingExpRowFree);
+
+    _object->exp_id = psStringCopy(exp_id);
+    _object->camera = psStringCopy(camera);
+    _object->telescope = psStringCopy(telescope);
+    _object->exp_type = psStringCopy(exp_type);
+    _object->imfiles = imfiles;
+
+    return _object;
 }
 
@@ -5593,19 +5593,19 @@
 pzPendingImfileRow *pzPendingImfileRowAlloc(const char *exp_id, const char *camera, const char *telescope, psS32 bytes, const char *md5sum, const char *class, const char *class_id, const char *uri)
 {
-    pzPendingImfileRow *object;
-
-    object = psAlloc(sizeof(pzPendingImfileRow));
-    psMemSetDeallocator(object, (psFreeFunc)pzPendingImfileRowFree);
-
-    object->exp_id = psStringCopy(exp_id);
-    object->camera = psStringCopy(camera);
-    object->telescope = psStringCopy(telescope);
-    object->bytes = bytes;
-    object->md5sum = psStringCopy(md5sum);
-    object->class = psStringCopy(class);
-    object->class_id = psStringCopy(class_id);
-    object->uri = psStringCopy(uri);
-
-    return object;
+    pzPendingImfileRow *_object;
+
+    _object = psAlloc(sizeof(pzPendingImfileRow));
+    psMemSetDeallocator(_object, (psFreeFunc)pzPendingImfileRowFree);
+
+    _object->exp_id = psStringCopy(exp_id);
+    _object->camera = psStringCopy(camera);
+    _object->telescope = psStringCopy(telescope);
+    _object->bytes = bytes;
+    _object->md5sum = psStringCopy(md5sum);
+    _object->class = psStringCopy(class);
+    _object->class_id = psStringCopy(class_id);
+    _object->uri = psStringCopy(uri);
+
+    return _object;
 }
 
@@ -6187,17 +6187,17 @@
 newExpRow *newExpRowAlloc(const char *exp_tag, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles)
 {
-    newExpRow       *object;
-
-    object = psAlloc(sizeof(newExpRow));
-    psMemSetDeallocator(object, (psFreeFunc)newExpRowFree);
-
-    object->exp_tag = psStringCopy(exp_tag);
-    object->exp_id = psStringCopy(exp_id);
-    object->camera = psStringCopy(camera);
-    object->telescope = psStringCopy(telescope);
-    object->exp_type = psStringCopy(exp_type);
-    object->imfiles = imfiles;
-
-    return object;
+    newExpRow       *_object;
+
+    _object = psAlloc(sizeof(newExpRow));
+    psMemSetDeallocator(_object, (psFreeFunc)newExpRowFree);
+
+    _object->exp_tag = psStringCopy(exp_tag);
+    _object->exp_id = psStringCopy(exp_id);
+    _object->camera = psStringCopy(camera);
+    _object->telescope = psStringCopy(telescope);
+    _object->exp_type = psStringCopy(exp_type);
+    _object->imfiles = imfiles;
+
+    return _object;
 }
 
@@ -6721,15 +6721,15 @@
 newImfileRow *newImfileRowAlloc(const char *exp_tag, const char *class, const char *class_id, const char *uri)
 {
-    newImfileRow    *object;
-
-    object = psAlloc(sizeof(newImfileRow));
-    psMemSetDeallocator(object, (psFreeFunc)newImfileRowFree);
-
-    object->exp_tag = psStringCopy(exp_tag);
-    object->class = psStringCopy(class);
-    object->class_id = psStringCopy(class_id);
-    object->uri = psStringCopy(uri);
-
-    return object;
+    newImfileRow    *_object;
+
+    _object = psAlloc(sizeof(newImfileRow));
+    psMemSetDeallocator(_object, (psFreeFunc)newImfileRowFree);
+
+    _object->exp_tag = psStringCopy(exp_tag);
+    _object->class = psStringCopy(class);
+    _object->class_id = psStringCopy(class_id);
+    _object->uri = psStringCopy(uri);
+
+    return _object;
 }
 
@@ -7196,29 +7196,29 @@
 rawDetrendExpRow *rawDetrendExpRowAlloc(const char *exp_tag, 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 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object)
 {
-    rawDetrendExpRow *object;
-
-    object = psAlloc(sizeof(rawDetrendExpRow));
-    psMemSetDeallocator(object, (psFreeFunc)rawDetrendExpRowFree);
-
-    object->exp_tag = psStringCopy(exp_tag);
-    object->camera = psStringCopy(camera);
-    object->telescope = psStringCopy(telescope);
-    object->exp_type = psStringCopy(exp_type);
-    object->imfiles = imfiles;
-    object->filter = psStringCopy(filter);
-    object->airmass = airmass;
-    object->ra = ra;
-    object->decl = decl;
-    object->exp_time = exp_time;
-    object->bg = bg;
-    object->bg_stdev = bg_stdev;
-    object->bg_mean_stdev = bg_mean_stdev;
-    object->alt = alt;
-    object->az = az;
-    object->ccd_temp = ccd_temp;
-    object->posang = posang;
-    object->object = psStringCopy(object);
-
-    return object;
+    rawDetrendExpRow *_object;
+
+    _object = psAlloc(sizeof(rawDetrendExpRow));
+    psMemSetDeallocator(_object, (psFreeFunc)rawDetrendExpRowFree);
+
+    _object->exp_tag = psStringCopy(exp_tag);
+    _object->camera = psStringCopy(camera);
+    _object->telescope = psStringCopy(telescope);
+    _object->exp_type = psStringCopy(exp_type);
+    _object->imfiles = imfiles;
+    _object->filter = psStringCopy(filter);
+    _object->airmass = airmass;
+    _object->ra = ra;
+    _object->decl = decl;
+    _object->exp_time = exp_time;
+    _object->bg = bg;
+    _object->bg_stdev = bg_stdev;
+    _object->bg_mean_stdev = bg_mean_stdev;
+    _object->alt = alt;
+    _object->az = az;
+    _object->ccd_temp = ccd_temp;
+    _object->posang = posang;
+    _object->object = psStringCopy(object);
+
+    return _object;
 }
 
@@ -8079,29 +8079,29 @@
 rawScienceExpRow *rawScienceExpRowAlloc(const char *exp_tag, 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 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object)
 {
-    rawScienceExpRow *object;
-
-    object = psAlloc(sizeof(rawScienceExpRow));
-    psMemSetDeallocator(object, (psFreeFunc)rawScienceExpRowFree);
-
-    object->exp_tag = psStringCopy(exp_tag);
-    object->camera = psStringCopy(camera);
-    object->telescope = psStringCopy(telescope);
-    object->exp_type = psStringCopy(exp_type);
-    object->imfiles = imfiles;
-    object->filter = psStringCopy(filter);
-    object->airmass = airmass;
-    object->ra = ra;
-    object->decl = decl;
-    object->exp_time = exp_time;
-    object->bg = bg;
-    object->bg_stdev = bg_stdev;
-    object->bg_mean_stdev = bg_mean_stdev;
-    object->alt = alt;
-    object->az = az;
-    object->ccd_temp = ccd_temp;
-    object->posang = posang;
-    object->object = psStringCopy(object);
-
-    return object;
+    rawScienceExpRow *_object;
+
+    _object = psAlloc(sizeof(rawScienceExpRow));
+    psMemSetDeallocator(_object, (psFreeFunc)rawScienceExpRowFree);
+
+    _object->exp_tag = psStringCopy(exp_tag);
+    _object->camera = psStringCopy(camera);
+    _object->telescope = psStringCopy(telescope);
+    _object->exp_type = psStringCopy(exp_type);
+    _object->imfiles = imfiles;
+    _object->filter = psStringCopy(filter);
+    _object->airmass = airmass;
+    _object->ra = ra;
+    _object->decl = decl;
+    _object->exp_time = exp_time;
+    _object->bg = bg;
+    _object->bg_stdev = bg_stdev;
+    _object->bg_mean_stdev = bg_mean_stdev;
+    _object->alt = alt;
+    _object->az = az;
+    _object->ccd_temp = ccd_temp;
+    _object->posang = posang;
+    _object->object = psStringCopy(object);
+
+    return _object;
 }
 
@@ -8962,29 +8962,29 @@
 rawImfileRow *rawImfileRowAlloc(const char *exp_tag, const char *class, const char *class_id, const char *uri, const char *exp_type, const 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, const char *object)
 {
-    rawImfileRow    *object;
-
-    object = psAlloc(sizeof(rawImfileRow));
-    psMemSetDeallocator(object, (psFreeFunc)rawImfileRowFree);
-
-    object->exp_tag = psStringCopy(exp_tag);
-    object->class = psStringCopy(class);
-    object->class_id = psStringCopy(class_id);
-    object->uri = psStringCopy(uri);
-    object->exp_type = psStringCopy(exp_type);
-    object->filter = psStringCopy(filter);
-    object->airmass = airmass;
-    object->ra = ra;
-    object->decl = decl;
-    object->exp_time = exp_time;
-    object->bg = bg;
-    object->bg_stdev = bg_stdev;
-    object->bg_mean_stdev = bg_mean_stdev;
-    object->alt = alt;
-    object->az = az;
-    object->ccd_temp = ccd_temp;
-    object->posang = posang;
-    object->object = psStringCopy(object);
-
-    return object;
+    rawImfileRow    *_object;
+
+    _object = psAlloc(sizeof(rawImfileRow));
+    psMemSetDeallocator(_object, (psFreeFunc)rawImfileRowFree);
+
+    _object->exp_tag = psStringCopy(exp_tag);
+    _object->class = psStringCopy(class);
+    _object->class_id = psStringCopy(class_id);
+    _object->uri = psStringCopy(uri);
+    _object->exp_type = psStringCopy(exp_type);
+    _object->filter = psStringCopy(filter);
+    _object->airmass = airmass;
+    _object->ra = ra;
+    _object->decl = decl;
+    _object->exp_time = exp_time;
+    _object->bg = bg;
+    _object->bg_stdev = bg_stdev;
+    _object->bg_mean_stdev = bg_mean_stdev;
+    _object->alt = alt;
+    _object->az = az;
+    _object->ccd_temp = ccd_temp;
+    _object->posang = posang;
+    _object->object = psStringCopy(object);
+
+    return _object;
 }
 
@@ -9846,14 +9846,14 @@
 p1PendingExpRow *p1PendingExpRowAlloc(const char *exp_tag, const char *recipe, psS32 p1_version)
 {
-    p1PendingExpRow *object;
-
-    object = psAlloc(sizeof(p1PendingExpRow));
-    psMemSetDeallocator(object, (psFreeFunc)p1PendingExpRowFree);
-
-    object->exp_tag = psStringCopy(exp_tag);
-    object->recipe = psStringCopy(recipe);
-    object->p1_version = p1_version;
-
-    return object;
+    p1PendingExpRow *_object;
+
+    _object = psAlloc(sizeof(p1PendingExpRow));
+    psMemSetDeallocator(_object, (psFreeFunc)p1PendingExpRowFree);
+
+    _object->exp_tag = psStringCopy(exp_tag);
+    _object->recipe = psStringCopy(recipe);
+    _object->p1_version = p1_version;
+
+    return _object;
 }
 
@@ -10290,15 +10290,15 @@
 p2PendingExpRow *p2PendingExpRowAlloc(const char *exp_tag, const char *recipe, psS32 p1_version, psS32 p2_version)
 {
-    p2PendingExpRow *object;
-
-    object = psAlloc(sizeof(p2PendingExpRow));
-    psMemSetDeallocator(object, (psFreeFunc)p2PendingExpRowFree);
-
-    object->exp_tag = psStringCopy(exp_tag);
-    object->recipe = psStringCopy(recipe);
-    object->p1_version = p1_version;
-    object->p2_version = p2_version;
-
-    return object;
+    p2PendingExpRow *_object;
+
+    _object = psAlloc(sizeof(p2PendingExpRow));
+    psMemSetDeallocator(_object, (psFreeFunc)p2PendingExpRowFree);
+
+    _object->exp_tag = psStringCopy(exp_tag);
+    _object->recipe = psStringCopy(recipe);
+    _object->p1_version = p1_version;
+    _object->p2_version = p2_version;
+
+    return _object;
 }
 
@@ -10763,17 +10763,17 @@
 p2PendingImfileRow *p2PendingImfileRowAlloc(const char *exp_tag, const char *class_id, const char *uri, const char *recipe, psS32 p1_version, psS32 p2_version)
 {
-    p2PendingImfileRow *object;
-
-    object = psAlloc(sizeof(p2PendingImfileRow));
-    psMemSetDeallocator(object, (psFreeFunc)p2PendingImfileRowFree);
-
-    object->exp_tag = psStringCopy(exp_tag);
-    object->class_id = psStringCopy(class_id);
-    object->uri = psStringCopy(uri);
-    object->recipe = psStringCopy(recipe);
-    object->p1_version = p1_version;
-    object->p2_version = p2_version;
-
-    return object;
+    p2PendingImfileRow *_object;
+
+    _object = psAlloc(sizeof(p2PendingImfileRow));
+    psMemSetDeallocator(_object, (psFreeFunc)p2PendingImfileRowFree);
+
+    _object->exp_tag = psStringCopy(exp_tag);
+    _object->class_id = psStringCopy(class_id);
+    _object->uri = psStringCopy(uri);
+    _object->recipe = psStringCopy(recipe);
+    _object->p1_version = p1_version;
+    _object->p2_version = p2_version;
+
+    return _object;
 }
 
@@ -11296,14 +11296,14 @@
 p2ProcessedExpRow *p2ProcessedExpRowAlloc(const char *exp_tag, psS32 p1_version, psS32 p2_version)
 {
-    p2ProcessedExpRow *object;
-
-    object = psAlloc(sizeof(p2ProcessedExpRow));
-    psMemSetDeallocator(object, (psFreeFunc)p2ProcessedExpRowFree);
-
-    object->exp_tag = psStringCopy(exp_tag);
-    object->p1_version = p1_version;
-    object->p2_version = p2_version;
-
-    return object;
+    p2ProcessedExpRow *_object;
+
+    _object = psAlloc(sizeof(p2ProcessedExpRow));
+    psMemSetDeallocator(_object, (psFreeFunc)p2ProcessedExpRowFree);
+
+    _object->exp_tag = psStringCopy(exp_tag);
+    _object->p1_version = p1_version;
+    _object->p2_version = p2_version;
+
+    return _object;
 }
 
@@ -11739,22 +11739,22 @@
 p2ProcessedImfileRow *p2ProcessedImfileRowAlloc(const char *exp_tag, const char *class_id, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri, psS32 p1_version, psS32 p2_version)
 {
-    p2ProcessedImfileRow *object;
-
-    object = psAlloc(sizeof(p2ProcessedImfileRow));
-    psMemSetDeallocator(object, (psFreeFunc)p2ProcessedImfileRowFree);
-
-    object->exp_tag = psStringCopy(exp_tag);
-    object->class_id = psStringCopy(class_id);
-    object->uri = psStringCopy(uri);
-    object->recipe = psStringCopy(recipe);
-    object->bg = bg;
-    object->bg_stdev = bg_stdev;
-    object->bg_mean_stdev = bg_mean_stdev;
-    object->b1_uri = psStringCopy(b1_uri);
-    object->b2_uri = psStringCopy(b2_uri);
-    object->p1_version = p1_version;
-    object->p2_version = p2_version;
-
-    return object;
+    p2ProcessedImfileRow *_object;
+
+    _object = psAlloc(sizeof(p2ProcessedImfileRow));
+    psMemSetDeallocator(_object, (psFreeFunc)p2ProcessedImfileRowFree);
+
+    _object->exp_tag = psStringCopy(exp_tag);
+    _object->class_id = psStringCopy(class_id);
+    _object->uri = psStringCopy(uri);
+    _object->recipe = psStringCopy(recipe);
+    _object->bg = bg;
+    _object->bg_stdev = bg_stdev;
+    _object->bg_mean_stdev = bg_mean_stdev;
+    _object->b1_uri = psStringCopy(b1_uri);
+    _object->b2_uri = psStringCopy(b2_uri);
+    _object->p1_version = p1_version;
+    _object->p2_version = p2_version;
+
+    return _object;
 }
 
@@ -12419,14 +12419,14 @@
 p3PendingExpRow *p3PendingExpRowAlloc(const char *exp_tag, psS32 p2_version, psS32 p3_version)
 {
-    p3PendingExpRow *object;
-
-    object = psAlloc(sizeof(p3PendingExpRow));
-    psMemSetDeallocator(object, (psFreeFunc)p3PendingExpRowFree);
-
-    object->exp_tag = psStringCopy(exp_tag);
-    object->p2_version = p2_version;
-    object->p3_version = p3_version;
-
-    return object;
+    p3PendingExpRow *_object;
+
+    _object = psAlloc(sizeof(p3PendingExpRow));
+    psMemSetDeallocator(_object, (psFreeFunc)p3PendingExpRowFree);
+
+    _object->exp_tag = psStringCopy(exp_tag);
+    _object->p2_version = p2_version;
+    _object->p3_version = p3_version;
+
+    return _object;
 }
 
@@ -12862,14 +12862,14 @@
 detRunRow *detRunRowAlloc(psS32 iteration, const char *det_type, const char *state)
 {
-    detRunRow       *object;
-
-    object = psAlloc(sizeof(detRunRow));
-    psMemSetDeallocator(object, (psFreeFunc)detRunRowFree);
-
-    object->iteration = iteration;
-    object->det_type = psStringCopy(det_type);
-    object->state = psStringCopy(state);
-
-    return object;
+    detRunRow       *_object;
+
+    _object = psAlloc(sizeof(detRunRow));
+    psMemSetDeallocator(_object, (psFreeFunc)detRunRowFree);
+
+    _object->iteration = iteration;
+    _object->det_type = psStringCopy(det_type);
+    _object->state = psStringCopy(state);
+
+    return _object;
 }
 
@@ -13306,15 +13306,15 @@
 detInputExpRow *detInputExpRowAlloc(psS32 det_id, psS32 iteration, const char *exp_tag, bool include)
 {
-    detInputExpRow  *object;
-
-    object = psAlloc(sizeof(detInputExpRow));
-    psMemSetDeallocator(object, (psFreeFunc)detInputExpRowFree);
-
-    object->det_id = det_id;
-    object->iteration = iteration;
-    object->exp_tag = psStringCopy(exp_tag);
-    object->include = include;
-
-    return object;
+    detInputExpRow  *_object;
+
+    _object = psAlloc(sizeof(detInputExpRow));
+    psMemSetDeallocator(_object, (psFreeFunc)detInputExpRowFree);
+
+    _object->det_id = det_id;
+    _object->iteration = iteration;
+    _object->exp_tag = psStringCopy(exp_tag);
+    _object->include = include;
+
+    return _object;
 }
 
@@ -13778,21 +13778,21 @@
 detProcessedImfileRow *detProcessedImfileRowAlloc(psS32 det_id, const char *exp_tag, const char *class_id, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri)
 {
-    detProcessedImfileRow *object;
-
-    object = psAlloc(sizeof(detProcessedImfileRow));
-    psMemSetDeallocator(object, (psFreeFunc)detProcessedImfileRowFree);
-
-    object->det_id = det_id;
-    object->exp_tag = psStringCopy(exp_tag);
-    object->class_id = psStringCopy(class_id);
-    object->uri = psStringCopy(uri);
-    object->recipe = psStringCopy(recipe);
-    object->bg = bg;
-    object->bg_stdev = bg_stdev;
-    object->bg_mean_stdev = bg_mean_stdev;
-    object->b1_uri = psStringCopy(b1_uri);
-    object->b2_uri = psStringCopy(b2_uri);
-
-    return object;
+    detProcessedImfileRow *_object;
+
+    _object = psAlloc(sizeof(detProcessedImfileRow));
+    psMemSetDeallocator(_object, (psFreeFunc)detProcessedImfileRowFree);
+
+    _object->det_id = det_id;
+    _object->exp_tag = psStringCopy(exp_tag);
+    _object->class_id = psStringCopy(class_id);
+    _object->uri = psStringCopy(uri);
+    _object->recipe = psStringCopy(recipe);
+    _object->bg = bg;
+    _object->bg_stdev = bg_stdev;
+    _object->bg_mean_stdev = bg_mean_stdev;
+    _object->b1_uri = psStringCopy(b1_uri);
+    _object->b2_uri = psStringCopy(b2_uri);
+
+    return _object;
 }
 
@@ -14429,19 +14429,19 @@
 detProcessedExpRow *detProcessedExpRowAlloc(psS32 det_id, const char *exp_tag, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri)
 {
-    detProcessedExpRow *object;
-
-    object = psAlloc(sizeof(detProcessedExpRow));
-    psMemSetDeallocator(object, (psFreeFunc)detProcessedExpRowFree);
-
-    object->det_id = det_id;
-    object->exp_tag = psStringCopy(exp_tag);
-    object->recipe = psStringCopy(recipe);
-    object->bg = bg;
-    object->bg_stdev = bg_stdev;
-    object->bg_mean_stdev = bg_mean_stdev;
-    object->b1_uri = psStringCopy(b1_uri);
-    object->b2_uri = psStringCopy(b2_uri);
-
-    return object;
+    detProcessedExpRow *_object;
+
+    _object = psAlloc(sizeof(detProcessedExpRow));
+    psMemSetDeallocator(_object, (psFreeFunc)detProcessedExpRowFree);
+
+    _object->det_id = det_id;
+    _object->exp_tag = psStringCopy(exp_tag);
+    _object->recipe = psStringCopy(recipe);
+    _object->bg = bg;
+    _object->bg_stdev = bg_stdev;
+    _object->bg_mean_stdev = bg_mean_stdev;
+    _object->b1_uri = psStringCopy(b1_uri);
+    _object->b2_uri = psStringCopy(b2_uri);
+
+    return _object;
 }
 
@@ -15020,19 +15020,19 @@
 detStackedImfileRow *detStackedImfileRowAlloc(psS32 det_id, psS32 iteration, const char *class_id, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev)
 {
-    detStackedImfileRow *object;
-
-    object = psAlloc(sizeof(detStackedImfileRow));
-    psMemSetDeallocator(object, (psFreeFunc)detStackedImfileRowFree);
-
-    object->det_id = det_id;
-    object->iteration = iteration;
-    object->class_id = psStringCopy(class_id);
-    object->uri = psStringCopy(uri);
-    object->recipe = psStringCopy(recipe);
-    object->bg = bg;
-    object->bg_stdev = bg_stdev;
-    object->bg_mean_stdev = bg_mean_stdev;
-
-    return object;
+    detStackedImfileRow *_object;
+
+    _object = psAlloc(sizeof(detStackedImfileRow));
+    psMemSetDeallocator(_object, (psFreeFunc)detStackedImfileRowFree);
+
+    _object->det_id = det_id;
+    _object->iteration = iteration;
+    _object->class_id = psStringCopy(class_id);
+    _object->uri = psStringCopy(uri);
+    _object->recipe = psStringCopy(recipe);
+    _object->bg = bg;
+    _object->bg_stdev = bg_stdev;
+    _object->bg_mean_stdev = bg_mean_stdev;
+
+    return _object;
 }
 
@@ -15610,15 +15610,15 @@
 detNormalizedStatImfileRow *detNormalizedStatImfileRowAlloc(psS32 det_id, psS32 iteration, const char *class_id, psF32 norm)
 {
-    detNormalizedStatImfileRow *object;
-
-    object = psAlloc(sizeof(detNormalizedStatImfileRow));
-    psMemSetDeallocator(object, (psFreeFunc)detNormalizedStatImfileRowFree);
-
-    object->det_id = det_id;
-    object->iteration = iteration;
-    object->class_id = psStringCopy(class_id);
-    object->norm = norm;
-
-    return object;
+    detNormalizedStatImfileRow *_object;
+
+    _object = psAlloc(sizeof(detNormalizedStatImfileRow));
+    psMemSetDeallocator(_object, (psFreeFunc)detNormalizedStatImfileRowFree);
+
+    _object->det_id = det_id;
+    _object->iteration = iteration;
+    _object->class_id = psStringCopy(class_id);
+    _object->norm = norm;
+
+    return _object;
 }
 
@@ -16082,20 +16082,20 @@
 detNormalizedImfileRow *detNormalizedImfileRowAlloc(psS32 det_id, psS32 iteration, const char *class_id, const char *uri, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri)
 {
-    detNormalizedImfileRow *object;
-
-    object = psAlloc(sizeof(detNormalizedImfileRow));
-    psMemSetDeallocator(object, (psFreeFunc)detNormalizedImfileRowFree);
-
-    object->det_id = det_id;
-    object->iteration = iteration;
-    object->class_id = psStringCopy(class_id);
-    object->uri = psStringCopy(uri);
-    object->bg = bg;
-    object->bg_stdev = bg_stdev;
-    object->bg_mean_stdev = bg_mean_stdev;
-    object->b1_uri = psStringCopy(b1_uri);
-    object->b2_uri = psStringCopy(b2_uri);
-
-    return object;
+    detNormalizedImfileRow *_object;
+
+    _object = psAlloc(sizeof(detNormalizedImfileRow));
+    psMemSetDeallocator(_object, (psFreeFunc)detNormalizedImfileRowFree);
+
+    _object->det_id = det_id;
+    _object->iteration = iteration;
+    _object->class_id = psStringCopy(class_id);
+    _object->uri = psStringCopy(uri);
+    _object->bg = bg;
+    _object->bg_stdev = bg_stdev;
+    _object->bg_mean_stdev = bg_mean_stdev;
+    _object->b1_uri = psStringCopy(b1_uri);
+    _object->b2_uri = psStringCopy(b2_uri);
+
+    return _object;
 }
 
@@ -16702,19 +16702,19 @@
 detNormalizedExpRow *detNormalizedExpRowAlloc(psS32 det_id, psS32 iteration, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri)
 {
-    detNormalizedExpRow *object;
-
-    object = psAlloc(sizeof(detNormalizedExpRow));
-    psMemSetDeallocator(object, (psFreeFunc)detNormalizedExpRowFree);
-
-    object->det_id = det_id;
-    object->iteration = iteration;
-    object->recipe = psStringCopy(recipe);
-    object->bg = bg;
-    object->bg_stdev = bg_stdev;
-    object->bg_mean_stdev = bg_mean_stdev;
-    object->b1_uri = psStringCopy(b1_uri);
-    object->b2_uri = psStringCopy(b2_uri);
-
-    return object;
+    detNormalizedExpRow *_object;
+
+    _object = psAlloc(sizeof(detNormalizedExpRow));
+    psMemSetDeallocator(_object, (psFreeFunc)detNormalizedExpRowFree);
+
+    _object->det_id = det_id;
+    _object->iteration = iteration;
+    _object->recipe = psStringCopy(recipe);
+    _object->bg = bg;
+    _object->bg_stdev = bg_stdev;
+    _object->bg_mean_stdev = bg_mean_stdev;
+    _object->b1_uri = psStringCopy(b1_uri);
+    _object->b2_uri = psStringCopy(b2_uri);
+
+    return _object;
 }
 
@@ -17292,14 +17292,14 @@
 detMasterFrameRow *detMasterFrameRowAlloc(psS32 det_id, psS32 iteration, const char *comment)
 {
-    detMasterFrameRow *object;
-
-    object = psAlloc(sizeof(detMasterFrameRow));
-    psMemSetDeallocator(object, (psFreeFunc)detMasterFrameRowFree);
-
-    object->det_id = det_id;
-    object->iteration = iteration;
-    object->comment = psStringCopy(comment);
-
-    return object;
+    detMasterFrameRow *_object;
+
+    _object = psAlloc(sizeof(detMasterFrameRow));
+    psMemSetDeallocator(_object, (psFreeFunc)detMasterFrameRowFree);
+
+    _object->det_id = det_id;
+    _object->iteration = iteration;
+    _object->comment = psStringCopy(comment);
+
+    return _object;
 }
 
@@ -17735,15 +17735,15 @@
 detMasterImfileRow *detMasterImfileRowAlloc(psS32 det_id, const char *class_id, const char *uri, const char *recipe)
 {
-    detMasterImfileRow *object;
-
-    object = psAlloc(sizeof(detMasterImfileRow));
-    psMemSetDeallocator(object, (psFreeFunc)detMasterImfileRowFree);
-
-    object->det_id = det_id;
-    object->class_id = psStringCopy(class_id);
-    object->uri = psStringCopy(uri);
-    object->recipe = psStringCopy(recipe);
-
-    return object;
+    detMasterImfileRow *_object;
+
+    _object = psAlloc(sizeof(detMasterImfileRow));
+    psMemSetDeallocator(_object, (psFreeFunc)detMasterImfileRowFree);
+
+    _object->det_id = det_id;
+    _object->class_id = psStringCopy(class_id);
+    _object->uri = psStringCopy(uri);
+    _object->recipe = psStringCopy(recipe);
+
+    return _object;
 }
 
@@ -18209,22 +18209,22 @@
 detResidImfileRow *detResidImfileRowAlloc(psS32 det_id, psS32 iteration, const char *exp_tag, const char *class_id, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri)
 {
-    detResidImfileRow *object;
-
-    object = psAlloc(sizeof(detResidImfileRow));
-    psMemSetDeallocator(object, (psFreeFunc)detResidImfileRowFree);
-
-    object->det_id = det_id;
-    object->iteration = iteration;
-    object->exp_tag = psStringCopy(exp_tag);
-    object->class_id = psStringCopy(class_id);
-    object->uri = psStringCopy(uri);
-    object->recipe = psStringCopy(recipe);
-    object->bg = bg;
-    object->bg_stdev = bg_stdev;
-    object->bg_mean_stdev = bg_mean_stdev;
-    object->b1_uri = psStringCopy(b1_uri);
-    object->b2_uri = psStringCopy(b2_uri);
-
-    return object;
+    detResidImfileRow *_object;
+
+    _object = psAlloc(sizeof(detResidImfileRow));
+    psMemSetDeallocator(_object, (psFreeFunc)detResidImfileRowFree);
+
+    _object->det_id = det_id;
+    _object->iteration = iteration;
+    _object->exp_tag = psStringCopy(exp_tag);
+    _object->class_id = psStringCopy(class_id);
+    _object->uri = psStringCopy(uri);
+    _object->recipe = psStringCopy(recipe);
+    _object->bg = bg;
+    _object->bg_stdev = bg_stdev;
+    _object->bg_mean_stdev = bg_mean_stdev;
+    _object->b1_uri = psStringCopy(b1_uri);
+    _object->b2_uri = psStringCopy(b2_uri);
+
+    return _object;
 }
 
@@ -18889,21 +18889,21 @@
 detResidExpRow *detResidExpRowAlloc(psS32 det_id, psS32 iteration, const char *exp_tag, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri, bool accept)
 {
-    detResidExpRow  *object;
-
-    object = psAlloc(sizeof(detResidExpRow));
-    psMemSetDeallocator(object, (psFreeFunc)detResidExpRowFree);
-
-    object->det_id = det_id;
-    object->iteration = iteration;
-    object->exp_tag = psStringCopy(exp_tag);
-    object->recipe = psStringCopy(recipe);
-    object->bg = bg;
-    object->bg_stdev = bg_stdev;
-    object->bg_mean_stdev = bg_mean_stdev;
-    object->b1_uri = psStringCopy(b1_uri);
-    object->b2_uri = psStringCopy(b2_uri);
-    object->accept = accept;
-
-    return object;
+    detResidExpRow  *_object;
+
+    _object = psAlloc(sizeof(detResidExpRow));
+    psMemSetDeallocator(_object, (psFreeFunc)detResidExpRowFree);
+
+    _object->det_id = det_id;
+    _object->iteration = iteration;
+    _object->exp_tag = psStringCopy(exp_tag);
+    _object->recipe = psStringCopy(recipe);
+    _object->bg = bg;
+    _object->bg_stdev = bg_stdev;
+    _object->bg_mean_stdev = bg_mean_stdev;
+    _object->b1_uri = psStringCopy(b1_uri);
+    _object->b2_uri = psStringCopy(b2_uri);
+    _object->accept = accept;
+
+    return _object;
 }
 
@@ -19538,17 +19538,17 @@
 detRunSummaryRow *detRunSummaryRowAlloc(psS32 det_id, psS32 iteration, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, bool accept)
 {
-    detRunSummaryRow *object;
-
-    object = psAlloc(sizeof(detRunSummaryRow));
-    psMemSetDeallocator(object, (psFreeFunc)detRunSummaryRowFree);
-
-    object->det_id = det_id;
-    object->iteration = iteration;
-    object->bg = bg;
-    object->bg_stdev = bg_stdev;
-    object->bg_mean_stdev = bg_mean_stdev;
-    object->accept = accept;
-
-    return object;
+    detRunSummaryRow *_object;
+
+    _object = psAlloc(sizeof(detRunSummaryRow));
+    psMemSetDeallocator(_object, (psFreeFunc)detRunSummaryRowFree);
+
+    _object->det_id = det_id;
+    _object->iteration = iteration;
+    _object->bg = bg;
+    _object->bg_stdev = bg_stdev;
+    _object->bg_mean_stdev = bg_mean_stdev;
+    _object->accept = accept;
+
+    return _object;
 }