- Timestamp:
- 06/15/07 13:08:49 (17 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r8557 r8560 18 18 19 19 -*-*- END OF LINE -*-*- 20 21 2007/06/15 Daniela Dorner 22 23 * datacenter/db/index-footer.html: 24 - adapted path of validator picture 25 26 * scripts/processsequence: 27 - added sequence number (get it from sequence file) to path name 28 in case only a sequence file is given 29 - added two new command line options: the callisto and star rc can 30 be given now 31 32 20 33 21 34 2007/06/14 Daniela Dorner -
trunk/MagicSoft/Mars/scripts/processsequence
r8557 r8560 42 42 #to be set by the user (if you don't use the command-line options) 43 43 #path of your output directory 44 #outpath=/home/dorner/ToO 45 outpath= 44 outpath="" 46 45 #give either sequence number or sequence file (including path) 47 sequence= 46 sequence="" 48 47 sequfile="" 49 48 … … 60 59 echo -n " -cal " 61 60 echo " running only calibration" 62 echo -n " --cal-rc " 63 echo " giving the rc-file used for the calibration " 61 echo -n " --cal-rc " 62 echo " giving a differnt callisto rc file" 63 echo -n " --star-rc " 64 echo " giving a differnt star rc file" 64 65 echo -n " -b " 65 66 echo " running in non-interactive mode (i.e. you are not asked if the paths are ok)" … … 105 106 interactive="yes" 106 107 108 # get options from the command line 107 109 while [ "$1" ] 108 110 do … … 111 113 sequence=$1 112 114 ;; 113 --cal-rc) shift114 calrc="--config="$1115 ;;116 115 --out) shift 117 116 outpath=$1 … … 126 125 sequfile=$1 127 126 ;; 127 --star-rc) shift 128 starrc=$1 129 ;; 130 --cal-rc) shift 131 calrc=$1 132 ;; 128 133 -h) usage 129 134 ;; 130 *) echo "unknown option $1 " 131 usage 132 exit 133 ;; 135 *) echo "unknown option $1 " 136 usage 137 ;; 134 138 esac 135 139 shift … … 154 158 echo " outpath: "$outpath 155 159 160 # get sequence file and number 156 161 if [ "$sequfile" = "" ] 157 162 then … … 166 171 echo " sequence: "$sequence 167 172 echo " sequfile: "$sequfile 168 # if ! [ "$star" = "yes" ] || [ "$cal" = "yes" ]169 # then170 calpath=$outpath"/callisto/$n8"171 echo " path where calibration files are stored : "$calpath172 # fi173 if ! [ "$cal" = "yes" ] || [ "$star" = "yes" ]174 then175 starpath=$outpath"/star/$n8"176 echo " path where star files are stored : "$starpath177 fi178 173 else 179 174 echo " sequfile: "$sequfile 180 # if ! [ "$star" = "yes" ] || [ "$cal" = "yes" ] 181 # then 182 calpath=$outpath"/callisto" 183 echo " path where calibration files are stored : "$calpath 184 # fi 185 if ! [ "$cal" = "yes" ] || [ "$star" = "yes" ] 186 then 187 starpath=$outpath"/star" 188 echo " path where star files are stored : "$starpath 189 fi 190 fi 175 # get sequence number from file (for path and log names) 176 array=( `grep "Sequence: " $sequfile` ) 177 n8=`printf %08d ${array[1]}` 178 fi 179 180 # define outpaths for callisto and star 181 calpath=$outpath"/callisto/$n8" 182 echo " path where calibration files are stored : "$calpath 183 if ! [ "$cal" = "yes" ] || [ "$star" = "yes" ] 184 then 185 starpath=$outpath"/star/$n8" 186 echo " path where star files are stored : "$starpath 187 fi 188 189 # rcfiles 191 190 if ! [ "$calrc" = "" ] 192 then 193 echo "using $calrc for calibration" 194 fi 195 196 191 then 192 echo "You chose a different callisto rc file: $calrc " 193 fi 194 if ! [ "$starrc" = "" ] 195 then 196 echo "You chose a different star rc file: $starrc " 197 fi 198 199 # interactive mode 200 # user is asked if paths are correct 197 201 if [ "$interactive" = "yes" ] 198 202 then … … 214 218 fi 215 219 216 220 # calibrate sequence 217 221 if ! [ "$star" = "yes" ] || [ "$cal" = "yes" ] 218 222 then … … 221 225 program=callisto 222 226 echo "run $program..." 223 logfile=$calpath/$program$sequence.log 224 command="./$program -b -q -f -v5 --log=$logfile --out=$calpath $calrc $sequfile " 227 logfile=$calpath/$program$n8.log 228 command="./$program -b -q -f --log=$logfile --out=$calpath " 229 if ! [ "$calrc" = "" ] 230 then 231 command=$command" --config=$calrc " 232 fi 233 command=$command" $sequfile " 225 234 echo $command 226 235 $command … … 280 289 program=merppccupdate 281 290 logfile=$merpplogpath/$program$runno.log 282 command="./merpp -u - v5 --log=$logfile --runfile=$runno $ccfile $calfile "291 command="./merpp -u --log=$logfile --runfile=$runno $ccfile $calfile " 283 292 echo $command 284 293 $command … … 288 297 program=merppcacoupdate 289 298 logfile=$merpplogpath/$program$runno.log 290 command="./merpp -u - v5 --log=$logfile --auto-time $cacofile $calfile"299 command="./merpp -u --log=$logfile --auto-time $cacofile $calfile" 291 300 echo $command 292 301 $command … … 299 308 fi 300 309 310 # run star for sequence 301 311 if ! [ "$cal" = "yes" ] || [ "$star" = "yes" ] 302 312 then … … 305 315 program=star 306 316 echo "run $program..." 307 logfile=$starpath/$program$sequence.log 308 if ! ls $calpath 317 logfile=$starpath/$program$n8.log 318 command="./$program -b -q -f --log=$logfile --out=$starpath " 319 if ls $calpath >/dev/null 2>&1 309 320 then 310 echo "couldn't find $calpath => taking standard inpath for $program" 311 command="./$program -b -q -f -v5 --log=$logfile --out=$starpath $sequfile" 312 echo $command 313 $command 314 else 315 command="./$program -b -q -f -v5 --log=$logfile --ind=$calpath --out=$starpath $sequfile" 316 echo $command 317 $command 321 command=$command"--ind=$calpath " 318 322 fi 323 if ! [ "$starrc" = "" ] 324 then 325 command=$command" --config=$starrc " 326 fi 327 command=$command" $sequfile" 328 echo $command 329 $command 319 330 check=$? 320 331 checkreturncode
Note:
See TracChangeset
for help on using the changeset viewer.