Commit 8da6e60d authored by PENGUEN Julien's avatar PENGUEN Julien
Browse files

ajout "--angular" comme options

parent 32d10e11
...@@ -16,7 +16,7 @@ SCRIPT_VERSION=0.1 ...@@ -16,7 +16,7 @@ SCRIPT_VERSION=0.1
ALADIN_VERSION=? ALADIN_VERSION=?
ALADIN_URL='https://aladin.u-strasbg.fr/java' ALADIN_URL='https://aladin.u-strasbg.fr/java'
OBSERVATION_DIMENSION="10'" ANGULAR=10
################ ################
# IMAGE MAGICK # # IMAGE MAGICK #
......
...@@ -46,6 +46,7 @@ function_build_tab_hach() ...@@ -46,6 +46,7 @@ function_build_tab_hach()
ARRAY["--version"]="None"; ARRAY["--version"]="None";
ARRAY["--survey"]="PATH FILE SURVEYS"; ARRAY["--survey"]="PATH FILE SURVEYS";
ARRAY["--area"]="PATH FILE AREAS"; ARRAY["--area"]="PATH FILE AREAS";
ARRAY["--angular"]="NUMBER";
# ---------------------- # # ---------------------- #
# ARRAY_WEIGHT[key]=value # ARRAY_WEIGHT[key]=value
...@@ -76,6 +77,7 @@ function_build_tab_hach() ...@@ -76,6 +77,7 @@ function_build_tab_hach()
ARGS_WEIGHT["--version"]=1; ARGS_WEIGHT["--version"]=1;
ARGS_WEIGHT["--survey"]=2; ARGS_WEIGHT["--survey"]=2;
ARGS_WEIGHT["--area"]=2; ARGS_WEIGHT["--area"]=2;
ARGS_WEIGHT["--angular"]=2;
# -------- # # -------- #
...@@ -382,7 +384,7 @@ do ...@@ -382,7 +384,7 @@ do
echo -e "#" >> ${outputfile} echo -e "#" >> ${outputfile}
echo -e "rm @1" >> ${outputfile} echo -e "rm @1" >> ${outputfile}
echo -e "get HiPS("$survey")" ${ra_area} ${dec_area} ${OBSERVATION_DIMENSION} >> ${outputfile} echo -e "get HiPS("$survey")" ${ra_area} ${dec_area} ${ANGULAR}"'" >> ${outputfile}
echo -e "cm BB localcut" >> ${outputfile} echo -e "cm BB localcut" >> ${outputfile}
...@@ -458,6 +460,8 @@ if [ $val_error == "TRUE" ]; then ...@@ -458,6 +460,8 @@ if [ $val_error == "TRUE" ]; then
echo "the default file define on .env file. the survey file must be on format '.dat'" echo "the default file define on .env file. the survey file must be on format '.dat'"
echo "--area file run photos_montage_aladin with this survey file instead of " echo "--area file run photos_montage_aladin with this survey file instead of "
echo "the default file define on .env file. the area file must be on format '.csv'" echo "the default file define on .env file. the area file must be on format '.csv'"
echo "--angular run photos_montage_aladin with this angular dimension value instead of "
echo "the default angular value define on .env file. the angular value must be on second of arc"
echo "" echo ""
echo "------------------------------------" echo "------------------------------------"
echo "" echo ""
...@@ -527,6 +531,7 @@ case $taille in ...@@ -527,6 +531,7 @@ case $taille in
elif [ "${tempo_arg_weight[0]}" -eq 2 ]; then elif [ "${tempo_arg_weight[0]}" -eq 2 ]; then
#case '--survey', '--area' ,'--angular'
tab2_arg_keys[0]="--no_select" tab2_arg_keys[0]="--no_select"
tab2_arg_values[0]="$ALADIN_VERSION" tab2_arg_values[0]="$ALADIN_VERSION"
...@@ -600,7 +605,7 @@ case $taille in ...@@ -600,7 +605,7 @@ case $taille in
fi fi
if [ "$tempo_weight_2" == 'TRUE' ]; then if [ "$tempo_weight_2" == 'TRUE' ]; then
#case '--survey', '--area' #case '--survey', '--area' ,'--angular'
tab2_arg_keys[0]="--no_select" tab2_arg_keys[0]="--no_select"
tab2_arg_values[0]="$ALADIN_VERSION" tab2_arg_values[0]="$ALADIN_VERSION"
...@@ -650,6 +655,16 @@ fi ...@@ -650,6 +655,16 @@ fi
echo "=> use ${INPUT_FILE_SURVEYS}" echo "=> use ${INPUT_FILE_SURVEYS}"
echo "=> use ${INPUT_FILE_AREAS}" echo "=> use ${INPUT_FILE_AREAS}"
#-------------------------------------#
#check angular input arg
if [[ "${sort_arg_keys[@]}" =~ "--angular" ]]; then
RESULT_INDICE_ANGULAR=`function_return_indice_arg "${sort_arg_keys[*]}" "--angular"`
ANGULAR=${sort_arg_values[$RESULT_INDICE_ANGULAR]}
fi
echo "=> use ${ANGULAR}"
#---------------------# #---------------------#
# --no_select management # --no_select management
...@@ -1020,7 +1035,7 @@ case ${sort_arg_keys[0]} in ...@@ -1020,7 +1035,7 @@ case ${sort_arg_keys[0]} in
echo "" >> ${infos_file[$k]} echo "" >> ${infos_file[$k]}
echo "AJS file: ${area_ajs[$k]}" >> ${infos_file[$k]} echo "AJS file: ${area_ajs[$k]}" >> ${infos_file[$k]}
echo "" >> ${infos_file[$k]} echo "" >> ${infos_file[$k]}
echo "Observation dimension: ${OBSERVATION_DIMENSION}" >> ${infos_file[$k]} echo "Angular dimension value in second of Arc: ${ANGULAR}" >> ${infos_file[$k]}
echo "" >> ${infos_file[$k]} echo "" >> ${infos_file[$k]}
echo "--------------------------" >> ${infos_file[$k]} echo "--------------------------" >> ${infos_file[$k]}
echo "--- Image magick infos ---" >> ${infos_file[$k]} echo "--- Image magick infos ---" >> ${infos_file[$k]}
...@@ -1355,6 +1370,8 @@ case ${sort_arg_keys[0]} in ...@@ -1355,6 +1370,8 @@ case ${sort_arg_keys[0]} in
echo "--area file run photos_montage_aladin with this survey file instead of " echo "--area file run photos_montage_aladin with this survey file instead of "
echo "the default file define on .env file. the area file must be on format '.csv'" echo "the default file define on .env file. the area file must be on format '.csv'"
echo "" echo ""
echo "--angular run photos_montage_aladin with this angular dimension value instead of "
echo "the default angular value define on .env file. the angular value must be on second of arc"
echo "=====================" echo "====================="
echo "" echo ""
...@@ -1394,6 +1411,8 @@ case ${sort_arg_keys[0]} in ...@@ -1394,6 +1411,8 @@ case ${sort_arg_keys[0]} in
echo "--area file run photos_montage_aladin with this survey file instead of " echo "--area file run photos_montage_aladin with this survey file instead of "
echo "the default file define on .env file. the area file must be on format '.csv'" echo "the default file define on .env file. the area file must be on format '.csv'"
echo "" echo ""
echo "--angular run photos_montage_aladin with this angular dimension value instead of "
echo "the default angular value define on .env file. the angular value must be on second of arc"
echo "=====================" echo "====================="
echo "" echo ""
;; ;;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment