Changeset 8084 for branches/jhoblitt/ippdb/src/ippdb.c
- Timestamp:
- Aug 2, 2006, 4:32:20 PM (20 years ago)
- File:
-
- 1 edited
-
branches/jhoblitt/ippdb/src/ippdb.c (modified) (182 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/jhoblitt/ippdb/src/ippdb.c
r8079 r8084 5130 5130 static void newExpRowFree(newExpRow *object); 5131 5131 5132 newExpRow *newExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles , const char *class)5132 newExpRow *newExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles) 5133 5133 { 5134 5134 newExpRow *object; … … 5142 5142 object->exp_type = psStringCopy(exp_type); 5143 5143 object->imfiles = imfiles; 5144 object->class = psStringCopy(class);5145 5144 5146 5145 return object; … … 5153 5152 psFree(object->telescope); 5154 5153 psFree(object->exp_type); 5155 psFree(object->class);5156 5154 } 5157 5155 … … 5192 5190 return false; 5193 5191 } 5194 if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "64")) {5195 psError(PS_ERR_UNKNOWN, false, "failed to add item class");5196 psFree(md);5197 return false;5198 }5199 5192 5200 5193 status = psDBCreateTable(dbh, NEWEXP_TABLE_NAME, md); … … 5210 5203 } 5211 5204 5212 bool newExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles , const char *class)5205 bool newExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles) 5213 5206 { 5214 5207 psMetadata *md; … … 5241 5234 return false; 5242 5235 } 5243 if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, class)) {5244 psError(PS_ERR_UNKNOWN, false, "failed to add item class");5245 psFree(md);5246 return false;5247 }5248 5236 5249 5237 status = psDBInsertOneRow(dbh, NEWEXP_TABLE_NAME, md); … … 5253 5241 } 5254 5242 5255 bool newExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles , char **class)5243 bool newExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles) 5256 5244 { 5257 5245 psArray *rowSet; … … 5327 5315 return false; 5328 5316 } 5329 *class = psMetadataLookupPtr(&status, row, "class");5330 if (!status) {5331 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class");5332 psFree(row);5333 return false;5334 }5335 5317 5336 5318 psFree(row); … … 5341 5323 bool newExpInsertObject(psDB *dbh, newExpRow *object) 5342 5324 { 5343 return newExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles , object->class);5325 return newExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles); 5344 5326 } 5345 5327 … … 5351 5333 char exp_type[256]; 5352 5334 psS32 imfiles; 5353 char class[256]; 5354 5355 if (!newExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&class)) { 5335 5336 if (!newExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles)) { 5356 5337 psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); 5357 5338 return NULL; 5358 5339 } 5359 5340 5360 return newExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles , class);5341 return newExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles); 5361 5342 } 5362 5343 … … 5482 5463 return NULL; 5483 5464 } 5484 if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, object->class)) {5485 psError(PS_ERR_UNKNOWN, false, "failed to add item class");5486 psFree(md);5487 return NULL;5488 }5489 5465 5490 5466 return md; … … 5499 5475 char *exp_type; 5500 5476 psS32 imfiles; 5501 char *class;5502 5477 5503 5478 exp_id = psMetadataLookupPtr(&status, md, "exp_id"); … … 5526 5501 return false; 5527 5502 } 5528 class = psMetadataLookupPtr(&status, md, "class"); 5529 if (!status) { 5530 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class"); 5531 return false; 5532 } 5533 5534 return newExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, class); 5503 5504 return newExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles); 5535 5505 } 5536 5506 psArray *newExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) … … 5991 5961 static void rawDetrendExpRowFree(rawDetrendExpRow *object); 5992 5962 5993 rawDetrendExpRow *rawDetrendExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF 32 ra, psF32 dec, psF32 exp_time)5963 rawDetrendExpRow *rawDetrendExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background) 5994 5964 { 5995 5965 rawDetrendExpRow *object; … … 6009 5979 object->dec = dec; 6010 5980 object->exp_time = exp_time; 5981 object->background = background; 6011 5982 6012 5983 return object; … … 6074 6045 return false; 6075 6046 } 6076 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "ra", 0, NULL, 0.0)) {6047 if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, 0.0)) { 6077 6048 psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); 6078 6049 psFree(md); 6079 6050 return false; 6080 6051 } 6081 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) {6052 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) { 6082 6053 psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); 6083 6054 psFree(md); … … 6089 6060 return false; 6090 6061 } 6062 if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, 0.0)) { 6063 psError(PS_ERR_UNKNOWN, false, "failed to add item background"); 6064 psFree(md); 6065 return false; 6066 } 6091 6067 6092 6068 status = psDBCreateTable(dbh, RAWDETRENDEXP_TABLE_NAME, md); … … 6102 6078 } 6103 6079 6104 bool rawDetrendExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF 32 ra, psF32 dec, psF32 exp_time)6080 bool rawDetrendExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background) 6105 6081 { 6106 6082 psMetadata *md; … … 6148 6124 return false; 6149 6125 } 6150 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "ra", 0, NULL, ra)) {6126 if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, ra)) { 6151 6127 psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); 6152 6128 psFree(md); 6153 6129 return false; 6154 6130 } 6155 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) {6131 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) { 6156 6132 psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); 6157 6133 psFree(md); … … 6163 6139 return false; 6164 6140 } 6141 if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, background)) { 6142 psError(PS_ERR_UNKNOWN, false, "failed to add item background"); 6143 psFree(md); 6144 return false; 6145 } 6165 6146 6166 6147 status = psDBInsertOneRow(dbh, RAWDETRENDEXP_TABLE_NAME, md); … … 6170 6151 } 6171 6152 6172 bool rawDetrendExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, char **class, psF32 *airmass, psF 32 *ra, psF32 *dec, psF32 *exp_time)6153 bool rawDetrendExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, char **class, psF32 *airmass, psF64 *ra, psF64 *dec, psF32 *exp_time, psF64 *background) 6173 6154 { 6174 6155 psArray *rowSet; … … 6262 6243 return false; 6263 6244 } 6264 *ra = psMetadataLookupF 32(&status, row, "ra");6245 *ra = psMetadataLookupF64(&status, row, "ra"); 6265 6246 if (!status) { 6266 6247 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ra"); … … 6268 6249 return false; 6269 6250 } 6270 *dec = psMetadataLookupF 32(&status, row, "dec");6251 *dec = psMetadataLookupF64(&status, row, "dec"); 6271 6252 if (!status) { 6272 6253 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); … … 6280 6261 return false; 6281 6262 } 6263 *background = psMetadataLookupF64(&status, row, "background"); 6264 if (!status) { 6265 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); 6266 psFree(row); 6267 return false; 6268 } 6282 6269 6283 6270 psFree(row); … … 6288 6275 bool rawDetrendExpInsertObject(psDB *dbh, rawDetrendExpRow *object) 6289 6276 { 6290 return rawDetrendExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->class, object->airmass, object->ra, object->dec, object->exp_time );6277 return rawDetrendExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->class, object->airmass, object->ra, object->dec, object->exp_time, object->background); 6291 6278 } 6292 6279 … … 6301 6288 char class[256]; 6302 6289 psF32 airmass; 6303 psF 32ra;6304 psF 32dec;6290 psF64 ra; 6291 psF64 dec; 6305 6292 psF32 exp_time; 6306 6307 if (!rawDetrendExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, (char **)&class, &airmass, &ra, &dec, &exp_time)) { 6293 psF64 background; 6294 6295 if (!rawDetrendExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, (char **)&class, &airmass, &ra, &dec, &exp_time, &background)) { 6308 6296 psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); 6309 6297 return NULL; 6310 6298 } 6311 6299 6312 return rawDetrendExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time );6300 return rawDetrendExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, background); 6313 6301 } 6314 6302 … … 6449 6437 return NULL; 6450 6438 } 6451 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "ra", 0, NULL, object->ra)) {6439 if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, object->ra)) { 6452 6440 psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); 6453 6441 psFree(md); 6454 6442 return NULL; 6455 6443 } 6456 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) {6444 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) { 6457 6445 psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); 6458 6446 psFree(md); … … 6461 6449 if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, object->exp_time)) { 6462 6450 psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time"); 6451 psFree(md); 6452 return NULL; 6453 } 6454 if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, object->background)) { 6455 psError(PS_ERR_UNKNOWN, false, "failed to add item background"); 6463 6456 psFree(md); 6464 6457 return NULL; … … 6479 6472 char *class; 6480 6473 psF32 airmass; 6481 psF 32ra;6482 psF 32dec;6474 psF64 ra; 6475 psF64 dec; 6483 6476 psF32 exp_time; 6477 psF64 background; 6484 6478 6485 6479 exp_id = psMetadataLookupPtr(&status, md, "exp_id"); … … 6523 6517 return false; 6524 6518 } 6525 ra = psMetadataLookupF 32(&status, md, "ra");6519 ra = psMetadataLookupF64(&status, md, "ra"); 6526 6520 if (!status) { 6527 6521 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ra"); 6528 6522 return false; 6529 6523 } 6530 dec = psMetadataLookupF 32(&status, md, "dec");6524 dec = psMetadataLookupF64(&status, md, "dec"); 6531 6525 if (!status) { 6532 6526 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); … … 6538 6532 return false; 6539 6533 } 6540 6541 return rawDetrendExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time); 6534 background = psMetadataLookupF64(&status, md, "background"); 6535 if (!status) { 6536 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); 6537 return false; 6538 } 6539 6540 return rawDetrendExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, background); 6542 6541 } 6543 6542 psArray *rawDetrendExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) … … 6597 6596 static void rawScienceExpRowFree(rawScienceExpRow *object); 6598 6597 6599 rawScienceExpRow *rawScienceExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF 32 ra, psF32 dec, psF32 exp_time)6598 rawScienceExpRow *rawScienceExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background) 6600 6599 { 6601 6600 rawScienceExpRow *object; … … 6615 6614 object->dec = dec; 6616 6615 object->exp_time = exp_time; 6616 object->background = background; 6617 6617 6618 6618 return object; … … 6680 6680 return false; 6681 6681 } 6682 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "ra", 0, NULL, 0.0)) {6682 if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, 0.0)) { 6683 6683 psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); 6684 6684 psFree(md); 6685 6685 return false; 6686 6686 } 6687 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) {6687 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) { 6688 6688 psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); 6689 6689 psFree(md); … … 6695 6695 return false; 6696 6696 } 6697 if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, 0.0)) { 6698 psError(PS_ERR_UNKNOWN, false, "failed to add item background"); 6699 psFree(md); 6700 return false; 6701 } 6697 6702 6698 6703 status = psDBCreateTable(dbh, RAWSCIENCEEXP_TABLE_NAME, md); … … 6708 6713 } 6709 6714 6710 bool rawScienceExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF 32 ra, psF32 dec, psF32 exp_time)6715 bool rawScienceExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background) 6711 6716 { 6712 6717 psMetadata *md; … … 6754 6759 return false; 6755 6760 } 6756 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "ra", 0, NULL, ra)) {6761 if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, ra)) { 6757 6762 psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); 6758 6763 psFree(md); 6759 6764 return false; 6760 6765 } 6761 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) {6766 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) { 6762 6767 psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); 6763 6768 psFree(md); … … 6769 6774 return false; 6770 6775 } 6776 if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, background)) { 6777 psError(PS_ERR_UNKNOWN, false, "failed to add item background"); 6778 psFree(md); 6779 return false; 6780 } 6771 6781 6772 6782 status = psDBInsertOneRow(dbh, RAWSCIENCEEXP_TABLE_NAME, md); … … 6776 6786 } 6777 6787 6778 bool rawScienceExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, char **class, psF32 *airmass, psF 32 *ra, psF32 *dec, psF32 *exp_time)6788 bool rawScienceExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, char **class, psF32 *airmass, psF64 *ra, psF64 *dec, psF32 *exp_time, psF64 *background) 6779 6789 { 6780 6790 psArray *rowSet; … … 6868 6878 return false; 6869 6879 } 6870 *ra = psMetadataLookupF 32(&status, row, "ra");6880 *ra = psMetadataLookupF64(&status, row, "ra"); 6871 6881 if (!status) { 6872 6882 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ra"); … … 6874 6884 return false; 6875 6885 } 6876 *dec = psMetadataLookupF 32(&status, row, "dec");6886 *dec = psMetadataLookupF64(&status, row, "dec"); 6877 6887 if (!status) { 6878 6888 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); … … 6886 6896 return false; 6887 6897 } 6898 *background = psMetadataLookupF64(&status, row, "background"); 6899 if (!status) { 6900 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); 6901 psFree(row); 6902 return false; 6903 } 6888 6904 6889 6905 psFree(row); … … 6894 6910 bool rawScienceExpInsertObject(psDB *dbh, rawScienceExpRow *object) 6895 6911 { 6896 return rawScienceExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->class, object->airmass, object->ra, object->dec, object->exp_time );6912 return rawScienceExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->class, object->airmass, object->ra, object->dec, object->exp_time, object->background); 6897 6913 } 6898 6914 … … 6907 6923 char class[256]; 6908 6924 psF32 airmass; 6909 psF 32ra;6910 psF 32dec;6925 psF64 ra; 6926 psF64 dec; 6911 6927 psF32 exp_time; 6912 6913 if (!rawScienceExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, (char **)&class, &airmass, &ra, &dec, &exp_time)) { 6928 psF64 background; 6929 6930 if (!rawScienceExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, (char **)&class, &airmass, &ra, &dec, &exp_time, &background)) { 6914 6931 psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); 6915 6932 return NULL; 6916 6933 } 6917 6934 6918 return rawScienceExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time );6935 return rawScienceExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, background); 6919 6936 } 6920 6937 … … 7055 7072 return NULL; 7056 7073 } 7057 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "ra", 0, NULL, object->ra)) {7074 if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, object->ra)) { 7058 7075 psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); 7059 7076 psFree(md); 7060 7077 return NULL; 7061 7078 } 7062 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) {7079 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) { 7063 7080 psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); 7064 7081 psFree(md); … … 7067 7084 if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, object->exp_time)) { 7068 7085 psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time"); 7086 psFree(md); 7087 return NULL; 7088 } 7089 if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, object->background)) { 7090 psError(PS_ERR_UNKNOWN, false, "failed to add item background"); 7069 7091 psFree(md); 7070 7092 return NULL; … … 7085 7107 char *class; 7086 7108 psF32 airmass; 7087 psF 32ra;7088 psF 32dec;7109 psF64 ra; 7110 psF64 dec; 7089 7111 psF32 exp_time; 7112 psF64 background; 7090 7113 7091 7114 exp_id = psMetadataLookupPtr(&status, md, "exp_id"); … … 7129 7152 return false; 7130 7153 } 7131 ra = psMetadataLookupF 32(&status, md, "ra");7154 ra = psMetadataLookupF64(&status, md, "ra"); 7132 7155 if (!status) { 7133 7156 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ra"); 7134 7157 return false; 7135 7158 } 7136 dec = psMetadataLookupF 32(&status, md, "dec");7159 dec = psMetadataLookupF64(&status, md, "dec"); 7137 7160 if (!status) { 7138 7161 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); … … 7144 7167 return false; 7145 7168 } 7146 7147 return rawScienceExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time); 7169 background = psMetadataLookupF64(&status, md, "background"); 7170 if (!status) { 7171 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); 7172 return false; 7173 } 7174 7175 return rawScienceExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, background); 7148 7176 } 7149 7177 psArray *rawScienceExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) … … 7203 7231 static void rawImfileRowFree(rawImfileRow *object); 7204 7232 7205 rawImfileRow *rawImfileRowAlloc(const char *exp_id, const char *class, const char *class_id, const char *uri , const char *stats)7233 rawImfileRow *rawImfileRowAlloc(const char *exp_id, const char *class, const char *class_id, const char *uri) 7206 7234 { 7207 7235 rawImfileRow *object; … … 7214 7242 object->class_id = psStringCopy(class_id); 7215 7243 object->uri = psStringCopy(uri); 7216 object->stats = psStringCopy(stats);7217 7244 7218 7245 return object; … … 7225 7252 psFree(object->class_id); 7226 7253 psFree(object->uri); 7227 psFree(object->stats);7228 7254 } 7229 7255 … … 7259 7285 return false; 7260 7286 } 7261 if (!psMetadataAddStr(md, PS_LIST_TAIL, "stats", 0, NULL, "255")) {7262 psError(PS_ERR_UNKNOWN, false, "failed to add item stats");7263 psFree(md);7264 return false;7265 }7266 7287 7267 7288 status = psDBCreateTable(dbh, RAWIMFILE_TABLE_NAME, md); … … 7277 7298 } 7278 7299 7279 bool rawImfileInsert(psDB * dbh, const char *exp_id, const char *class, const char *class_id, const char *uri , const char *stats)7300 bool rawImfileInsert(psDB * dbh, const char *exp_id, const char *class, const char *class_id, const char *uri) 7280 7301 { 7281 7302 psMetadata *md; … … 7303 7324 return false; 7304 7325 } 7305 if (!psMetadataAddStr(md, PS_LIST_TAIL, "stats", 0, NULL, stats)) {7306 psError(PS_ERR_UNKNOWN, false, "failed to add item stats");7307 psFree(md);7308 return false;7309 }7310 7326 7311 7327 status = psDBInsertOneRow(dbh, RAWIMFILE_TABLE_NAME, md); … … 7315 7331 } 7316 7332 7317 bool rawImfilePop(psDB *dbh, char **exp_id, char **class, char **class_id, char **uri , char **stats)7333 bool rawImfilePop(psDB *dbh, char **exp_id, char **class, char **class_id, char **uri) 7318 7334 { 7319 7335 psArray *rowSet; … … 7383 7399 return false; 7384 7400 } 7385 *stats = psMetadataLookupPtr(&status, row, "stats");7386 if (!status) {7387 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item stats");7388 psFree(row);7389 return false;7390 }7391 7401 7392 7402 psFree(row); … … 7397 7407 bool rawImfileInsertObject(psDB *dbh, rawImfileRow *object) 7398 7408 { 7399 return rawImfileInsert(dbh, object->exp_id, object->class, object->class_id, object->uri , object->stats);7409 return rawImfileInsert(dbh, object->exp_id, object->class, object->class_id, object->uri); 7400 7410 } 7401 7411 … … 7406 7416 char class_id[256]; 7407 7417 char uri[256]; 7408 char stats[256]; 7409 7410 if (!rawImfilePop(dbh, (char **)&exp_id, (char **)&class, (char **)&class_id, (char **)&uri, (char **)&stats)) { 7418 7419 if (!rawImfilePop(dbh, (char **)&exp_id, (char **)&class, (char **)&class_id, (char **)&uri)) { 7411 7420 psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); 7412 7421 return NULL; 7413 7422 } 7414 7423 7415 return rawImfileRowAlloc(exp_id, class, class_id, uri , stats);7424 return rawImfileRowAlloc(exp_id, class, class_id, uri); 7416 7425 } 7417 7426 … … 7532 7541 return NULL; 7533 7542 } 7534 if (!psMetadataAddStr(md, PS_LIST_TAIL, "stats", 0, NULL, object->stats)) {7535 psError(PS_ERR_UNKNOWN, false, "failed to add item stats");7536 psFree(md);7537 return NULL;7538 }7539 7543 7540 7544 return md; … … 7548 7552 char *class_id; 7549 7553 char *uri; 7550 char *stats;7551 7554 7552 7555 exp_id = psMetadataLookupPtr(&status, md, "exp_id"); … … 7570 7573 return false; 7571 7574 } 7572 stats = psMetadataLookupPtr(&status, md, "stats"); 7573 if (!status) { 7574 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item stats"); 7575 return false; 7576 } 7577 7578 return rawImfileRowAlloc(exp_id, class, class_id, uri, stats); 7575 7576 return rawImfileRowAlloc(exp_id, class, class_id, uri); 7579 7577 } 7580 7578 psArray *rawImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) … … 7634 7632 static void p1PendingExpRowFree(p1PendingExpRow *object); 7635 7633 7636 p1PendingExpRow *p1PendingExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF32 ra, psF32 dec, psF32 exp_time, const char *recipe, psS32 p1_version)7634 p1PendingExpRow *p1PendingExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background, const char *recipe, psS32 p1_version) 7637 7635 { 7638 7636 p1PendingExpRow *object; … … 7647 7645 object->imfiles = imfiles; 7648 7646 object->filter = psStringCopy(filter); 7649 object->class = psStringCopy(class);7650 7647 object->airmass = airmass; 7651 7648 object->ra = ra; 7652 7649 object->dec = dec; 7653 7650 object->exp_time = exp_time; 7651 object->background = background; 7654 7652 object->recipe = psStringCopy(recipe); 7655 7653 object->p1_version = p1_version; … … 7665 7663 psFree(object->exp_type); 7666 7664 psFree(object->filter); 7667 psFree(object->class);7668 7665 psFree(object->recipe); 7669 7666 } … … 7710 7707 return false; 7711 7708 } 7712 if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "255")) {7713 psError(PS_ERR_UNKNOWN, false, "failed to add item class");7714 psFree(md);7715 return false;7716 }7717 7709 if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 0.0)) { 7718 7710 psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); … … 7720 7712 return false; 7721 7713 } 7722 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "ra", 0, NULL, 0.0)) {7714 if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, 0.0)) { 7723 7715 psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); 7724 7716 psFree(md); 7725 7717 return false; 7726 7718 } 7727 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) {7719 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) { 7728 7720 psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); 7729 7721 psFree(md); … … 7735 7727 return false; 7736 7728 } 7729 if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, 0.0)) { 7730 psError(PS_ERR_UNKNOWN, false, "failed to add item background"); 7731 psFree(md); 7732 return false; 7733 } 7737 7734 if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "64")) { 7738 7735 psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); … … 7758 7755 } 7759 7756 7760 bool p1PendingExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF32 ra, psF32 dec, psF32 exp_time, const char *recipe, psS32 p1_version)7757 bool p1PendingExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background, const char *recipe, psS32 p1_version) 7761 7758 { 7762 7759 psMetadata *md; … … 7794 7791 return false; 7795 7792 } 7796 if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, class)) {7797 psError(PS_ERR_UNKNOWN, false, "failed to add item class");7798 psFree(md);7799 return false;7800 }7801 7793 if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, airmass)) { 7802 7794 psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); … … 7804 7796 return false; 7805 7797 } 7806 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "ra", 0, NULL, ra)) {7798 if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, ra)) { 7807 7799 psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); 7808 7800 psFree(md); 7809 7801 return false; 7810 7802 } 7811 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) {7803 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) { 7812 7804 psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); 7813 7805 psFree(md); … … 7819 7811 return false; 7820 7812 } 7813 if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, background)) { 7814 psError(PS_ERR_UNKNOWN, false, "failed to add item background"); 7815 psFree(md); 7816 return false; 7817 } 7821 7818 if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, recipe)) { 7822 7819 psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); … … 7836 7833 } 7837 7834 7838 bool p1PendingExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, char **class, psF32 *airmass, psF32 *ra, psF32 *dec, psF32 *exp_time, char **recipe, psS32 *p1_version)7835 bool p1PendingExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *dec, psF32 *exp_time, psF64 *background, char **recipe, psS32 *p1_version) 7839 7836 { 7840 7837 psArray *rowSet; … … 7916 7913 return false; 7917 7914 } 7918 *class = psMetadataLookupPtr(&status, row, "class");7919 if (!status) {7920 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class");7921 psFree(row);7922 return false;7923 }7924 7915 *airmass = psMetadataLookupF32(&status, row, "airmass"); 7925 7916 if (!status) { … … 7928 7919 return false; 7929 7920 } 7930 *ra = psMetadataLookupF 32(&status, row, "ra");7921 *ra = psMetadataLookupF64(&status, row, "ra"); 7931 7922 if (!status) { 7932 7923 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ra"); … … 7934 7925 return false; 7935 7926 } 7936 *dec = psMetadataLookupF 32(&status, row, "dec");7927 *dec = psMetadataLookupF64(&status, row, "dec"); 7937 7928 if (!status) { 7938 7929 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); … … 7946 7937 return false; 7947 7938 } 7939 *background = psMetadataLookupF64(&status, row, "background"); 7940 if (!status) { 7941 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); 7942 psFree(row); 7943 return false; 7944 } 7948 7945 *recipe = psMetadataLookupPtr(&status, row, "recipe"); 7949 7946 if (!status) { … … 7966 7963 bool p1PendingExpInsertObject(psDB *dbh, p1PendingExpRow *object) 7967 7964 { 7968 return p1PendingExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object-> class, object->airmass, object->ra, object->dec, object->exp_time, object->recipe, object->p1_version);7965 return p1PendingExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->dec, object->exp_time, object->background, object->recipe, object->p1_version); 7969 7966 } 7970 7967 … … 7977 7974 psS32 imfiles; 7978 7975 char filter[256]; 7979 char class[256];7980 7976 psF32 airmass; 7981 psF 32ra;7982 psF 32dec;7977 psF64 ra; 7978 psF64 dec; 7983 7979 psF32 exp_time; 7980 psF64 background; 7984 7981 char recipe[256]; 7985 7982 psS32 p1_version; 7986 7983 7987 if (!p1PendingExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, (char **)&class, &airmass, &ra, &dec, &exp_time, (char **)&recipe, &p1_version)) {7984 if (!p1PendingExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &dec, &exp_time, &background, (char **)&recipe, &p1_version)) { 7988 7985 psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); 7989 7986 return NULL; 7990 7987 } 7991 7988 7992 return p1PendingExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, recipe, p1_version);7989 return p1PendingExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background, recipe, p1_version); 7993 7990 } 7994 7991 … … 8119 8116 return NULL; 8120 8117 } 8121 if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, object->class)) {8122 psError(PS_ERR_UNKNOWN, false, "failed to add item class");8123 psFree(md);8124 return NULL;8125 }8126 8118 if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, object->airmass)) { 8127 8119 psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); … … 8129 8121 return NULL; 8130 8122 } 8131 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "ra", 0, NULL, object->ra)) {8123 if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, object->ra)) { 8132 8124 psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); 8133 8125 psFree(md); 8134 8126 return NULL; 8135 8127 } 8136 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) {8128 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) { 8137 8129 psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); 8138 8130 psFree(md); … … 8141 8133 if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, object->exp_time)) { 8142 8134 psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time"); 8135 psFree(md); 8136 return NULL; 8137 } 8138 if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, object->background)) { 8139 psError(PS_ERR_UNKNOWN, false, "failed to add item background"); 8143 8140 psFree(md); 8144 8141 return NULL; … … 8167 8164 psS32 imfiles; 8168 8165 char *filter; 8169 char *class;8170 8166 psF32 airmass; 8171 psF 32ra;8172 psF 32dec;8167 psF64 ra; 8168 psF64 dec; 8173 8169 psF32 exp_time; 8170 psF64 background; 8174 8171 char *recipe; 8175 8172 psS32 p1_version; … … 8205 8202 return false; 8206 8203 } 8207 class = psMetadataLookupPtr(&status, md, "class");8208 if (!status) {8209 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class");8210 return false;8211 }8212 8204 airmass = psMetadataLookupF32(&status, md, "airmass"); 8213 8205 if (!status) { … … 8215 8207 return false; 8216 8208 } 8217 ra = psMetadataLookupF 32(&status, md, "ra");8209 ra = psMetadataLookupF64(&status, md, "ra"); 8218 8210 if (!status) { 8219 8211 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ra"); 8220 8212 return false; 8221 8213 } 8222 dec = psMetadataLookupF 32(&status, md, "dec");8214 dec = psMetadataLookupF64(&status, md, "dec"); 8223 8215 if (!status) { 8224 8216 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); … … 8230 8222 return false; 8231 8223 } 8224 background = psMetadataLookupF64(&status, md, "background"); 8225 if (!status) { 8226 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); 8227 return false; 8228 } 8232 8229 recipe = psMetadataLookupPtr(&status, md, "recipe"); 8233 8230 if (!status) { … … 8241 8238 } 8242 8239 8243 return p1PendingExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, recipe, p1_version);8240 return p1PendingExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background, recipe, p1_version); 8244 8241 } 8245 8242 psArray *p1PendingExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) … … 8299 8296 static void p2PendingExpRowFree(p2PendingExpRow *object); 8300 8297 8301 p2PendingExpRow *p2PendingExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF32 ra, psF32 dec, psF32 exp_time, const char *recipe, psS32 p1_version, psS32 p2_version)8298 p2PendingExpRow *p2PendingExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF32 ra, psF64 dec, psF64 exp_time, psF64 background, const char *recipe, psS32 p1_version, psS32 p2_version) 8302 8299 { 8303 8300 p2PendingExpRow *object; … … 8312 8309 object->imfiles = imfiles; 8313 8310 object->filter = psStringCopy(filter); 8314 object->class = psStringCopy(class);8315 8311 object->airmass = airmass; 8316 8312 object->ra = ra; 8317 8313 object->dec = dec; 8318 8314 object->exp_time = exp_time; 8315 object->background = background; 8319 8316 object->recipe = psStringCopy(recipe); 8320 8317 object->p1_version = p1_version; … … 8331 8328 psFree(object->exp_type); 8332 8329 psFree(object->filter); 8333 psFree(object->class);8334 8330 psFree(object->recipe); 8335 8331 } … … 8376 8372 return false; 8377 8373 } 8378 if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "255")) {8379 psError(PS_ERR_UNKNOWN, false, "failed to add item class");8380 psFree(md);8381 return false;8382 }8383 8374 if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 0.0)) { 8384 8375 psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); … … 8391 8382 return false; 8392 8383 } 8393 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) {8384 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) { 8394 8385 psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); 8395 8386 psFree(md); 8396 8387 return false; 8397 8388 } 8398 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "exp_time", 0, NULL, 0.0)) {8389 if (!psMetadataAddF64(md, PS_LIST_TAIL, "exp_time", 0, NULL, 0.0)) { 8399 8390 psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time"); 8391 psFree(md); 8392 return false; 8393 } 8394 if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, 0.0)) { 8395 psError(PS_ERR_UNKNOWN, false, "failed to add item background"); 8400 8396 psFree(md); 8401 8397 return false; … … 8429 8425 } 8430 8426 8431 bool p2PendingExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF32 ra, psF32 dec, psF32 exp_time, const char *recipe, psS32 p1_version, psS32 p2_version)8427 bool p2PendingExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF32 ra, psF64 dec, psF64 exp_time, psF64 background, const char *recipe, psS32 p1_version, psS32 p2_version) 8432 8428 { 8433 8429 psMetadata *md; … … 8465 8461 return false; 8466 8462 } 8467 if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, class)) {8468 psError(PS_ERR_UNKNOWN, false, "failed to add item class");8469 psFree(md);8470 return false;8471 }8472 8463 if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, airmass)) { 8473 8464 psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); … … 8480 8471 return false; 8481 8472 } 8482 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) {8473 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) { 8483 8474 psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); 8484 8475 psFree(md); 8485 8476 return false; 8486 8477 } 8487 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "exp_time", 0, NULL, exp_time)) {8478 if (!psMetadataAddF64(md, PS_LIST_TAIL, "exp_time", 0, NULL, exp_time)) { 8488 8479 psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time"); 8480 psFree(md); 8481 return false; 8482 } 8483 if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, background)) { 8484 psError(PS_ERR_UNKNOWN, false, "failed to add item background"); 8489 8485 psFree(md); 8490 8486 return false; … … 8512 8508 } 8513 8509 8514 bool p2PendingExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, char **class, psF32 *airmass, psF32 *ra, psF32 *dec, psF32 *exp_time, char **recipe, psS32 *p1_version, psS32 *p2_version)8510 bool p2PendingExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF32 *ra, psF64 *dec, psF64 *exp_time, psF64 *background, char **recipe, psS32 *p1_version, psS32 *p2_version) 8515 8511 { 8516 8512 psArray *rowSet; … … 8592 8588 return false; 8593 8589 } 8594 *class = psMetadataLookupPtr(&status, row, "class");8595 if (!status) {8596 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class");8597 psFree(row);8598 return false;8599 }8600 8590 *airmass = psMetadataLookupF32(&status, row, "airmass"); 8601 8591 if (!status) { … … 8610 8600 return false; 8611 8601 } 8612 *dec = psMetadataLookupF 32(&status, row, "dec");8602 *dec = psMetadataLookupF64(&status, row, "dec"); 8613 8603 if (!status) { 8614 8604 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); … … 8616 8606 return false; 8617 8607 } 8618 *exp_time = psMetadataLookupF 32(&status, row, "exp_time");8608 *exp_time = psMetadataLookupF64(&status, row, "exp_time"); 8619 8609 if (!status) { 8620 8610 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item exp_time"); … … 8622 8612 return false; 8623 8613 } 8614 *background = psMetadataLookupF64(&status, row, "background"); 8615 if (!status) { 8616 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); 8617 psFree(row); 8618 return false; 8619 } 8624 8620 *recipe = psMetadataLookupPtr(&status, row, "recipe"); 8625 8621 if (!status) { … … 8648 8644 bool p2PendingExpInsertObject(psDB *dbh, p2PendingExpRow *object) 8649 8645 { 8650 return p2PendingExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object-> class, object->airmass, object->ra, object->dec, object->exp_time, object->recipe, object->p1_version, object->p2_version);8646 return p2PendingExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->dec, object->exp_time, object->background, object->recipe, object->p1_version, object->p2_version); 8651 8647 } 8652 8648 … … 8659 8655 psS32 imfiles; 8660 8656 char filter[256]; 8661 char class[256];8662 8657 psF32 airmass; 8663 8658 psF32 ra; 8664 psF32 dec; 8665 psF32 exp_time; 8659 psF64 dec; 8660 psF64 exp_time; 8661 psF64 background; 8666 8662 char recipe[256]; 8667 8663 psS32 p1_version; 8668 8664 psS32 p2_version; 8669 8665 8670 if (!p2PendingExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, (char **)&class, &airmass, &ra, &dec, &exp_time, (char **)&recipe, &p1_version, &p2_version)) {8666 if (!p2PendingExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &dec, &exp_time, &background, (char **)&recipe, &p1_version, &p2_version)) { 8671 8667 psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); 8672 8668 return NULL; 8673 8669 } 8674 8670 8675 return p2PendingExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, recipe, p1_version, p2_version);8671 return p2PendingExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background, recipe, p1_version, p2_version); 8676 8672 } 8677 8673 … … 8802 8798 return NULL; 8803 8799 } 8804 if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, object->class)) {8805 psError(PS_ERR_UNKNOWN, false, "failed to add item class");8806 psFree(md);8807 return NULL;8808 }8809 8800 if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, object->airmass)) { 8810 8801 psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); … … 8817 8808 return NULL; 8818 8809 } 8819 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) {8810 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) { 8820 8811 psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); 8821 8812 psFree(md); 8822 8813 return NULL; 8823 8814 } 8824 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "exp_time", 0, NULL, object->exp_time)) {8815 if (!psMetadataAddF64(md, PS_LIST_TAIL, "exp_time", 0, NULL, object->exp_time)) { 8825 8816 psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time"); 8817 psFree(md); 8818 return NULL; 8819 } 8820 if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, object->background)) { 8821 psError(PS_ERR_UNKNOWN, false, "failed to add item background"); 8826 8822 psFree(md); 8827 8823 return NULL; … … 8855 8851 psS32 imfiles; 8856 8852 char *filter; 8857 char *class;8858 8853 psF32 airmass; 8859 8854 psF32 ra; 8860 psF32 dec; 8861 psF32 exp_time; 8855 psF64 dec; 8856 psF64 exp_time; 8857 psF64 background; 8862 8858 char *recipe; 8863 8859 psS32 p1_version; … … 8894 8890 return false; 8895 8891 } 8896 class = psMetadataLookupPtr(&status, md, "class");8897 if (!status) {8898 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class");8899 return false;8900 }8901 8892 airmass = psMetadataLookupF32(&status, md, "airmass"); 8902 8893 if (!status) { … … 8909 8900 return false; 8910 8901 } 8911 dec = psMetadataLookupF 32(&status, md, "dec");8902 dec = psMetadataLookupF64(&status, md, "dec"); 8912 8903 if (!status) { 8913 8904 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); 8914 8905 return false; 8915 8906 } 8916 exp_time = psMetadataLookupF 32(&status, md, "exp_time");8907 exp_time = psMetadataLookupF64(&status, md, "exp_time"); 8917 8908 if (!status) { 8918 8909 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item exp_time"); 8919 8910 return false; 8920 8911 } 8912 background = psMetadataLookupF64(&status, md, "background"); 8913 if (!status) { 8914 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); 8915 return false; 8916 } 8921 8917 recipe = psMetadataLookupPtr(&status, md, "recipe"); 8922 8918 if (!status) { … … 8935 8931 } 8936 8932 8937 return p2PendingExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, recipe, p1_version, p2_version);8933 return p2PendingExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background, recipe, p1_version, p2_version); 8938 8934 } 8939 8935 psArray *p2PendingExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) … … 9482 9478 static void p2DoneExpRowFree(p2DoneExpRow *object); 9483 9479 9484 p2DoneExpRow *p2DoneExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF32 ra, psF32 dec, psF32 exp_time, const char *recipe, psS32 p1_version, psS32 p2_version)9480 p2DoneExpRow *p2DoneExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background, const char *recipe, psS32 p1_version, psS32 p2_version) 9485 9481 { 9486 9482 p2DoneExpRow *object; … … 9495 9491 object->imfiles = imfiles; 9496 9492 object->filter = psStringCopy(filter); 9497 object->class = psStringCopy(class);9498 9493 object->airmass = airmass; 9499 9494 object->ra = ra; 9500 9495 object->dec = dec; 9501 9496 object->exp_time = exp_time; 9497 object->background = background; 9502 9498 object->recipe = psStringCopy(recipe); 9503 9499 object->p1_version = p1_version; … … 9514 9510 psFree(object->exp_type); 9515 9511 psFree(object->filter); 9516 psFree(object->class);9517 9512 psFree(object->recipe); 9518 9513 } … … 9559 9554 return false; 9560 9555 } 9561 if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "255")) {9562 psError(PS_ERR_UNKNOWN, false, "failed to add item class");9563 psFree(md);9564 return false;9565 }9566 9556 if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 0.0)) { 9567 9557 psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); … … 9569 9559 return false; 9570 9560 } 9571 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "ra", 0, NULL, 0.0)) {9561 if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, 0.0)) { 9572 9562 psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); 9573 9563 psFree(md); 9574 9564 return false; 9575 9565 } 9576 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) {9566 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) { 9577 9567 psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); 9578 9568 psFree(md); … … 9584 9574 return false; 9585 9575 } 9576 if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, 0.0)) { 9577 psError(PS_ERR_UNKNOWN, false, "failed to add item background"); 9578 psFree(md); 9579 return false; 9580 } 9586 9581 if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "64")) { 9587 9582 psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); … … 9612 9607 } 9613 9608 9614 bool p2DoneExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF32 ra, psF32 dec, psF32 exp_time, const char *recipe, psS32 p1_version, psS32 p2_version)9609 bool p2DoneExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background, const char *recipe, psS32 p1_version, psS32 p2_version) 9615 9610 { 9616 9611 psMetadata *md; … … 9648 9643 return false; 9649 9644 } 9650 if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, class)) {9651 psError(PS_ERR_UNKNOWN, false, "failed to add item class");9652 psFree(md);9653 return false;9654 }9655 9645 if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, airmass)) { 9656 9646 psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); … … 9658 9648 return false; 9659 9649 } 9660 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "ra", 0, NULL, ra)) {9650 if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, ra)) { 9661 9651 psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); 9662 9652 psFree(md); 9663 9653 return false; 9664 9654 } 9665 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) {9655 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) { 9666 9656 psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); 9667 9657 psFree(md); … … 9673 9663 return false; 9674 9664 } 9665 if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, background)) { 9666 psError(PS_ERR_UNKNOWN, false, "failed to add item background"); 9667 psFree(md); 9668 return false; 9669 } 9675 9670 if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, recipe)) { 9676 9671 psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); … … 9695 9690 } 9696 9691 9697 bool p2DoneExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, char **class, psF32 *airmass, psF32 *ra, psF32 *dec, psF32 *exp_time, char **recipe, psS32 *p1_version, psS32 *p2_version)9692 bool p2DoneExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *dec, psF32 *exp_time, psF64 *background, char **recipe, psS32 *p1_version, psS32 *p2_version) 9698 9693 { 9699 9694 psArray *rowSet; … … 9775 9770 return false; 9776 9771 } 9777 *class = psMetadataLookupPtr(&status, row, "class");9778 if (!status) {9779 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class");9780 psFree(row);9781 return false;9782 }9783 9772 *airmass = psMetadataLookupF32(&status, row, "airmass"); 9784 9773 if (!status) { … … 9787 9776 return false; 9788 9777 } 9789 *ra = psMetadataLookupF 32(&status, row, "ra");9778 *ra = psMetadataLookupF64(&status, row, "ra"); 9790 9779 if (!status) { 9791 9780 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ra"); … … 9793 9782 return false; 9794 9783 } 9795 *dec = psMetadataLookupF 32(&status, row, "dec");9784 *dec = psMetadataLookupF64(&status, row, "dec"); 9796 9785 if (!status) { 9797 9786 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); … … 9805 9794 return false; 9806 9795 } 9796 *background = psMetadataLookupF64(&status, row, "background"); 9797 if (!status) { 9798 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); 9799 psFree(row); 9800 return false; 9801 } 9807 9802 *recipe = psMetadataLookupPtr(&status, row, "recipe"); 9808 9803 if (!status) { … … 9831 9826 bool p2DoneExpInsertObject(psDB *dbh, p2DoneExpRow *object) 9832 9827 { 9833 return p2DoneExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object-> class, object->airmass, object->ra, object->dec, object->exp_time, object->recipe, object->p1_version, object->p2_version);9828 return p2DoneExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->dec, object->exp_time, object->background, object->recipe, object->p1_version, object->p2_version); 9834 9829 } 9835 9830 … … 9842 9837 psS32 imfiles; 9843 9838 char filter[256]; 9844 char class[256];9845 9839 psF32 airmass; 9846 psF 32ra;9847 psF 32dec;9840 psF64 ra; 9841 psF64 dec; 9848 9842 psF32 exp_time; 9843 psF64 background; 9849 9844 char recipe[256]; 9850 9845 psS32 p1_version; 9851 9846 psS32 p2_version; 9852 9847 9853 if (!p2DoneExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, (char **)&class, &airmass, &ra, &dec, &exp_time, (char **)&recipe, &p1_version, &p2_version)) {9848 if (!p2DoneExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &dec, &exp_time, &background, (char **)&recipe, &p1_version, &p2_version)) { 9854 9849 psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); 9855 9850 return NULL; 9856 9851 } 9857 9852 9858 return p2DoneExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, recipe, p1_version, p2_version);9853 return p2DoneExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background, recipe, p1_version, p2_version); 9859 9854 } 9860 9855 … … 9985 9980 return NULL; 9986 9981 } 9987 if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, object->class)) {9988 psError(PS_ERR_UNKNOWN, false, "failed to add item class");9989 psFree(md);9990 return NULL;9991 }9992 9982 if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, object->airmass)) { 9993 9983 psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); … … 9995 9985 return NULL; 9996 9986 } 9997 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "ra", 0, NULL, object->ra)) {9987 if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, object->ra)) { 9998 9988 psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); 9999 9989 psFree(md); 10000 9990 return NULL; 10001 9991 } 10002 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) {9992 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) { 10003 9993 psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); 10004 9994 psFree(md); … … 10007 9997 if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, object->exp_time)) { 10008 9998 psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time"); 9999 psFree(md); 10000 return NULL; 10001 } 10002 if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, object->background)) { 10003 psError(PS_ERR_UNKNOWN, false, "failed to add item background"); 10009 10004 psFree(md); 10010 10005 return NULL; … … 10038 10033 psS32 imfiles; 10039 10034 char *filter; 10040 char *class;10041 10035 psF32 airmass; 10042 psF 32ra;10043 psF 32dec;10036 psF64 ra; 10037 psF64 dec; 10044 10038 psF32 exp_time; 10039 psF64 background; 10045 10040 char *recipe; 10046 10041 psS32 p1_version; … … 10077 10072 return false; 10078 10073 } 10079 class = psMetadataLookupPtr(&status, md, "class");10080 if (!status) {10081 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class");10082 return false;10083 }10084 10074 airmass = psMetadataLookupF32(&status, md, "airmass"); 10085 10075 if (!status) { … … 10087 10077 return false; 10088 10078 } 10089 ra = psMetadataLookupF 32(&status, md, "ra");10079 ra = psMetadataLookupF64(&status, md, "ra"); 10090 10080 if (!status) { 10091 10081 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ra"); 10092 10082 return false; 10093 10083 } 10094 dec = psMetadataLookupF 32(&status, md, "dec");10084 dec = psMetadataLookupF64(&status, md, "dec"); 10095 10085 if (!status) { 10096 10086 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); … … 10102 10092 return false; 10103 10093 } 10094 background = psMetadataLookupF64(&status, md, "background"); 10095 if (!status) { 10096 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); 10097 return false; 10098 } 10104 10099 recipe = psMetadataLookupPtr(&status, md, "recipe"); 10105 10100 if (!status) { … … 10118 10113 } 10119 10114 10120 return p2DoneExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, recipe, p1_version, p2_version);10115 return p2DoneExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background, recipe, p1_version, p2_version); 10121 10116 } 10122 10117 psArray *p2DoneExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) … … 10665 10660 static void p3PendingExpRowFree(p3PendingExpRow *object); 10666 10661 10667 p3PendingExpRow *p3PendingExpRowAlloc(const char *exp_id, const char *camera, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF32 ra, psF32 dec, psF32 exp_time, const char *recipe, psS32 p2_version, psS32 p3_version)10662 p3PendingExpRow *p3PendingExpRowAlloc(const char *exp_id, const char *camera, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background, const char *recipe, psS32 p2_version, psS32 p3_version) 10668 10663 { 10669 10664 p3PendingExpRow *object; … … 10677 10672 object->imfiles = imfiles; 10678 10673 object->filter = psStringCopy(filter); 10679 object->class = psStringCopy(class);10680 10674 object->airmass = airmass; 10681 10675 object->ra = ra; 10682 10676 object->dec = dec; 10683 10677 object->exp_time = exp_time; 10678 object->background = background; 10684 10679 object->recipe = psStringCopy(recipe); 10685 10680 object->p2_version = p2_version; … … 10695 10690 psFree(object->exp_type); 10696 10691 psFree(object->filter); 10697 psFree(object->class);10698 10692 psFree(object->recipe); 10699 10693 } … … 10735 10729 return false; 10736 10730 } 10737 if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "255")) {10738 psError(PS_ERR_UNKNOWN, false, "failed to add item class");10739 psFree(md);10740 return false;10741 }10742 10731 if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 0.0)) { 10743 10732 psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); … … 10745 10734 return false; 10746 10735 } 10747 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "ra", 0, NULL, 0.0)) {10736 if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, 0.0)) { 10748 10737 psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); 10749 10738 psFree(md); 10750 10739 return false; 10751 10740 } 10752 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) {10741 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) { 10753 10742 psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); 10754 10743 psFree(md); … … 10760 10749 return false; 10761 10750 } 10751 if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, 0.0)) { 10752 psError(PS_ERR_UNKNOWN, false, "failed to add item background"); 10753 psFree(md); 10754 return false; 10755 } 10762 10756 if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, "64")) { 10763 10757 psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); … … 10788 10782 } 10789 10783 10790 bool p3PendingExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF32 ra, psF32 dec, psF32 exp_time, const char *recipe, psS32 p2_version, psS32 p3_version)10784 bool p3PendingExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background, const char *recipe, psS32 p2_version, psS32 p3_version) 10791 10785 { 10792 10786 psMetadata *md; … … 10819 10813 return false; 10820 10814 } 10821 if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, class)) {10822 psError(PS_ERR_UNKNOWN, false, "failed to add item class");10823 psFree(md);10824 return false;10825 }10826 10815 if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, airmass)) { 10827 10816 psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); … … 10829 10818 return false; 10830 10819 } 10831 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "ra", 0, NULL, ra)) {10820 if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, ra)) { 10832 10821 psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); 10833 10822 psFree(md); 10834 10823 return false; 10835 10824 } 10836 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) {10825 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) { 10837 10826 psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); 10838 10827 psFree(md); … … 10844 10833 return false; 10845 10834 } 10835 if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, background)) { 10836 psError(PS_ERR_UNKNOWN, false, "failed to add item background"); 10837 psFree(md); 10838 return false; 10839 } 10846 10840 if (!psMetadataAddStr(md, PS_LIST_TAIL, "recipe", 0, NULL, recipe)) { 10847 10841 psError(PS_ERR_UNKNOWN, false, "failed to add item recipe"); … … 10866 10860 } 10867 10861 10868 bool p3PendingExpPop(psDB *dbh, char **exp_id, char **camera, char **exp_type, psS32 *imfiles, char **filter, char **class, psF32 *airmass, psF32 *ra, psF32 *dec, psF32 *exp_time, char **recipe, psS32 *p2_version, psS32 *p3_version)10862 bool p3PendingExpPop(psDB *dbh, char **exp_id, char **camera, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *dec, psF32 *exp_time, psF64 *background, char **recipe, psS32 *p2_version, psS32 *p3_version) 10869 10863 { 10870 10864 psArray *rowSet; … … 10940 10934 return false; 10941 10935 } 10942 *class = psMetadataLookupPtr(&status, row, "class");10943 if (!status) {10944 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class");10945 psFree(row);10946 return false;10947 }10948 10936 *airmass = psMetadataLookupF32(&status, row, "airmass"); 10949 10937 if (!status) { … … 10952 10940 return false; 10953 10941 } 10954 *ra = psMetadataLookupF 32(&status, row, "ra");10942 *ra = psMetadataLookupF64(&status, row, "ra"); 10955 10943 if (!status) { 10956 10944 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ra"); … … 10958 10946 return false; 10959 10947 } 10960 *dec = psMetadataLookupF 32(&status, row, "dec");10948 *dec = psMetadataLookupF64(&status, row, "dec"); 10961 10949 if (!status) { 10962 10950 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); … … 10970 10958 return false; 10971 10959 } 10960 *background = psMetadataLookupF64(&status, row, "background"); 10961 if (!status) { 10962 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); 10963 psFree(row); 10964 return false; 10965 } 10972 10966 *recipe = psMetadataLookupPtr(&status, row, "recipe"); 10973 10967 if (!status) { … … 10996 10990 bool p3PendingExpInsertObject(psDB *dbh, p3PendingExpRow *object) 10997 10991 { 10998 return p3PendingExpInsert(dbh, object->exp_id, object->camera, object->exp_type, object->imfiles, object->filter, object-> class, object->airmass, object->ra, object->dec, object->exp_time, object->recipe, object->p2_version, object->p3_version);10992 return p3PendingExpInsert(dbh, object->exp_id, object->camera, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->dec, object->exp_time, object->background, object->recipe, object->p2_version, object->p3_version); 10999 10993 } 11000 10994 … … 11006 11000 psS32 imfiles; 11007 11001 char filter[256]; 11008 char class[256];11009 11002 psF32 airmass; 11010 psF 32ra;11011 psF 32dec;11003 psF64 ra; 11004 psF64 dec; 11012 11005 psF32 exp_time; 11006 psF64 background; 11013 11007 char recipe[256]; 11014 11008 psS32 p2_version; 11015 11009 psS32 p3_version; 11016 11010 11017 if (!p3PendingExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&exp_type, &imfiles, (char **)&filter, (char **)&class, &airmass, &ra, &dec, &exp_time, (char **)&recipe, &p2_version, &p3_version)) {11011 if (!p3PendingExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &dec, &exp_time, &background, (char **)&recipe, &p2_version, &p3_version)) { 11018 11012 psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); 11019 11013 return NULL; 11020 11014 } 11021 11015 11022 return p3PendingExpRowAlloc(exp_id, camera, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, recipe, p2_version, p3_version);11016 return p3PendingExpRowAlloc(exp_id, camera, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background, recipe, p2_version, p3_version); 11023 11017 } 11024 11018 … … 11144 11138 return NULL; 11145 11139 } 11146 if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, object->class)) {11147 psError(PS_ERR_UNKNOWN, false, "failed to add item class");11148 psFree(md);11149 return NULL;11150 }11151 11140 if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, object->airmass)) { 11152 11141 psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); … … 11154 11143 return NULL; 11155 11144 } 11156 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "ra", 0, NULL, object->ra)) {11145 if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, object->ra)) { 11157 11146 psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); 11158 11147 psFree(md); 11159 11148 return NULL; 11160 11149 } 11161 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) {11150 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) { 11162 11151 psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); 11163 11152 psFree(md); … … 11166 11155 if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, object->exp_time)) { 11167 11156 psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time"); 11157 psFree(md); 11158 return NULL; 11159 } 11160 if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, object->background)) { 11161 psError(PS_ERR_UNKNOWN, false, "failed to add item background"); 11168 11162 psFree(md); 11169 11163 return NULL; … … 11196 11190 psS32 imfiles; 11197 11191 char *filter; 11198 char *class;11199 11192 psF32 airmass; 11200 psF 32ra;11201 psF 32dec;11193 psF64 ra; 11194 psF64 dec; 11202 11195 psF32 exp_time; 11196 psF64 background; 11203 11197 char *recipe; 11204 11198 psS32 p2_version; … … 11230 11224 return false; 11231 11225 } 11232 class = psMetadataLookupPtr(&status, md, "class");11233 if (!status) {11234 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class");11235 return false;11236 }11237 11226 airmass = psMetadataLookupF32(&status, md, "airmass"); 11238 11227 if (!status) { … … 11240 11229 return false; 11241 11230 } 11242 ra = psMetadataLookupF 32(&status, md, "ra");11231 ra = psMetadataLookupF64(&status, md, "ra"); 11243 11232 if (!status) { 11244 11233 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ra"); 11245 11234 return false; 11246 11235 } 11247 dec = psMetadataLookupF 32(&status, md, "dec");11236 dec = psMetadataLookupF64(&status, md, "dec"); 11248 11237 if (!status) { 11249 11238 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); … … 11255 11244 return false; 11256 11245 } 11246 background = psMetadataLookupF64(&status, md, "background"); 11247 if (!status) { 11248 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); 11249 return false; 11250 } 11257 11251 recipe = psMetadataLookupPtr(&status, md, "recipe"); 11258 11252 if (!status) { … … 11271 11265 } 11272 11266 11273 return p3PendingExpRowAlloc(exp_id, camera, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time, recipe, p2_version, p3_version);11267 return p3PendingExpRowAlloc(exp_id, camera, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background, recipe, p2_version, p3_version); 11274 11268 } 11275 11269 psArray *p3PendingExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) … … 11669 11663 static void detInputExpRowFree(detInputExpRow *object); 11670 11664 11671 detInputExpRow *detInputExpRowAlloc(psS32 det_id, psS32 iteration, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF32 ra, psF32 dec, psF32 exp_time)11665 detInputExpRow *detInputExpRowAlloc(psS32 det_id, psS32 iteration, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background) 11672 11666 { 11673 11667 detInputExpRow *object; … … 11684 11678 object->imfiles = imfiles; 11685 11679 object->filter = psStringCopy(filter); 11686 object->class = psStringCopy(class);11687 11680 object->airmass = airmass; 11688 11681 object->ra = ra; 11689 11682 object->dec = dec; 11690 11683 object->exp_time = exp_time; 11684 object->background = background; 11691 11685 11692 11686 return object; … … 11700 11694 psFree(object->exp_type); 11701 11695 psFree(object->filter); 11702 psFree(object->class);11703 11696 } 11704 11697 … … 11754 11747 return false; 11755 11748 } 11756 if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "255")) {11757 psError(PS_ERR_UNKNOWN, false, "failed to add item class");11758 psFree(md);11759 return false;11760 }11761 11749 if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 0.0)) { 11762 11750 psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); … … 11764 11752 return false; 11765 11753 } 11766 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "ra", 0, NULL, 0.0)) {11754 if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, 0.0)) { 11767 11755 psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); 11768 11756 psFree(md); 11769 11757 return false; 11770 11758 } 11771 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) {11759 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, 0.0)) { 11772 11760 psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); 11773 11761 psFree(md); … … 11779 11767 return false; 11780 11768 } 11769 if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, 0.0)) { 11770 psError(PS_ERR_UNKNOWN, false, "failed to add item background"); 11771 psFree(md); 11772 return false; 11773 } 11781 11774 11782 11775 status = psDBCreateTable(dbh, DETINPUTEXP_TABLE_NAME, md); … … 11792 11785 } 11793 11786 11794 bool detInputExpInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class, psF32 airmass, psF32 ra, psF32 dec, psF32 exp_time)11787 bool detInputExpInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec, psF32 exp_time, psF64 background) 11795 11788 { 11796 11789 psMetadata *md; … … 11838 11831 return false; 11839 11832 } 11840 if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, class)) {11841 psError(PS_ERR_UNKNOWN, false, "failed to add item class");11842 psFree(md);11843 return false;11844 }11845 11833 if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, airmass)) { 11846 11834 psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); … … 11848 11836 return false; 11849 11837 } 11850 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "ra", 0, NULL, ra)) {11838 if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, ra)) { 11851 11839 psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); 11852 11840 psFree(md); 11853 11841 return false; 11854 11842 } 11855 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) {11843 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, dec)) { 11856 11844 psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); 11857 11845 psFree(md); … … 11863 11851 return false; 11864 11852 } 11853 if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, background)) { 11854 psError(PS_ERR_UNKNOWN, false, "failed to add item background"); 11855 psFree(md); 11856 return false; 11857 } 11865 11858 11866 11859 status = psDBInsertOneRow(dbh, DETINPUTEXP_TABLE_NAME, md); … … 11870 11863 } 11871 11864 11872 bool detInputExpPop(psDB *dbh, psS32 *det_id, psS32 *iteration, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, char **class, psF32 *airmass, psF32 *ra, psF32 *dec, psF32 *exp_time)11865 bool detInputExpPop(psDB *dbh, psS32 *det_id, psS32 *iteration, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *dec, psF32 *exp_time, psF64 *background) 11873 11866 { 11874 11867 psArray *rowSet; … … 11962 11955 return false; 11963 11956 } 11964 *class = psMetadataLookupPtr(&status, row, "class");11965 if (!status) {11966 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class");11967 psFree(row);11968 return false;11969 }11970 11957 *airmass = psMetadataLookupF32(&status, row, "airmass"); 11971 11958 if (!status) { … … 11974 11961 return false; 11975 11962 } 11976 *ra = psMetadataLookupF 32(&status, row, "ra");11963 *ra = psMetadataLookupF64(&status, row, "ra"); 11977 11964 if (!status) { 11978 11965 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ra"); … … 11980 11967 return false; 11981 11968 } 11982 *dec = psMetadataLookupF 32(&status, row, "dec");11969 *dec = psMetadataLookupF64(&status, row, "dec"); 11983 11970 if (!status) { 11984 11971 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); … … 11992 11979 return false; 11993 11980 } 11981 *background = psMetadataLookupF64(&status, row, "background"); 11982 if (!status) { 11983 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); 11984 psFree(row); 11985 return false; 11986 } 11994 11987 11995 11988 psFree(row); … … 12000 11993 bool detInputExpInsertObject(psDB *dbh, detInputExpRow *object) 12001 11994 { 12002 return detInputExpInsert(dbh, object->det_id, object->iteration, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object-> class, object->airmass, object->ra, object->dec, object->exp_time);11995 return detInputExpInsert(dbh, object->det_id, object->iteration, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->dec, object->exp_time, object->background); 12003 11996 } 12004 11997 … … 12013 12006 psS32 imfiles; 12014 12007 char filter[256]; 12015 char class[256];12016 12008 psF32 airmass; 12017 psF 32ra;12018 psF 32dec;12009 psF64 ra; 12010 psF64 dec; 12019 12011 psF32 exp_time; 12020 12021 if (!detInputExpPop(dbh, &det_id, &iteration, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, (char **)&class, &airmass, &ra, &dec, &exp_time)) { 12012 psF64 background; 12013 12014 if (!detInputExpPop(dbh, &det_id, &iteration, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &dec, &exp_time, &background)) { 12022 12015 psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); 12023 12016 return NULL; 12024 12017 } 12025 12018 12026 return detInputExpRowAlloc(det_id, iteration, exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time);12019 return detInputExpRowAlloc(det_id, iteration, exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background); 12027 12020 } 12028 12021 … … 12163 12156 return NULL; 12164 12157 } 12165 if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, object->class)) {12166 psError(PS_ERR_UNKNOWN, false, "failed to add item class");12167 psFree(md);12168 return NULL;12169 }12170 12158 if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, object->airmass)) { 12171 12159 psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); … … 12173 12161 return NULL; 12174 12162 } 12175 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "ra", 0, NULL, object->ra)) {12163 if (!psMetadataAddF64(md, PS_LIST_TAIL, "ra", 0, NULL, object->ra)) { 12176 12164 psError(PS_ERR_UNKNOWN, false, "failed to add item ra"); 12177 12165 psFree(md); 12178 12166 return NULL; 12179 12167 } 12180 if (!psMetadataAddF 32(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) {12168 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec", 0, NULL, object->dec)) { 12181 12169 psError(PS_ERR_UNKNOWN, false, "failed to add item dec"); 12182 12170 psFree(md); … … 12185 12173 if (!psMetadataAddF32(md, PS_LIST_TAIL, "exp_time", 0, NULL, object->exp_time)) { 12186 12174 psError(PS_ERR_UNKNOWN, false, "failed to add item exp_time"); 12175 psFree(md); 12176 return NULL; 12177 } 12178 if (!psMetadataAddF64(md, PS_LIST_TAIL, "background", 0, NULL, object->background)) { 12179 psError(PS_ERR_UNKNOWN, false, "failed to add item background"); 12187 12180 psFree(md); 12188 12181 return NULL; … … 12203 12196 psS32 imfiles; 12204 12197 char *filter; 12205 char *class;12206 12198 psF32 airmass; 12207 psF 32ra;12208 psF 32dec;12199 psF64 ra; 12200 psF64 dec; 12209 12201 psF32 exp_time; 12202 psF64 background; 12210 12203 12211 12204 det_id = psMetadataLookupS32(&status, md, "det_id"); … … 12249 12242 return false; 12250 12243 } 12251 class = psMetadataLookupPtr(&status, md, "class");12252 if (!status) {12253 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class");12254 return false;12255 }12256 12244 airmass = psMetadataLookupF32(&status, md, "airmass"); 12257 12245 if (!status) { … … 12259 12247 return false; 12260 12248 } 12261 ra = psMetadataLookupF 32(&status, md, "ra");12249 ra = psMetadataLookupF64(&status, md, "ra"); 12262 12250 if (!status) { 12263 12251 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ra"); 12264 12252 return false; 12265 12253 } 12266 dec = psMetadataLookupF 32(&status, md, "dec");12254 dec = psMetadataLookupF64(&status, md, "dec"); 12267 12255 if (!status) { 12268 12256 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec"); … … 12274 12262 return false; 12275 12263 } 12276 12277 return detInputExpRowAlloc(det_id, iteration, exp_id, camera, telescope, exp_type, imfiles, filter, class, airmass, ra, dec, exp_time); 12264 background = psMetadataLookupF64(&status, md, "background"); 12265 if (!status) { 12266 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item background"); 12267 return false; 12268 } 12269 12270 return detInputExpRowAlloc(det_id, iteration, exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background); 12278 12271 } 12279 12272 psArray *detInputExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
Note:
See TracChangeset
for help on using the changeset viewer.
