Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CeSam_TOOLS
photos_montage_aladin
Commits
8da6e60d
Commit
8da6e60d
authored
Mar 07, 2019
by
PENGUEN Julien
Browse files
ajout "--angular" comme options
parent
32d10e11
Changes
2
Hide whitespace changes
Inline
Side-by-side
.env
View file @
8da6e60d
...
@@ -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 #
...
...
photos_montage_aladin.sh
View file @
8da6e60d
...
@@ -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
}
...
@@ -456,8 +458,10 @@ if [ $val_error == "TRUE" ]; then
...
@@ -456,8 +458,10 @@ if [ $val_error == "TRUE" ]; then
echo
""
echo
""
echo
"--survey file run photos_montage_aladin with this survey file instead of "
echo
"--survey file run photos_montage_aladin with this survey file instead of "
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
]
}
...
@@ -1352,9 +1367,11 @@ case ${sort_arg_keys[0]} in
...
@@ -1352,9 +1367,11 @@ case ${sort_arg_keys[0]} in
echo
""
echo
""
echo
"--survey file run photos_montage_aladin with this survey file instead of "
echo
"--survey file run photos_montage_aladin with this survey file instead of "
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
""
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
""
...
@@ -1391,9 +1408,11 @@ case ${sort_arg_keys[0]} in
...
@@ -1391,9 +1408,11 @@ case ${sort_arg_keys[0]} in
echo
""
echo
""
echo
"--survey file run photos_montage_aladin with this survey file instead of "
echo
"--survey file run photos_montage_aladin with this survey file instead of "
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
""
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
""
;;
;;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment