Changeset 15775
- Timestamp:
- Dec 7, 2007, 5:18:56 PM (18 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
-
dbconfig/tasks.md (modified) (5 diffs)
-
ippTools/src/regtool.c (modified) (12 diffs)
-
ippTools/src/regtoolConfig.c (modified) (6 diffs)
-
ippconfig/gpc1/format_raw.config (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/dbconfig/tasks.md
r15740 r15775 1 # $Id: tasks.md,v 1.14 2 2007-12-06 01:01:03eugene Exp $1 # $Id: tasks.md,v 1.143 2007-12-08 03:17:56 eugene Exp $ 2 2 3 3 # this table records all exposure ID ever seen from the summit … … 118 118 reduction STR 64 # Reduction class 119 119 filter STR 64 120 comment STR 80 120 121 airmass F32 0.0 121 122 ra F64 0.0 … … 130 131 ccd_temp F32 0.0 131 132 posang F64 0.0 132 M1_x F32 0.0 133 M1_y F32 0.0 134 M1_z F32 0.0 135 M1_tip F32 0.0 136 M1_tilt F32 0.0 137 M2_x F32 0.0 138 M2_y F32 0.0 139 M2_z F32 0.0 140 M2_tip F32 0.0 141 M2_tilt F32 0.0 142 env_temperature F32 0.0 143 env_humidity F32 0.0 144 env_wind_speed F32 0.0 145 env_wind_dir F32 0.0 146 pon_time F32 0.0 133 m1_x F32 0.0 134 m1_y F32 0.0 135 m1_z F32 0.0 136 m1_tip F32 0.0 137 m1_tilt F32 0.0 138 m2_x F32 0.0 139 m2_y F32 0.0 140 m2_z F32 0.0 141 m2_tip F32 0.0 142 m2_tilt F32 0.0 143 env_temperature F32 0.0 144 env_humidity F32 0.0 145 env_wind_speed F32 0.0 146 env_wind_dir F32 0.0 147 teltemp_m1 F32 0.0 148 teltemp_m1cell F32 0.0 149 teltemp_m2 F32 0.0 150 teltemp_spider F32 0.0 151 teltemp_truss F32 0.0 152 teltemp_extra F32 0.0 153 pon_time F32 0.0 147 154 user_1 F64 0.0 148 155 user_2 F64 0.0 … … 170 177 filelevel STR 64 171 178 filter STR 64 179 comment STR 80 172 180 airmass F32 0.0 173 181 ra F64 0.0 … … 182 190 ccd_temp F32 0.0 183 191 posang F64 0.0 184 M1_x F32 0.0 185 M1_y F32 0.0 186 M1_z F32 0.0 187 M1_tip F32 0.0 188 M1_tilt F32 0.0 189 M2_x F32 0.0 190 M2_y F32 0.0 191 M2_z F32 0.0 192 M2_tip F32 0.0 193 M2_tilt F32 0.0 194 env_temperature F32 0.0 195 env_humidity F32 0.0 196 env_wind_speed F32 0.0 197 env_wind_dir F32 0.0 198 pon_time F32 0.0 192 m1_x F32 0.0 193 m1_y F32 0.0 194 m1_z F32 0.0 195 m1_tip F32 0.0 196 m1_tilt F32 0.0 197 m2_x F32 0.0 198 m2_y F32 0.0 199 m2_z F32 0.0 200 m2_tip F32 0.0 201 m2_tilt F32 0.0 202 env_temperature F32 0.0 203 env_humidity F32 0.0 204 env_wind_speed F32 0.0 205 env_wind_dir F32 0.0 206 teltemp_m1 F32 0.0 207 teltemp_m1cell F32 0.0 208 teltemp_m2 F32 0.0 209 teltemp_spider F32 0.0 210 teltemp_truss F32 0.0 211 teltemp_extra F32 0.0 212 pon_time F32 0.0 199 213 user_1 F64 0.0 200 214 user_2 F64 0.0 -
trunk/ippTools/src/regtool.c
r15740 r15775 589 589 } 590 590 if (exp_id) { 591 if (!psMetadataAddStr(where, PS_LIST_TAIL, " exp_id", 0, "==", exp_id)) {591 if (!psMetadataAddStr(where, PS_LIST_TAIL, "T1.exp_id", 0, "==", exp_id)) { 592 592 psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id"); 593 593 psFree(where); … … 597 597 } 598 598 599 psString whereClaus = psDBGenerateWhereSQL(where, NULL); 599 600 psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); 600 601 psFree(where); 601 if (whereClaus ) {602 psStringAppend(&query, " %s", whereClaus);603 psFree(whereClaus);602 if (whereClause) { 603 psStringAppend(&query, " AND %s", whereClause); 604 psFree(whereClause); 604 605 } 605 606 } … … 1023 1024 } 1024 1025 1026 psString comment = psMetadataLookupStr(&status, config->args, "-comment"); 1027 if (!status) { 1028 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -comment"); 1029 return false; 1030 } 1031 1025 1032 psF32 airmass = psMetadataLookupF32(&status, config->args, "-airmass"); 1026 1033 if (!status) { … … 1095 1102 } 1096 1103 1097 psF32 M1_x = psMetadataLookupF32(&status, config->args, "-M1_x");1098 if (!status) { 1099 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for - M1_x");1100 return false; 1101 } 1102 psF32 M1_y = psMetadataLookupF32(&status, config->args, "-M1_y");1103 if (!status) { 1104 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for - M1_y");1105 return false; 1106 } 1107 psF32 M1_z = psMetadataLookupF32(&status, config->args, "-M1_z");1108 if (!status) { 1109 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for - M1_z");1110 return false; 1111 } 1112 psF32 M1_tip = psMetadataLookupF32(&status, config->args, "-M1_tip");1113 if (!status) { 1114 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for - M1_tip");1115 return false; 1116 } 1117 psF32 M1_tilt = psMetadataLookupF32(&status, config->args, "-M1_tilt");1118 if (!status) { 1119 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for - M1_tilt");1120 return false; 1121 } 1122 1123 psF32 M2_x = psMetadataLookupF32(&status, config->args, "-M2_x");1124 if (!status) { 1125 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for - M2_x");1126 return false; 1127 } 1128 psF32 M2_y = psMetadataLookupF32(&status, config->args, "-M2_y");1129 if (!status) { 1130 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for - M2_y");1131 return false; 1132 } 1133 psF32 M2_z = psMetadataLookupF32(&status, config->args, "-M2_z");1134 if (!status) { 1135 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for - M2_z");1136 return false; 1137 } 1138 psF32 M2_tip = psMetadataLookupF32(&status, config->args, "-M2_tip");1139 if (!status) { 1140 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for - M2_tip");1141 return false; 1142 } 1143 psF32 M2_tilt = psMetadataLookupF32(&status, config->args, "-M2_tilt");1144 if (!status) { 1145 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for - M2_tilt");1104 psF32 m1_x = psMetadataLookupF32(&status, config->args, "-m1_x"); 1105 if (!status) { 1106 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m1_x"); 1107 return false; 1108 } 1109 psF32 m1_y = psMetadataLookupF32(&status, config->args, "-m1_y"); 1110 if (!status) { 1111 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m1_y"); 1112 return false; 1113 } 1114 psF32 m1_z = psMetadataLookupF32(&status, config->args, "-m1_z"); 1115 if (!status) { 1116 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m1_z"); 1117 return false; 1118 } 1119 psF32 m1_tip = psMetadataLookupF32(&status, config->args, "-m1_tip"); 1120 if (!status) { 1121 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m1_tip"); 1122 return false; 1123 } 1124 psF32 m1_tilt = psMetadataLookupF32(&status, config->args, "-m1_tilt"); 1125 if (!status) { 1126 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m1_tilt"); 1127 return false; 1128 } 1129 1130 psF32 m2_x = psMetadataLookupF32(&status, config->args, "-m2_x"); 1131 if (!status) { 1132 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m2_x"); 1133 return false; 1134 } 1135 psF32 m2_y = psMetadataLookupF32(&status, config->args, "-m2_y"); 1136 if (!status) { 1137 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m2_y"); 1138 return false; 1139 } 1140 psF32 m2_z = psMetadataLookupF32(&status, config->args, "-m2_z"); 1141 if (!status) { 1142 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m2_z"); 1143 return false; 1144 } 1145 psF32 m2_tip = psMetadataLookupF32(&status, config->args, "-m2_tip"); 1146 if (!status) { 1147 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m2_tip"); 1148 return false; 1149 } 1150 psF32 m2_tilt = psMetadataLookupF32(&status, config->args, "-m2_tilt"); 1151 if (!status) { 1152 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m2_tilt"); 1146 1153 return false; 1147 1154 } … … 1165 1172 if (!status) { 1166 1173 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -env_wind_dir"); 1174 return false; 1175 } 1176 1177 psF32 teltemp_m1 = psMetadataLookupF32(&status, config->args, "-teltemp_m1"); 1178 if (!status) { 1179 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -teltemp_m1"); 1180 return false; 1181 } 1182 psF32 teltemp_m1cell = psMetadataLookupF32(&status, config->args, "-teltemp_m1cell"); 1183 if (!status) { 1184 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -teltemp_m1cell"); 1185 return false; 1186 } 1187 psF32 teltemp_m2 = psMetadataLookupF32(&status, config->args, "-teltemp_m2"); 1188 if (!status) { 1189 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -teltemp_m2"); 1190 return false; 1191 } 1192 psF32 teltemp_spider = psMetadataLookupF32(&status, config->args, "-teltemp_spider"); 1193 if (!status) { 1194 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -teltemp_spider"); 1195 return false; 1196 } 1197 psF32 teltemp_truss = psMetadataLookupF32(&status, config->args, "-teltemp_truss"); 1198 if (!status) { 1199 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -teltemp_truss"); 1200 return false; 1201 } 1202 psF32 teltemp_extra = psMetadataLookupF32(&status, config->args, "-teltemp_extra"); 1203 if (!status) { 1204 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -teltemp_extra"); 1167 1205 return false; 1168 1206 } … … 1240 1278 reduction ? reduction : exp->reduction, 1241 1279 filter, 1280 comment, 1242 1281 airmass, 1243 1282 ra, … … 1252 1291 ccd_temp, 1253 1292 posang, 1254 M1_x,1255 M1_y,1256 M1_z,1257 M1_tip,1258 M1_tilt,1259 M2_x,1260 M2_y,1261 M2_z,1262 M2_tip,1263 M2_tilt,1293 m1_x, 1294 m1_y, 1295 m1_z, 1296 m1_tip, 1297 m1_tilt, 1298 m2_x, 1299 m2_y, 1300 m2_z, 1301 m2_tip, 1302 m2_tilt, 1264 1303 env_temp, 1265 1304 env_humid, 1266 1305 env_wind, 1267 1306 env_dir, 1307 teltemp_m1, 1308 teltemp_m1cell, 1309 teltemp_m2, 1310 teltemp_spider, 1311 teltemp_truss, 1312 teltemp_extra, 1268 1313 pon_time, 1269 1314 user_1, … … 1361 1406 } 1362 1407 1408 psString comment = psMetadataLookupStr(&status, config->args, "-comment"); 1409 if (!status) { 1410 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -comment"); 1411 return false; 1412 } 1413 1363 1414 psF32 airmass = psMetadataLookupF32(&status, config->args, "-airmass"); 1364 1415 if (!status) { … … 1433 1484 } 1434 1485 1435 psF32 M1_x = psMetadataLookupF32(&status, config->args, "-M1_x");1436 if (!status) { 1437 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for - M1_x");1438 return false; 1439 } 1440 psF32 M1_y = psMetadataLookupF32(&status, config->args, "-M1_y");1441 if (!status) { 1442 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for - M1_y");1443 return false; 1444 } 1445 psF32 M1_z = psMetadataLookupF32(&status, config->args, "-M1_z");1446 if (!status) { 1447 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for - M1_z");1448 return false; 1449 } 1450 psF32 M1_tip = psMetadataLookupF32(&status, config->args, "-M1_tip");1451 if (!status) { 1452 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for - M1_tip");1453 return false; 1454 } 1455 psF32 M1_tilt = psMetadataLookupF32(&status, config->args, "-M1_tilt");1456 if (!status) { 1457 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for - M1_tilt");1458 return false; 1459 } 1460 1461 psF32 M2_x = psMetadataLookupF32(&status, config->args, "-M2_x");1462 if (!status) { 1463 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for - M2_x");1464 return false; 1465 } 1466 psF32 M2_y = psMetadataLookupF32(&status, config->args, "-M2_y");1467 if (!status) { 1468 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for - M2_y");1469 return false; 1470 } 1471 psF32 M2_z = psMetadataLookupF32(&status, config->args, "-M2_z");1472 if (!status) { 1473 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for - M2_z");1474 return false; 1475 } 1476 psF32 M2_tip = psMetadataLookupF32(&status, config->args, "-M2_tip");1477 if (!status) { 1478 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for - M2_tip");1479 return false; 1480 } 1481 psF32 M2_tilt = psMetadataLookupF32(&status, config->args, "-M2_tilt");1482 if (!status) { 1483 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for - M2_tilt");1486 psF32 m1_x = psMetadataLookupF32(&status, config->args, "-m1_x"); 1487 if (!status) { 1488 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m1_x"); 1489 return false; 1490 } 1491 psF32 m1_y = psMetadataLookupF32(&status, config->args, "-m1_y"); 1492 if (!status) { 1493 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m1_y"); 1494 return false; 1495 } 1496 psF32 m1_z = psMetadataLookupF32(&status, config->args, "-m1_z"); 1497 if (!status) { 1498 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m1_z"); 1499 return false; 1500 } 1501 psF32 m1_tip = psMetadataLookupF32(&status, config->args, "-m1_tip"); 1502 if (!status) { 1503 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m1_tip"); 1504 return false; 1505 } 1506 psF32 m1_tilt = psMetadataLookupF32(&status, config->args, "-m1_tilt"); 1507 if (!status) { 1508 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m1_tilt"); 1509 return false; 1510 } 1511 1512 psF32 m2_x = psMetadataLookupF32(&status, config->args, "-m2_x"); 1513 if (!status) { 1514 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m2_x"); 1515 return false; 1516 } 1517 psF32 m2_y = psMetadataLookupF32(&status, config->args, "-m2_y"); 1518 if (!status) { 1519 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m2_y"); 1520 return false; 1521 } 1522 psF32 m2_z = psMetadataLookupF32(&status, config->args, "-m2_z"); 1523 if (!status) { 1524 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m2_z"); 1525 return false; 1526 } 1527 psF32 m2_tip = psMetadataLookupF32(&status, config->args, "-m2_tip"); 1528 if (!status) { 1529 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m2_tip"); 1530 return false; 1531 } 1532 psF32 m2_tilt = psMetadataLookupF32(&status, config->args, "-m2_tilt"); 1533 if (!status) { 1534 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m2_tilt"); 1484 1535 return false; 1485 1536 } … … 1503 1554 if (!status) { 1504 1555 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -env_wind_dir"); 1556 return false; 1557 } 1558 1559 psF32 teltemp_m1 = psMetadataLookupF32(&status, config->args, "-teltemp_m1"); 1560 if (!status) { 1561 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -teltemp_m1"); 1562 return false; 1563 } 1564 psF32 teltemp_m1cell = psMetadataLookupF32(&status, config->args, "-teltemp_m1cell"); 1565 if (!status) { 1566 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -teltemp_m1cell"); 1567 return false; 1568 } 1569 psF32 teltemp_m2 = psMetadataLookupF32(&status, config->args, "-teltemp_m2"); 1570 if (!status) { 1571 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -teltemp_m2"); 1572 return false; 1573 } 1574 psF32 teltemp_spider = psMetadataLookupF32(&status, config->args, "-teltemp_spider"); 1575 if (!status) { 1576 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -teltemp_spider"); 1577 return false; 1578 } 1579 psF32 teltemp_truss = psMetadataLookupF32(&status, config->args, "-teltemp_truss"); 1580 if (!status) { 1581 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -teltemp_truss"); 1582 return false; 1583 } 1584 psF32 teltemp_extra = psMetadataLookupF32(&status, config->args, "-teltemp_extra"); 1585 if (!status) { 1586 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -teltemp_extra"); 1505 1587 return false; 1506 1588 } … … 1577 1659 filelevel, 1578 1660 filter, 1661 comment, 1579 1662 airmass, 1580 1663 ra, … … 1589 1672 ccd_temp, 1590 1673 posang, 1591 M1_x,1592 M1_y,1593 M1_z,1594 M1_tip,1595 M1_tilt,1596 M2_x,1597 M2_y,1598 M2_z,1599 M2_tip,1600 M2_tilt,1674 m1_x, 1675 m1_y, 1676 m1_z, 1677 m1_tip, 1678 m1_tilt, 1679 m2_x, 1680 m2_y, 1681 m2_z, 1682 m2_tip, 1683 m2_tilt, 1601 1684 env_temp, 1602 1685 env_humid, 1603 1686 env_wind, 1604 1687 env_dir, 1688 teltemp_m1, 1689 teltemp_m1cell, 1690 teltemp_m2, 1691 teltemp_spider, 1692 teltemp_truss, 1693 teltemp_extra, 1605 1694 pon_time, 1606 1695 user_1, -
trunk/ippTools/src/regtoolConfig.c
r15740 r15775 79 79 psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-filter", 0, 80 80 "define filter ", NULL); 81 psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-comment", 0, 82 "define comment ", NULL); 81 83 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-airmass", 0, 82 84 "define airmass", NAN); … … 103 105 psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-posang", 0, 104 106 "define rotator position angle", NAN); 105 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "- M1_x", 0,107 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m1_x", 0, 106 108 "define M1 X position", NAN); 107 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "- M1_y", 0,109 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m1_y", 0, 108 110 "define M1 Y position", NAN); 109 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "- M1_z", 0,111 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m1_z", 0, 110 112 "define M1 Z position", NAN); 111 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "- M1_tip", 0,113 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m1_tip", 0, 112 114 "define M1 TIP position", NAN); 113 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "- M1_tilt", 0,115 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m1_tilt", 0, 114 116 "define M1 TILT position", NAN); 115 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "- M2_x", 0,117 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m2_x", 0, 116 118 "define M2 X position", NAN); 117 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "- M2_y", 0,119 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m2_y", 0, 118 120 "define M2 Y position", NAN); 119 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "- M2_z", 0,121 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m2_z", 0, 120 122 "define M2 Z position", NAN); 121 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "- M2_tip", 0,123 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m2_tip", 0, 122 124 "define M2 TIP position", NAN); 123 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "- M2_tilt", 0,125 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-m2_tilt", 0, 124 126 "define M2 TILT position", NAN); 125 127 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-env_temperature", 0, … … 131 133 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-env_wind_dir", 0, 132 134 "define Environmental Wind Direction", NAN); 135 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-teltemp_m1", 0, 136 "define Telescope Temperature : M1", NAN); 137 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-teltemp_m1cell", 0, 138 "define Telescope Temperature : M1 Cell", NAN); 139 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-teltemp_m2", 0, 140 "define Telescope Temperature : M2", NAN); 141 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-teltemp_spider", 0, 142 "define Telescope Temperature : Spider", NAN); 143 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-teltemp_truss", 0, 144 "define Telescope Temperature : Truss", NAN); 145 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-teltemp_extra", 0, 146 "define Telescope Temperature : Extra", NAN); 133 147 psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-pon_time", 0, 134 148 "define time to last Power On", NAN); … … 222 236 psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-filter", 0, 223 237 "define filter ", NULL); 238 psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-comment", 0, 239 "define comment ", NULL); 224 240 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-airmass", 0, 225 241 "define airmass", NAN); … … 246 262 psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-posang", 0, 247 263 "define rotator position angle", NAN); 248 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "- M1_x", 0,264 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m1_x", 0, 249 265 "define M1 X position", NAN); 250 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "- M1_y", 0,266 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m1_y", 0, 251 267 "define M1 Y position", NAN); 252 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "- M1_z", 0,268 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m1_z", 0, 253 269 "define M1 Z position", NAN); 254 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "- M1_tip", 0,270 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m1_tip", 0, 255 271 "define M1 TIP position", NAN); 256 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "- M1_tilt", 0,272 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m1_tilt", 0, 257 273 "define M1 TILT position", NAN); 258 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "- M2_x", 0,274 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m2_x", 0, 259 275 "define M2 X position", NAN); 260 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "- M2_y", 0,276 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m2_y", 0, 261 277 "define M2 Y position", NAN); 262 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "- M2_z", 0,278 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m2_z", 0, 263 279 "define M2 Z position", NAN); 264 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "- M2_tip", 0,280 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m2_tip", 0, 265 281 "define M2 TIP position", NAN); 266 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "- M2_tilt", 0,282 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-m2_tilt", 0, 267 283 "define M2 TILT position", NAN); 268 284 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-env_temperature", 0, … … 274 290 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-env_wind_dir", 0, 275 291 "define Environmental Wind Direction", NAN); 292 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-teltemp_m1", 0, 293 "define Telescope Temperature : M1", NAN); 294 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-teltemp_m1cell", 0, 295 "define Telescope Temperature : M1 Cell", NAN); 296 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-teltemp_m2", 0, 297 "define Telescope Temperature : M2", NAN); 298 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-teltemp_spider", 0, 299 "define Telescope Temperature : Spider", NAN); 300 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-teltemp_truss", 0, 301 "define Telescope Temperature : Truss", NAN); 302 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-teltemp_extra", 0, 303 "define Telescope Temperature : Extra", NAN); 276 304 psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-pon_time", 0, 277 305 "define time to last Power On", NAN); -
trunk/ippconfig/gpc1/format_raw.config
r15740 r15775 2 2 3 3 # How to identify this type 4 RULE 5 # TELESCOP STRPS16 # DETECTOR STRGPC17 CONTROLR STRSTARGRASP8 EXTEND BOOLT9 NEXTEND S326410 NAMPS S32644 RULE METADATA 5 # TELESCOP STR PS1 6 # DETECTOR STR GPC1 7 CONTROLR STR STARGRASP 8 EXTEND BOOL T 9 NEXTEND S32 64 10 NAMPS S32 64 11 11 END 12 12 13 13 # How to read this data 14 FILE 15 PHU STR CHIP# The FITS file represents a single chip16 EXTENSIONS STR CELL# The extensions represent cells17 FPA.NAME STRCONTROLR # A PHU keyword for unique identifier within the hierarchy level18 CONTENTSTR DETECTOR # How to determine content of FITS file19 CONTENT.RULE STR{CHIP.ID} # How to derive the CONTENT when writing14 FILE METADATA 15 PHU STR CHIP # The FITS file represents a single chip 16 EXTENSIONS STR CELL # The extensions represent cells 17 FPA.NAME STR CONTROLR # A PHU keyword for unique identifier within the hierarchy level 18 CONTENT STR DETECTOR # How to determine content of FITS file 19 CONTENT.RULE STR {CHIP.ID} # How to derive the CONTENT when writing 20 20 END 21 21 22 22 # What's in the FITS file? 23 CONTENTS 24 23 CONTENTS METADATA 24 # CONTENT = chip name : type 25 25 CCID58-2-15a1 STR XY01:GPCChip 26 26 CCID58-2-18a1 STR XY02:GPCChip … … 86 86 87 87 CHIPS METADATA 88 GPCChipMETADATA89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 88 GPCChip METADATA 89 # Extension name, cellName:cellType 90 xy00 STR xy00:GPCCell 91 xy10 STR xy10:GPCCell 92 xy20 STR xy20:GPCCell 93 xy30 STR xy30:GPCCell 94 xy40 STR xy40:GPCCell 95 xy50 STR xy50:GPCCell 96 xy60 STR xy60:GPCCell 97 xy70 STR xy70:GPCCell 98 xy01 STR xy01:GPCCell 99 xy11 STR xy11:GPCCell 100 xy21 STR xy21:GPCCell 101 xy31 STR xy31:GPCCell 102 xy41 STR xy41:GPCCell 103 xy51 STR xy51:GPCCell 104 xy61 STR xy61:GPCCell 105 xy71 STR xy71:GPCCell 106 xy02 STR xy02:GPCCell 107 xy12 STR xy12:GPCCell 108 xy22 STR xy22:GPCCell 109 xy32 STR xy32:GPCCell 110 xy42 STR xy42:GPCCell 111 xy52 STR xy52:GPCCell 112 xy62 STR xy62:GPCCell 113 xy72 STR xy72:GPCCell 114 xy03 STR xy03:GPCCell 115 xy13 STR xy13:GPCCell 116 xy23 STR xy23:GPCCell 117 xy33 STR xy33:GPCCell 118 xy43 STR xy43:GPCCell 119 xy53 STR xy53:GPCCell 120 xy63 STR xy63:GPCCell 121 xy73 STR xy73:GPCCell 122 xy04 STR xy04:GPCCell 123 xy14 STR xy14:GPCCell 124 xy24 STR xy24:GPCCell 125 xy34 STR xy34:GPCCell 126 xy44 STR xy44:GPCCell 127 xy54 STR xy54:GPCCell 128 xy64 STR xy64:GPCCell 129 xy74 STR xy74:GPCCell 130 xy05 STR xy05:GPCCell 131 xy15 STR xy15:GPCCell 132 xy25 STR xy25:GPCCell 133 xy35 STR xy35:GPCCell 134 xy45 STR xy45:GPCCell 135 xy55 STR xy55:GPCCell 136 xy65 STR xy65:GPCCell 137 xy75 STR xy75:GPCCell 138 xy06 STR xy06:GPCCell 139 xy16 STR xy16:GPCCell 140 xy26 STR xy26:GPCCell 141 xy36 STR xy36:GPCCell 142 xy46 STR xy46:GPCCell 143 xy56 STR xy56:GPCCell 144 xy66 STR xy66:GPCCell 145 xy76 STR xy76:GPCCell 146 xy07 STR xy07:GPCCell 147 xy17 STR xy17:GPCCell 148 xy27 STR xy27:GPCCell 149 xy37 STR xy37:GPCCell 150 xy47 STR xy47:GPCCell 151 xy57 STR xy57:GPCCell 152 xy67 STR xy67:GPCCell 153 xy77 STR xy77:GPCCell 154 END 155 155 END 156 156 157 157 # Specify the cell data 158 CELLS 159 GPCCellMETADATA160 CELL.TRIMSEC.SOURCE STRHEADER161 CELL.TRIMSEC STRDATASEC162 CELL.BIASSEC.SOURCE STRHEADER163 CELL.BIASSEC STRBIASSEC164 158 CELLS METADATA 159 GPCCell METADATA 160 CELL.TRIMSEC.SOURCE STR HEADER 161 CELL.TRIMSEC STR DATASEC 162 CELL.BIASSEC.SOURCE STR HEADER 163 CELL.BIASSEC STR BIASSEC 164 END 165 165 END 166 166 167 167 168 168 # How to translate PS concepts into FITS headers 169 TRANSLATION 169 TRANSLATION METADATA 170 170 FPA.FILTERID STR FILTERID 171 171 FPA.FILTER STR FILTERID … … 173 173 FPA.DEC STR DEC 174 174 FPA.RADECSYS STR RADECSYS 175 FPA.OBSTYPE STR OBSTYPE 176 FPA.OBJECT STR OBJECT 177 FPA.AIRMASS STR AIRMASS 178 FPA.POSANGLE STR POSANGLE 179 FPA.FOCUS STR M2Z 180 FPA.TIME STR MJD-OBS 181 FPA.ALT STR ALT 182 FPA.AZ STR AZ 183 FPA.TEMP STR DETTEM 184 FPA.M1X STR M1X 185 FPA.M1Y STR M1Y 186 FPA.M1Z STR M1Z 187 FPA.M1TIP STR M1TIP 188 FPA.M1TILT STR M1TILT 189 FPA.M2X STR M2X 190 FPA.M2Y STR M2Y 191 FPA.M2Z STR M2Z 192 FPA.M2TIP STR M2TIP 193 FPA.M2TILT STR M2TILT 194 FPA.ENV.TEMP STR ENVTEM 195 FPA.ENV.HUMID STR ENVHUM 196 FPA.ENV.WIND STR ENVWIN 197 FPA.ENV.DIR STR ENVDIR 198 FPA.PON.TIME STR PONTIME 199 CHIP.ID STR DETECTOR 200 CELL.XBIN STR CCDSUM 201 CELL.YBIN STR CCDSUM 202 CELL.X0 STR IMNPIX1 203 CELL.Y0 STR IMNPIX2 204 CELL.XPARITY STR LTM1_1 205 CELL.YPARITY STR LTM2_2 206 # CELL.SATURATION STR SATURATE 207 CHIP.TEMP STR DETTEM 208 FPA.EXPOSURE STR EXPREQ # Requested exposure time, presumably camera exposure time 209 CELL.EXPOSURE STR EXPTIME # Exposure time measured by shutter 210 CELL.DARKTIME STR DARKTIME # Exposure time for camera 175 FPA.OBSTYPE STR OBSTYPE 176 FPA.OBJECT STR OBJECT 177 FPA.COMMENT STR CMMTOBS 178 FPA.AIRMASS STR AIRMASS 179 FPA.POSANGLE STR POSANGLE 180 FPA.FOCUS STR M2Z 181 FPA.TIME STR MJD-OBS 182 FPA.ALT STR ALT 183 FPA.AZ STR AZ 184 FPA.TEMP STR DETTEM 185 FPA.M1X STR M1X 186 FPA.M1Y STR M1Y 187 FPA.M1Z STR M1Z 188 FPA.M1TIP STR M1TIP 189 FPA.M1TILT STR M1TILT 190 FPA.M2X STR M2X 191 FPA.M2Y STR M2Y 192 FPA.M2Z STR M2Z 193 FPA.M2TIP STR M2TIP 194 FPA.M2TILT STR M2TILT 195 FPA.ENV.TEMP STR ENVTEM 196 FPA.ENV.HUMID STR ENVHUM 197 FPA.ENV.WIND STR ENVWIN 198 FPA.ENV.DIR STR ENVDIR 199 200 FPA.TELTEMP.M1 STR TELTEMM1 # Primary mirror temps (C) 201 FPA.TELTEMP.M1CELL STR TELTEMMS # Primary mirror support temps (C) 202 FPA.TELTEMP.M2 STR TELTEMM2 # Secondary mirror temps (C 203 FPA.TELTEMP.SPIDER STR TELTEMSP # Spider temperatures (C) 204 FPA.TELTEMP.TRUSS STR TELTEMTR # Mid truss temperatures (C 205 FPA.TELTEMP.EXTRA STR TELTEMEX # Miscellaneous temperatures (C) 206 207 FPA.PON.TIME STR PONTIME 208 209 CHIP.ID STR DETECTOR 210 CELL.XBIN STR CCDSUM 211 CELL.YBIN STR CCDSUM 212 CELL.X0 STR IMNPIX1 213 CELL.Y0 STR IMNPIX2 214 CELL.XPARITY STR LTM1_1 215 CELL.YPARITY STR LTM2_2 216 # CELL.SATURATION STR SATURATE 217 CHIP.TEMP STR DETTEM 218 FPA.EXPOSURE STR EXPREQ # Requested exposure time, presumably camera exposure time 219 CELL.EXPOSURE STR EXPTIME # Exposure time measured by shutter 220 CELL.DARKTIME STR DARKTIME # Exposure time for camera 211 221 END 212 222 213 223 # Default PS concepts that may be specified by value 214 DEFAULTS 215 FPA.TELESCOPE STRPS1216 FPA.INSTRUMENT STRGPC1217 FPA.DETECTOR STRGPC1218 FPA.NAME S3212345219 FPA.TIMESYS STRUTC220 CHIP.XPARITY S321221 CHIP.YPARITY S321222 CHIP.X0.DEPEND STRCHIP.NAME223 CHIP.X0METADATA224 DEFAULTS METADATA 225 FPA.TELESCOPE STR PS1 226 FPA.INSTRUMENT STR GPC1 227 FPA.DETECTOR STR GPC1 228 FPA.NAME S32 12345 229 FPA.TIMESYS STR UTC 230 CHIP.XPARITY S32 1 231 CHIP.YPARITY S32 1 232 CHIP.X0.DEPEND STR CHIP.NAME 233 CHIP.X0 METADATA 224 234 XY01 S32 4971 225 235 XY02 S32 4971 … … 282 292 XY75 S32 34954 283 293 XY76 S32 34954 284 285 CHIP.Y0.DEPEND STRCHIP.NAME286 CHIP.Y0METADATA294 END 295 CHIP.Y0.DEPEND STR CHIP.NAME 296 CHIP.Y0 METADATA 287 297 XY01 S32 10286 288 298 XY02 S32 15429 … … 346 356 XY76 S32 31164 347 357 END 348 CHIP.XPARITY.DEPEND STRCHIP.NAME349 CHIP.XPARITYMETADATA358 CHIP.XPARITY.DEPEND STR CHIP.NAME 359 CHIP.XPARITY METADATA 350 360 XY01 S32 -1 351 361 XY02 S32 -1 … … 408 418 XY75 S32 1 409 419 XY76 S32 1 410 411 CHIP.YPARITY.DEPEND STRCHIP.NAME412 CHIP.YPARITYMETADATA420 END 421 CHIP.YPARITY.DEPEND STR CHIP.NAME 422 CHIP.YPARITY METADATA 413 423 XY01 S32 -1 414 424 XY02 S32 -1 … … 471 481 XY75 S32 1 472 482 XY76 S32 1 473 474 CELL.GAIN F321.0475 CELL.READNOISE F320.0476 CELL.READDIR S321477 CELL.BAD S320478 # CELL.TIME STRMJD-OBS479 # CELL.TIMESYS STRTIMESYS480 CELL.SATURATION STR40000483 END 484 CELL.GAIN F32 1.0 485 CELL.READNOISE F32 0.0 486 CELL.READDIR S32 1 487 CELL.BAD S32 0 488 # CELL.TIME STR MJD-OBS 489 # CELL.TIMESYS STR TIMESYS 490 CELL.SATURATION STR 40000 481 491 END 482 492 483 493 # How to translation PS concepts into database lookups 484 DATABASE 485 TYPE dbEntry TABLE COLUMN GIVENDBCOLGIVENPS486 # CELL.GAIN dbEntry Camera gain chipId,cellIdCHIP,CELL487 # CELL.READNOISE dbEntry Camera readNoise chipId,cellIdCHIP,CELL494 DATABASE METADATA 495 TYPE dbEntry TABLE COLUMN GIVENDBCOL GIVENPS 496 # CELL.GAIN dbEntry Camera gain chipId,cellId CHIP,CELL 497 # CELL.READNOISE dbEntry Camera readNoise chipId,cellId CHIP,CELL 488 498 489 499 # A database entry refers to a particular column (COLUMN) in a … … 495 505 496 506 # Where there might be some ambiguity, specify the format 497 FORMATS 498 FPA.RA STRDEGREES499 FPA.DEC STRDEGREES500 FPA.TIME STRMJD501 CELL.TIME STRMJD502 CELL.BINNING STRTOGETHER503 CELL.X0 STRFORTRAN504 CELL.Y0 STRFORTRAN507 FORMATS METADATA 508 FPA.RA STR DEGREES 509 FPA.DEC STR DEGREES 510 FPA.TIME STR MJD 511 CELL.TIME STR MJD 512 CELL.BINNING STR TOGETHER 513 CELL.X0 STR FORTRAN 514 CELL.Y0 STR FORTRAN 505 515 END 506 516 507 517 # Recipe options 508 RECIPES 518 RECIPES METADATA 509 519 END 510 520 511 521 # How to get the supplementary stuff: mask and weight 512 SUPPLEMENTARY 513 MASK.SOURCE STR FILE# Source type for mask: EXT | FILE514 MASK.NAME STR %a_mask.fits# Name for mask extension or filename515 WEIGHT.SOURCE STR FILE# Source type for weight: EXT | FILE516 WEIGHT.NAME STR %a_weight.fits# Name for weight extension or filename517 END 522 SUPPLEMENTARY METADATA 523 MASK.SOURCE STR FILE # Source type for mask: EXT | FILE 524 MASK.NAME STR %a_mask.fits # Name for mask extension or filename 525 WEIGHT.SOURCE STR FILE # Source type for weight: EXT | FILE 526 WEIGHT.NAME STR %a_weight.fits # Name for weight extension or filename 527 END
Note:
See TracChangeset
for help on using the changeset viewer.
