Index: branches/eam_branches/ipp-20130307/ippconfig/dvo.photcodes =================================================================== --- branches/eam_branches/ipp-20130307/ippconfig/dvo.photcodes (revision 35350) +++ branches/eam_branches/ipp-20130307/ippconfig/dvo.photcodes (revision 35413) @@ -165,4 +165,5 @@ 3004 SYNTH.z ref 0.000 0.000 0.000 - - 0.0000 0 4 nan 0.000 2.000 0.600 0x0000 0x0000 0x0000 0x0000 3005 SYNTH.y ref 0.000 0.000 0.000 - - 0.0000 0 5 nan 0.000 2.000 0.600 0x0000 0x0000 0x0000 0x0000 + 3006 SYNTH.w ref 0.000 0.000 0.000 - - 0.0000 0 9 nan 0.000 2.000 0.600 0x0000 0x0000 0x0000 0x0000 100 MEGACAM.u.00 dep 25.280 -0.350 0.000 - - 0.0000 0 - 0.000 0.000 1.000 0.000 0x0000 0x3888 0x0000 0x0000 @@ -836,64 +837,64 @@ 10475 GPC1.y.XY75 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 10476 GPC1.y.XY76 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10501 GPC1.w.XY01 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10502 GPC1.w.XY02 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10503 GPC1.w.XY03 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10504 GPC1.w.XY04 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10505 GPC1.w.XY05 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10506 GPC1.w.XY06 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10510 GPC1.w.XY10 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10511 GPC1.w.XY11 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10512 GPC1.w.XY12 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10513 GPC1.w.XY13 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10514 GPC1.w.XY14 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10515 GPC1.w.XY15 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10516 GPC1.w.XY16 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10517 GPC1.w.XY17 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10520 GPC1.w.XY20 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10521 GPC1.w.XY21 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10522 GPC1.w.XY22 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10523 GPC1.w.XY23 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10524 GPC1.w.XY24 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10525 GPC1.w.XY25 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10526 GPC1.w.XY26 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10527 GPC1.w.XY27 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10530 GPC1.w.XY30 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10531 GPC1.w.XY31 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10532 GPC1.w.XY32 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10533 GPC1.w.XY33 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10534 GPC1.w.XY34 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10535 GPC1.w.XY35 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10536 GPC1.w.XY36 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10537 GPC1.w.XY37 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10540 GPC1.w.XY40 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10541 GPC1.w.XY41 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10542 GPC1.w.XY42 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10543 GPC1.w.XY43 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10544 GPC1.w.XY44 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10545 GPC1.w.XY45 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10546 GPC1.w.XY46 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10547 GPC1.w.XY47 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10550 GPC1.w.XY50 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10551 GPC1.w.XY51 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10552 GPC1.w.XY52 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10553 GPC1.w.XY53 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10554 GPC1.w.XY54 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10555 GPC1.w.XY55 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10556 GPC1.w.XY56 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10557 GPC1.w.XY57 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10560 GPC1.w.XY60 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10561 GPC1.w.XY61 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10562 GPC1.w.XY62 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10563 GPC1.w.XY63 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10564 GPC1.w.XY64 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10565 GPC1.w.XY65 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10566 GPC1.w.XY66 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10567 GPC1.w.XY67 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10571 GPC1.w.XY71 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10572 GPC1.w.XY72 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10573 GPC1.w.XY73 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10574 GPC1.w.XY74 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10575 GPC1.w.XY75 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 - 10576 GPC1.w.XY76 dep 25.000 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10501 GPC1.w.XY01 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10502 GPC1.w.XY02 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10503 GPC1.w.XY03 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10504 GPC1.w.XY04 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10505 GPC1.w.XY05 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10506 GPC1.w.XY06 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10510 GPC1.w.XY10 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10511 GPC1.w.XY11 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10512 GPC1.w.XY12 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10513 GPC1.w.XY13 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10514 GPC1.w.XY14 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10515 GPC1.w.XY15 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10516 GPC1.w.XY16 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10517 GPC1.w.XY17 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10520 GPC1.w.XY20 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10521 GPC1.w.XY21 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10522 GPC1.w.XY22 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10523 GPC1.w.XY23 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10524 GPC1.w.XY24 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10525 GPC1.w.XY25 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10526 GPC1.w.XY26 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10527 GPC1.w.XY27 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10530 GPC1.w.XY30 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10531 GPC1.w.XY31 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10532 GPC1.w.XY32 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10533 GPC1.w.XY33 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10534 GPC1.w.XY34 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10535 GPC1.w.XY35 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10536 GPC1.w.XY36 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10537 GPC1.w.XY37 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10540 GPC1.w.XY40 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10541 GPC1.w.XY41 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10542 GPC1.w.XY42 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10543 GPC1.w.XY43 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10544 GPC1.w.XY44 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10545 GPC1.w.XY45 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10546 GPC1.w.XY46 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10547 GPC1.w.XY47 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10550 GPC1.w.XY50 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10551 GPC1.w.XY51 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10552 GPC1.w.XY52 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10553 GPC1.w.XY53 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10554 GPC1.w.XY54 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10555 GPC1.w.XY55 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10556 GPC1.w.XY56 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10557 GPC1.w.XY57 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10560 GPC1.w.XY60 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10561 GPC1.w.XY61 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10562 GPC1.w.XY62 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10563 GPC1.w.XY63 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10564 GPC1.w.XY64 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10565 GPC1.w.XY65 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10566 GPC1.w.XY66 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10567 GPC1.w.XY67 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10571 GPC1.w.XY71 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10572 GPC1.w.XY72 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10573 GPC1.w.XY73 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10574 GPC1.w.XY74 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10575 GPC1.w.XY75 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 10576 GPC1.w.XY76 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 11000 GPC1.g.SkyChip dep 25.000 0.000 0.000 - - 0.0000 0 1 0.000 0.000 0.000 0.000 0x0000 0x0000 0x0000 0x0000 11100 GPC1.r.SkyChip dep 25.000 0.000 0.000 - - 0.0000 0 2 0.000 0.000 0.000 0.000 0x0000 0x0000 0x0000 0x0000 Index: branches/eam_branches/ipp-20130307/ippconfig/gpc1/ppStack.config =================================================================== --- branches/eam_branches/ipp-20130307/ippconfig/gpc1/ppStack.config (revision 35350) +++ branches/eam_branches/ipp-20130307/ippconfig/gpc1/ppStack.config (revision 35413) @@ -1,3 +1,4 @@ PSF.MODEL STR PS_MODEL_PS1_V1 # Model for PSF generation +BACKGROUND.MODEL BOOL F ZP.AIRMASS METADATA # Airmass terms by filter @@ -24,4 +25,6 @@ PSF.INPUT.MAX F32 6.0 # never really want >6 pixels in refstack PSF.INPUT.CLIP.NSIGMA F32 1.0 # sample typically on rising side of distribution (set even smaller?) + PSF.INPUT.THRESH F32 0.0 + PSF.INPUT.ASYMMETRY F32 0.0 END @@ -30,6 +33,8 @@ OUTPUT.LOGFLUX BOOL FALSE OUTPUT.REPLICATE BOOL TRUE - PSF.INPUT.MAX F32 7.5 + PSF.INPUT.MAX F32 10.0 PSF.INPUT.CLIP.NSIGMA F32 1.5 + PSF.INPUT.THRESH F32 5.0 + PSF.INPUT.ASYMMETRY F32 0.2 END @@ -40,6 +45,8 @@ OUTPUT.NOCOMP BOOL TRUE OUTPUT.LOGFLUX BOOL FALSE - PSF.INPUT.MAX F32 7.5 # since not convolved limit, relax/tune? + PSF.INPUT.MAX F32 10.0 # since not convolved limit, relax/tune? PSF.INPUT.CLIP.NSIGMA F32 1.5 + PSF.INPUT.THRESH F32 5.0 + PSF.INPUT.ASYMMETRY F32 0.2 END @@ -52,6 +59,8 @@ OUTPUT.NOCOMP BOOL FALSE OUTPUT.LOGFLUX BOOL TRUE - PSF.INPUT.MAX F32 7.5 # input cut more restrictive now 12->7.5 pix, limit target PSF in convolved stacks + PSF.INPUT.MAX F32 10.0 # input cut more restrictive now 12->10 pix, limit target PSF in convolved stacks PSF.INPUT.CLIP.NSIGMA F32 1.5 # additional cut if majority of inputs much smaller than INPUT.MAX + PSF.INPUT.THRESH F32 5.0 + PSF.INPUT.ASYMMETRY F32 0.2 END Index: branches/eam_branches/ipp-20130307/ippconfig/isp/dvo.config =================================================================== --- branches/eam_branches/ipp-20130307/ippconfig/isp/dvo.config (revision 35350) +++ branches/eam_branches/ipp-20130307/ippconfig/isp/dvo.config (revision 35413) @@ -1,5 +1,6 @@ # location of DVO database tables -CATDIR /data/alala/eugene/isp/catdir +#CATDIR /data/alala/eugene/isp/catdir +MOSAICNAME ISP-APOGEE # keywords used by DVO to interpret the headers Index: branches/eam_branches/ipp-20130307/ippconfig/isp/ppImage.config =================================================================== --- branches/eam_branches/ipp-20130307/ippconfig/isp/ppImage.config (revision 35350) +++ branches/eam_branches/ipp-20130307/ippconfig/isp/ppImage.config (revision 35413) @@ -623,2 +623,36 @@ END END + +PPIMAGE_BKGCONT METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + MASK.BUILD BOOL FALSE # Build internal mask? + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BASE.FITS BOOL FALSE # Save base image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? + BIN1.FITS BOOL FALSE # Save 1st binned chip image? + BIN2.FITS BOOL FALSE # Save 2nd binned chip image? + BIN1.JPEG BOOL FALSE # Save 1st binned jpeg? + BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? + BIN1.XBIN S32 1 # Image is already binned + BIN1.YBIN S32 1 # Image is already binned + BIN2.XBIN S32 1 # Image is already binned + BIN2.YBIN S32 1 # Image is already binned + MASK.SATURATED BOOL FALSE # DO NOT Mask the saturated pixels + MASK.LOW BOOL FALSE # DO NOT Mask the saturated pixels + BACKGROUND.CONTINUITY BOOL FALSE + PATTERN.CONTINUITY.WIDTH S32 2 +END + Index: branches/eam_branches/ipp-20130307/ippconfig/recipes/filerules-mef.mdc =================================================================== --- branches/eam_branches/ipp-20130307/ippconfig/recipes/filerules-mef.mdc (revision 35350) +++ branches/eam_branches/ipp-20130307/ippconfig/recipes/filerules-mef.mdc (revision 35413) @@ -118,7 +118,7 @@ PSWARP.VARIANCE INPUT @FILES CHIP VARIANCE PSWARP.MASK INPUT @FILES CHIP MASK -PSWARP.SKYCELL INPUT @FILES CHIP IMAGE -PSWARP.ASTROM INPUT @FILES CHIP CMF -PSWARP.BKGMODEL INPUT @FILES CHIP IMAGE +PSWARP.SKYCELL INPUT @FILES CHIP WCS +PSWARP.ASTROM INPUT @FILES CHIP WCS +PSWARP.BKGMODEL INPUT @FILES CHIP IMAGE ## files used by ppsub Index: branches/eam_branches/ipp-20130307/ippconfig/recipes/filerules-simple.mdc =================================================================== --- branches/eam_branches/ipp-20130307/ippconfig/recipes/filerules-simple.mdc (revision 35350) +++ branches/eam_branches/ipp-20130307/ippconfig/recipes/filerules-simple.mdc (revision 35413) @@ -88,6 +88,6 @@ PSWARP.VARIANCE INPUT @FILES FPA VARIANCE PSWARP.MASK INPUT @FILES FPA MASK -PSWARP.SKYCELL INPUT @FILES FPA IMAGE -PSWARP.ASTROM INPUT @FILES FPA CMF +PSWARP.SKYCELL INPUT @FILES FPA WCS +PSWARP.ASTROM INPUT @FILES FPA WCS PSWARP.BKGMODEL INPUT @FILES CHIP IMAGE Index: branches/eam_branches/ipp-20130307/ippconfig/recipes/filerules-split.mdc =================================================================== --- branches/eam_branches/ipp-20130307/ippconfig/recipes/filerules-split.mdc (revision 35350) +++ branches/eam_branches/ipp-20130307/ippconfig/recipes/filerules-split.mdc (revision 35413) @@ -106,6 +106,8 @@ PSWARP.VARIANCE INPUT @FILES CHIP VARIANCE PSWARP.MASK INPUT @FILES CHIP MASK -PSWARP.SKYCELL INPUT @FILES FPA IMAGE -PSWARP.ASTROM INPUT @FILES CHIP CMF +PSWARP.SKYCELL INPUT @FILES CHIP WCS +PSWARP.ASTROM INPUT @FILES CHIP WCS +#PSWARP.SKYCELL INPUT @FILES CHIP CMF +#PSWARP.ASTROM INPUT @FILES CHIP CMF PSWARP.BKGMODEL INPUT @FILES CHIP IMAGE Index: branches/eam_branches/ipp-20130307/ippconfig/recipes/ppStack.config =================================================================== --- branches/eam_branches/ipp-20130307/ippconfig/recipes/ppStack.config (revision 35350) +++ branches/eam_branches/ipp-20130307/ippconfig/recipes/ppStack.config (revision 35413) @@ -92,4 +92,6 @@ PSF.INPUT.MAX F32 NAN PSF.INPUT.CLIP.NSIGMA F32 NAN +PSF.INPUT.THRESH F32 NAN +PSF.INPUT.ASYMMETRY F32 NAN TEMP.IMAGE STR conv.im.fits # Suffix for temporary convolved images