diff --git a/examples/runTimeDepTest.sh b/examples/runTimeDepTest.sh index e734313..b5fa732 100755 --- a/examples/runTimeDepTest.sh +++ b/examples/runTimeDepTest.sh @@ -1,82 +1,88 @@ #!/bin/bash # Copyright 2020 University of Warwick # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # Laura++ package authors: # John Back # Paul Harrison # Thomas Latham # Fit ID, decay time acceptance model (flat, hist, spline), decay time resolution (0 or 1), per-event decay time error (0 or 1) if [ $# -lt 1 ] then echo "Usage: $0 " exit 1 fi iFit=$1 dta_model=$2 dtr=$3 dtr_perevent=$4 +fixTau=0 # Modify these if you want to run more experiments nExpt=1 firstExpt=0 logName_genQFS=gen-QFS-dtamodel_$dta_model-dtr_$dtr-dtrperevent_$dtr_perevent.log logName_genCPE=gen-CPEven-dtamodel_$dta_model-dtr_$dtr-dtrperevent_$dtr_perevent.log logName_coord=coordinator-dtamodel_$dta_model-dtr_$dtr-dtrperevent_$dtr_perevent-$iFit.log logName_taskQFS=task-QFS-dtamodel_$dta_model-dtr_$dtr-dtrperevent_$dtr_perevent-$iFit.log logName_taskCPE=task-CPEven-dtamodel_$dta_model-dtr_$dtr-dtrperevent_$dtr_perevent-$iFit.log if [ $iFit == 0 ] then + #run generation of the modes in parallel (put the tasks in the bg) echo "Generating QFS samples..." - Test_Dpipi gen --dtype QFS --dta-model $dta_model --dtr $dtr --dtr-perevent $dtr_perevent --firstExptGen $firstExpt --nExptGen $nExpt > $logName_genQFS 2>&1 + Test_Dpipi gen --dtype QFS --fixTau $fixTau --dta-model $dta_model --dtr $dtr --dtr-perevent $dtr_perevent --firstExptGen $firstExpt --nExptGen $nExpt > $logName_genQFS 2>&1 & echo "Generating CPEven samples..." - Test_Dpipi gen --dtype CPEven --dta-model $dta_model --dtr $dtr --dtr-perevent $dtr_perevent --firstExptGen $firstExpt --nExptGen $nExpt > $logName_genCPE 2>&1 + Test_Dpipi gen --dtype CPEven --fixTau $fixTau --dta-model $dta_model --dtr $dtr --dtr-perevent $dtr_perevent --firstExptGen $firstExpt --nExptGen $nExpt > $logName_genCPE 2>&1 & + + wait #wait for the generation to complete fi echo "Running fit $iFit" SimFitCoordinator $iFit $nExpt $firstExpt 2 > $logName_coord 2>&1 & echo "Initialised coordinator process for fit $iFit" sleep 10 port=`tail -1 $logName_coord | awk '{print $NF}'` echo "Coordinator is listening on port $port" echo "Initialising tasks..." -Test_Dpipi simfit --dtype CPEven --port $port --iFit $iFit --dta-model $dta_model --dtr $dtr --dtr-perevent $dtr_perevent --firstExpt $firstExpt --nExpt $nExpt --firstExptGen $firstExpt --nExptGen $nExpt > $logName_taskCPE 2>&1 & +Test_Dpipi simfit --dtype CPEven --port $port --iFit $iFit --fixTau $fixTau --dta-model $dta_model --dtr $dtr --dtr-perevent $dtr_perevent --firstExpt $firstExpt --nExpt $nExpt --firstExptGen $firstExpt --nExptGen $nExpt > $logName_taskCPE 2>&1 & sleep 5 -Test_Dpipi simfit --dtype QFS --port $port --iFit $iFit --dta-model $dta_model --dtr $dtr --dtr-perevent $dtr_perevent --firstExpt $firstExpt --nExpt $nExpt --firstExptGen $firstExpt --nExptGen $nExpt > $logName_taskQFS 2>&1 +Test_Dpipi simfit --dtype QFS --port $port --iFit $iFit --fixTau $fixTau --dta-model $dta_model --dtr $dtr --dtr-perevent $dtr_perevent --firstExpt $firstExpt --nExpt $nExpt --firstExptGen $firstExpt --nExptGen $nExpt > $logName_taskQFS 2>&1 & + +wait #wait for the fits and coordinator to terminate echo "Fit completed" echo "Warnings/Errors from coordinator:" grep -e ERROR -e WARNING -e Error -e Warning $logName_coord echo "Warnings/Errors from CPeven task:" grep -e ERROR -e WARNING -e Error -e Warning $logName_taskCPE echo "Warnings/Errors from QFS task:" grep -e ERROR -e WARNING -e Error -e Warning $logName_taskQFS echo "Tests against reference gen/fit output to be implemented here"