Skip to content

Commit 4f5d673

Browse files
committed
added flag no_merging to process without merging to picasso_g24.sh
1 parent f224dd4 commit 4f5d673

1 file changed

Lines changed: 24 additions & 0 deletions

File tree

lib/interface/picasso_go24.sh

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ display_help() {
1414
# echo " -o, --output specify folder where to put merged nc-file, e.g.: ~/todo_filelist"
1515
echo " -b, --base_folder specify folder where level0 files are located; default is set to polly-folder, can be switched to e.g. martha-folder"
1616
echo " --force_merging specify whether files will be merged independently if attributes have changed or not; default: false"
17+
echo " --no_merging activate this flag to directly run picasso without merging to 24h-file"
1718
echo " --todolist write merged level0-file into todo-list (set to true or false); default: true"
1819
echo " --matlab specify location of matlab-executable; default is just set to: matlab"
1920
echo " --proc execute picasso-processing-chain (set to true or false); default: true"
@@ -40,6 +41,8 @@ flagProc="true"
4041
flagFProc="false"
4142
flagDeleteMergedFiles="true"
4243
flagPlotonly="false"
44+
flag_no_merging="false
45+
"
4346
filename=""
4447
filesize=""
4548

@@ -119,6 +122,12 @@ while :; do
119122
flagPlotonly="true"
120123
shift 1
121124
;;
125+
126+
--no_merging)
127+
flag_no_merging="true"
128+
shift 1
129+
;;
130+
122131

123132
-h | --help)
124133
display_help # Call your function
@@ -187,6 +196,11 @@ main() {
187196
echo $DEVICE
188197
for DATE in ${DATE_LS[@]}; do
189198
echo $DATE
199+
if [[ "$flag_no_merging" == "true" ]];then
200+
echo "processing without merging"
201+
process_without_merging $DEVICE $DATE
202+
exit 1
203+
fi
190204
merging $DEVICE $DATE ## merging of level0 files
191205
if [[ "$flagWriteIntoTodoList" == "true" ]];then
192206
check_todo_list_consistency
@@ -300,6 +314,16 @@ merging() {
300314
fi
301315
}
302316

317+
process_without_merging() {
318+
DEVICE=$1
319+
DATE=$2
320+
process_history $DEVICE $DATE
321+
delete_laserlogbookfile $DEVICE $DATE ## delete laserlogbook-file
322+
delete_entry_from_todo_list $DEVICE $DATE ## delete entry from todo_list file
323+
324+
325+
}
326+
303327
write_job_into_todo_list() {
304328
## writing job to todo_list
305329
DEVICE=$1

0 commit comments

Comments
 (0)