diff --git a/plotfits.c b/plotfits.c index 008b91d..350b369 100644 --- a/plotfits.c +++ b/plotfits.c @@ -1297,7 +1297,7 @@ int main(int argc,char *argv[]) // Help if (c=='h') { - printf("Calibrates astrometry. Initially requires manual matching of at least three stars. Use 'a' to select star on the image, then 'b' to select star from the catalog, then 'f' to fit"); + printf("Calibrates astrometry.\nRequires matching of at least three stars. Use 'i' repeatedly for automatic selection of matching sets or 'a' to manually select a star from the image and 'b' to select the corresponding star from the catalog (tree sets needed). Then use 'f' to check fit, 'R' to start again.\nFinish with 'm' to match stars and 'q' writes calibration output\n"); printf("q Quit\n"); printf("a Select star on image\n"); printf("b Select star from catalog\n"); diff --git a/scripts/st_compress.sh b/scripts/st_compress.sh index 9ca1dc9..90ac47b 100755 --- a/scripts/st_compress.sh +++ b/scripts/st_compress.sh @@ -47,8 +47,8 @@ while true; do export CAMERADEV=`cat $ST_OBSDIR/control/camera.txt | awk '{print $((7))}'` fi - # Process only if not stopped - if [ $STATE != "stop" ]; then + # Process only if not restarting + if [ $STATE != "restart" ]; then echo "Compressing captured frames" # Start point @@ -61,7 +61,10 @@ while true; do # Run viewer viewer `ls -1 2*.fits | tail -n1` cp avg.pgm $ST_OBSDIR - else + fi + + # kill capture process just when scheduler sends stop signal + if [ $STATE == "stop" ]; then if [ $(($CAPTUREPID)) != 0 ]; then kill -9 $CAPTUREPID CAPTUREPID=0 @@ -75,8 +78,8 @@ while true; do echo "Finished" else - # There are not enough images available - # Launch capture process + # There are not enough captured frames + # Launch capture process if state is not stop # if time passes with still no images re-launch capture process if [ $STATE != "stop" ]; then echo "Waiting for images. Status: "$STATE diff --git a/scripts/st_reduce.sh b/scripts/st_reduce.sh new file mode 100755 index 0000000..e029003 --- /dev/null +++ b/scripts/st_reduce.sh @@ -0,0 +1 @@ +for file in png/2*.fits; do reduce $file;done