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
32d10e11
Commit
32d10e11
authored
Mar 07, 2019
by
PENGUEN Julien
Browse files
ajout informations dans fichier de sortie + ajout .env OBSERVATION_DIMENSION et RESOLUTION
parent
8f71d118
Changes
2
Hide whitespace changes
Inline
Side-by-side
.env
View file @
32d10e11
...
...
@@ -16,9 +16,14 @@ SCRIPT_VERSION=0.1
ALADIN_VERSION=?
ALADIN_URL='https://aladin.u-strasbg.fr/java'
OBSERVATION_DIMENSION="10'"
################
# IMAGE MAGICK #
################
NB_TILE_BY_LINE=5
NB_TILE_BY_COL=4
RESOLUTION_BY_LINE=500
RESOLUTION_BY_COL=500
photos_montage_aladin.sh
View file @
32d10e11
...
...
@@ -382,7 +382,7 @@ do
echo
-e
"#"
>>
${
outputfile
}
echo
-e
"rm @1"
>>
${
outputfile
}
echo
-e
"get HiPS("
$survey
")"
${
ra_area
}
${
dec_area
}
"10'"
>>
${
outputfile
}
echo
-e
"get HiPS("
$survey
")"
${
ra_area
}
${
dec_area
}
${
OBSERVATION_DIMENSION
}
>>
${
outputfile
}
echo
-e
"cm BB localcut"
>>
${
outputfile
}
...
...
@@ -991,7 +991,7 @@ case ${sort_arg_keys[0]} in
echo
"=> Construction in progress ..."
script_images[
$k
]=
"macro "
${
area_ajs
[
$k
]
}
script_montages[
$k
]=
"montage -geometry
500x500
-tile
${
NB_TILE_BY_LINE
}
x
${
NB_TILE_BY_COL
}
${
images_folder
[
$k
]
}
/*jpg
${
montages_folder
[
$k
]
}
/
${
list_zone
[
$k
]
}
.png"
script_montages[
$k
]=
"montage -geometry
${
RESOLUTION_BY_LINE
}
x
${
RESOLUTION_BY_COL
}
-tile
${
NB_TILE_BY_LINE
}
x
${
NB_TILE_BY_COL
}
${
images_folder
[
$k
]
}
/*jpg
${
montages_folder
[
$k
]
}
/
${
list_zone
[
$k
]
}
.png"
sudo
docker run
--name
photos_montage_aladin
--rm
-v
/tmp/.X11-unix:/tmp/.X11-unix
-v
$HOME
:
$HOME
--network
host
-e
DISPLAY
=
$DISPLAY
-e
USER
=
$USER
-e
HOME
=
$HOME
image_photos_montage_aladin-
${
version
}
/bin/bash
-c
"java -jar /var/aladin/Aladin-
${
version
}
.jar -nogui -trace -script=
${
script_images
[
$k
]
}
;
${
script_montages
[
$k
]
}
"
>
${
log_aladin_file
[
$k
]
}
2>&1
...
...
@@ -1018,12 +1018,18 @@ case ${sort_arg_keys[0]} in
echo
""
>>
${
infos_file
[
$k
]
}
echo
"Aladin version:
$ALADIN_VERSION
"
>>
${
infos_file
[
$k
]
}
echo
""
>>
${
infos_file
[
$k
]
}
echo
"AJS file:
${
area_ajs
[
$k
]
}
"
>>
${
infos_file
[
$k
]
}
echo
""
>>
${
infos_file
[
$k
]
}
echo
"Observation dimension:
${
OBSERVATION_DIMENSION
}
"
>>
${
infos_file
[
$k
]
}
echo
""
>>
${
infos_file
[
$k
]
}
echo
"--------------------------"
>>
${
infos_file
[
$k
]
}
echo
"--- Image magick infos ---"
>>
${
infos_file
[
$k
]
}
echo
"--------------------------"
>>
${
infos_file
[
$k
]
}
echo
""
>>
${
infos_file
[
$k
]
}
echo
"Tile dimension:
$NB_TILE_BY_LINE
x
$NB_TILE_BY_COL
"
>>
${
infos_file
[
$k
]
}
echo
""
>>
${
infos_file
[
$k
]
}
echo
"Resolution:
${
RESOLUTION_BY_LINE
}
x
${
RESOLUTION_BY_COL
}
"
>>
${
infos_file
[
$k
]
}
echo
""
>>
${
infos_file
[
$k
]
}
echo
"-----------------------------------"
>>
${
infos_file
[
$k
]
}
echo
"--- photos_montage_aladin infos ---"
>>
${
infos_file
[
$k
]
}
echo
"-----------------------------------"
>>
${
infos_file
[
$k
]
}
...
...
@@ -1032,13 +1038,19 @@ case ${sort_arg_keys[0]} in
echo
""
>>
${
infos_file
[
$k
]
}
echo
"Input surveys file:
$INPUT_FILE_SURVEYS
"
>>
${
infos_file
[
$k
]
}
echo
""
>>
${
infos_file
[
$k
]
}
echo
"number of surveys:
$nb_lines_survey
"
>>
${
infos_file
[
$k
]
}
echo
""
>>
${
infos_file
[
$k
]
}
echo
"Input areas file:
$INPUT_FILE_AREAS
"
>>
${
infos_file
[
$k
]
}
echo
""
>>
${
infos_file
[
$k
]
}
echo
"Number of areas:
${#
list_zone
[@]
}
"
>>
${
infos_file
[
$k
]
}
echo
""
>>
${
infos_file
[
$k
]
}
echo
"Images folder:
${
images_folder
[
$k
]
}
"
>>
${
infos_file
[
$k
]
}
echo
""
>>
${
infos_file
[
$k
]
}
echo
"Number of images:
$(
find
${
images_folder
[
$k
]
}
-type
f |
wc
-l
)
"
>>
${
infos_file
[
$k
]
}
echo
""
>>
${
infos_file
[
$k
]
}
echo
"Montages folder:
${
montages_folder
[
$k
]
}
"
>>
${
infos_file
[
$k
]
}
echo
""
>>
${
infos_file
[
$k
]
}
echo
"
AJS file:
${
area_ajs
[
$k
]
}
"
>>
${
infos_file
[
$k
]
}
echo
"
Number of montages:
$(
find
${
montages_folder
[
$k
]
}
-type
f |
wc
-l
)
"
>>
${
infos_file
[
$k
]
}
echo
""
>>
${
infos_file
[
$k
]
}
echo
"log aladin file:
${
log_aladin_file
[
$k
]
}
"
>>
${
infos_file
[
$k
]
}
echo
""
>>
${
infos_file
[
$k
]
}
...
...
Write
Preview
Markdown
is supported
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