Changeset 9126

Timestamp:

08/15/08 17:28:25 (16 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/datacenter/scripts/dowebplots (modified) (8 diffs)

trunk/MagicSoft/Mars/datacenter/scripts/dowebplots

@@ -96 +96 @@
                       general=( ${generals[@]} )
                    else 
-                      general=( $general $1 )
+                      general=( ${general[@]} $1 )
                    fi
                    ;;
@@ -104 +104 @@
                       individual=( ${individuals[@]} )
                    else 
-                      individual=( $individual $1 )
+                      individual=( ${individual[@]} $1 )
                    fi
                    ;;
@@ -118 +118 @@
 done
 
-if [ ${#general[@]} -eq 0 ] || [ ${#individual[@]} -eq 0 ]
+if [ ${#general[@]} -eq 0 ] && [ ${#individual[@]} -eq 0 ]
 then
    all=( ${names[@]} )
@@ -128 +128 @@
 
 
-
 # rsync subsystemdata, sequence and dataset files
 echo "do rsync for subsystem files" >> $scriptlog 2>&1
-#rsync -avn --delete $subsystempath/ $webpath/subsystemdata >> $scriptlog 2>&1
+rsync -av --delete $subsystempath/ $webpath/subsystemdata >> $scriptlog 2>&1
 
 echo "do rsync for sequence files" >> $scriptlog 2>&1
-#rsync -avn --delete $sequencepath/ $webpath/sequences >> $scriptlog 2>&1
+rsync -av --delete $sequencepath/ $webpath/sequences >> $scriptlog 2>&1
 
 echo "do rsync for dataset files" >> $scriptlog 2>&1
-#rsync -avn --delete $datasetpath/ $webpath/datasets >> $scriptlog 2>&1
+rsync -av --delete $datasetpath/ $webpath/datasets >> $scriptlog 2>&1
 
 
@@ -218 +217 @@
       rootfile=$inpath/$filename`printf %08d $num`.root
       psfile=$inpath/$filename`printf %08d $num`.ps
-      csvfile=$inpath/$filename`printf %08d $num`.csv
+      csvfile=$outpath/$filename`printf %08d $num`.csv
       pdffile=$outpath/$filename`printf %08d $num`.pdf
       # rsync
@@ -230 +229 @@
          # overwrite needed file and path names
          rootfile=$inpath/$filename.root
-         psfile=$inpath/$filename.csv
+         psfile=$inpath/$filename.ps
+         csvfile=$outpath/$filename.csv
          pdffile=$outpath/$filename.pdf
          datasetfile=$datasetpath/`printf %08d $num | cut -c 0-${digit}`/dataset`printf %08d $num`.txt
          
-         echo "check1=root -q -b $macrospath/plotdb.C+\(\"$datasetfile\"\,\"$inpath/\"\) | tee -a $scriptlog | intgrep" >> $scriptlog 2>&1
-         check1=`root -q -b $macrospath/plotdb.C+\("\"$datasetfile\""\,"\"$inpath/\""\) | tee -a $scriptlog | intgrep`
+         echo "check1=root -q -b $macrospath/plotdb.C+\(\"$datasetfile\"\,\"$inpath/\"\) 2>|/dev/null | tee -a $scriptlog | intgrep" >> $scriptlog 2>&1
+         check1=`root -q -b $macrospath/plotdb.C+\("\"$datasetfile\""\,"\"$inpath/\""\) 2>|/dev/null | tee -a $scriptlog | intgrep`
          case $check1 in 
             1)   echo " check1=$check1 -> everything ok" >> $scriptlog 2>&1
@@ -260 +260 @@
       tmppath=/tmp/$pathname
       rootfile=$outpath/$filename.root
-      psfile=$outpath/$filename.csv
+      psfile=$outpath/$filename.ps
+      csvfile=$outpath/$filename.csv
       pdffile=$outpath/$filename.pdf
       txtfile=$outpath/$filename.txt
       
-      echo "check2=root -q -b $macrospath/$macro.C+\(\"$outpath/\"\) 2>> $txtfile | tee -a $scriptlog | intgrep" >> $scriptlog 2>&1
-      check2=`root -q -b $macrospath/$macro.C+\("\"$outpath/\""\) 2>> $txtfile | tee -a $scriptlog | intgrep`
+      echo "check2=root -q -b $macrospath/$macro.C+\(\"$outpath/\"\) 2>| $txtfile | tee -a $scriptlog | intgrep" >> $scriptlog 2>&1
+      check2=`root -q -b $macrospath/$macro.C+\("\"$outpath/\""\) 2>| $txtfile | tee -a $scriptlog | intgrep`
       case $check2 in 
          1)   echo " check2=$check2 -> everything ok" >> $scriptlog 2>&1
@@ -332 +333 @@
 # rsync for complete directory delete removed sequences
 echo "do rsync for callisto, star and ganymed files" >> $scriptlog 2>&1
-rsync -aLvn --delete --exclude=*/*/20[01][0-9]*_[YI]_*[.]root --exclude=*/*.ps $datapath/{callisto,star,ganymed}/ $webpath/callisto >> $scriptlog 2>&1
+rsync -aLv --delete --exclude=*/*/20[01][0-9]*_[YI]_*[.]root --exclude=*/*.ps $datapath/{callisto,star,ganymed}/ $webpath/callisto >> $scriptlog 2>&1
 
 lockfile=$lockpath/${program}-${hour}h.txt