Ignore:
Timestamp:
08/15/08 17:28:25 (16 years ago)
Author:
Daniela Dorner
Message:
*** empty log message ***
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/datacenter/scripts/dowebplots

    r9123 r9126  
    9696                      general=( ${generals[@]} )
    9797                   else
    98                       general=( $general $1 )
     98                      general=( ${general[@]} $1 )
    9999                   fi
    100100                   ;;
    … …  
    104104                      individual=( ${individuals[@]} )
    105105                   else
    106                       individual=( $individual $1 )
     106                      individual=( ${individual[@]} $1 )
    107107                   fi
    108108                   ;;
    … …  
    118118done
    119119
    120 if [ ${#general[@]} -eq 0 ] || [ ${#individual[@]} -eq 0 ]
     120if [ ${#general[@]} -eq 0 ] && [ ${#individual[@]} -eq 0 ]
    121121then
    122122   all=( ${names[@]} )
    … …  
    128128
    129129
    130 
    131130# rsync subsystemdata, sequence and dataset files
    132131echo "do rsync for subsystem files" >> $scriptlog 2>&1
    133 #rsync -avn --delete $subsystempath/ $webpath/subsystemdata >> $scriptlog 2>&1
     132rsync -av --delete $subsystempath/ $webpath/subsystemdata >> $scriptlog 2>&1
    134133
    135134echo "do rsync for sequence files" >> $scriptlog 2>&1
    136 #rsync -avn --delete $sequencepath/ $webpath/sequences >> $scriptlog 2>&1
     135rsync -av --delete $sequencepath/ $webpath/sequences >> $scriptlog 2>&1
    137136
    138137echo "do rsync for dataset files" >> $scriptlog 2>&1
    139 #rsync -avn --delete $datasetpath/ $webpath/datasets >> $scriptlog 2>&1
     138rsync -av --delete $datasetpath/ $webpath/datasets >> $scriptlog 2>&1
    140139
    141140
    … …  
    218217      rootfile=$inpath/$filename`printf %08d $num`.root
    219218      psfile=$inpath/$filename`printf %08d $num`.ps
    220       csvfile=$inpath/$filename`printf %08d $num`.csv
     219      csvfile=$outpath/$filename`printf %08d $num`.csv
    221220      pdffile=$outpath/$filename`printf %08d $num`.pdf
    222221      # rsync
    … …  
    230229         # overwrite needed file and path names
    231230         rootfile=$inpath/$filename.root
    232          psfile=$inpath/$filename.csv
     231         psfile=$inpath/$filename.ps
     232         csvfile=$outpath/$filename.csv
    233233         pdffile=$outpath/$filename.pdf
    234234         datasetfile=$datasetpath/`printf %08d $num | cut -c 0-${digit}`/dataset`printf %08d $num`.txt
    235235         
    236          echo "check1=root -q -b $macrospath/plotdb.C+\(\"$datasetfile\"\,\"$inpath/\"\) | tee -a $scriptlog | intgrep" >> $scriptlog 2>&1
    237          check1=`root -q -b $macrospath/plotdb.C+\("\"$datasetfile\""\,"\"$inpath/\""\) | tee -a $scriptlog | intgrep`
     236         echo "check1=root -q -b $macrospath/plotdb.C+\(\"$datasetfile\"\,\"$inpath/\"\) 2>|/dev/null | tee -a $scriptlog | intgrep" >> $scriptlog 2>&1
     237         check1=`root -q -b $macrospath/plotdb.C+\("\"$datasetfile\""\,"\"$inpath/\""\) 2>|/dev/null | tee -a $scriptlog | intgrep`
    238238         case $check1 in
    239239            1)   echo " check1=$check1 -> everything ok" >> $scriptlog 2>&1
    … …  
    260260      tmppath=/tmp/$pathname
    261261      rootfile=$outpath/$filename.root
    262       psfile=$outpath/$filename.csv
     262      psfile=$outpath/$filename.ps
     263      csvfile=$outpath/$filename.csv
    263264      pdffile=$outpath/$filename.pdf
    264265      txtfile=$outpath/$filename.txt
    265266     
    266       echo "check2=root -q -b $macrospath/$macro.C+\(\"$outpath/\"\) 2>> $txtfile | tee -a $scriptlog | intgrep" >> $scriptlog 2>&1
    267       check2=`root -q -b $macrospath/$macro.C+\("\"$outpath/\""\) 2>> $txtfile | tee -a $scriptlog | intgrep`
     267      echo "check2=root -q -b $macrospath/$macro.C+\(\"$outpath/\"\) 2>| $txtfile | tee -a $scriptlog | intgrep" >> $scriptlog 2>&1
     268      check2=`root -q -b $macrospath/$macro.C+\("\"$outpath/\""\) 2>| $txtfile | tee -a $scriptlog | intgrep`
    268269      case $check2 in
    269270         1)   echo " check2=$check2 -> everything ok" >> $scriptlog 2>&1
    … …  
    332333# rsync for complete directory delete removed sequences
    333334echo "do rsync for callisto, star and ganymed files" >> $scriptlog 2>&1
    334 rsync -aLvn --delete --exclude=*/*/20[01][0-9]*_[YI]_*[.]root --exclude=*/*.ps $datapath/{callisto,star,ganymed}/ $webpath/callisto >> $scriptlog 2>&1
     335rsync -aLv --delete --exclude=*/*/20[01][0-9]*_[YI]_*[.]root --exclude=*/*.ps $datapath/{callisto,star,ganymed}/ $webpath/callisto >> $scriptlog 2>&1
    335336
    336337lockfile=$lockpath/${program}-${hour}h.txt
Note: See TracChangeset for help on using the changeset viewer.