Changeset 7426 for trunk/MagicSoft


Ignore:
Timestamp:
11/25/05 11:17:51 (19 years ago)
Author:
Daniela Dorner
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r7425 r7426  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20 2005/11/25 Daniela Dorner
     21
     22   * datacenter/scripts/runcallisto, runstar, runganymed:
     23     - removed some not-needed logging outpu
     24
     25   * datacenter/scripts/dowebplots:
     26     - changed algorithm to create gifs/pngs from the root files
     27
     28   * datacenter/scripts/checkfilesforsequenceavail,
     29     datacenter/macros/checkfilesavail.C:
     30     - fixed problem with manually inserted sequences
     31
     32   * datacenter/scripts/movingrawfiles, movingsubsystemfiles:
     33     - added (scripts to move files from old (LP) to new structure (DC)
     34
     35
     36
    2037 2005/11/22 Thomas Bretz
    2138

  • trunk/MagicSoft/Mars/datacenter/macros/checkfileavail.C

    r7112 r7426  
    7171}
    7272
    73 int checkfileavail(TString sequenceno)
     73int checkfileavail(TString sequencefile)
    7474{
    7575    TEnv env("sql.rc");
    … …  
    8989    TEnv rc("steps.rc");
    9090
    91     cout << "sequ: " << sequenceno.Data() << endl;
    92     TString query(Form("SELECT fRunNumber FROM RunData WHERE fSequenceFirst=%s",
    93                        sequenceno.Data()));
     91    TEnv sequ(sequencefile);
     92
     93    TString runs;
     94    runs = sequ.GetValue("Runs", "");
     95    runs.ReplaceAll(" ", ",");
     96    if (runs.IsNull())
     97    {
     98        cout << "ERROR - No runs in file " << sequencefile << " found." << endl;
     99        return 0;
     100    }
     101
     102    cout << "sequ file: " << sequencefile.Data() << endl;
     103    TString query(Form("SELECT fRunNumber FROM RunData WHERE fRunNumber in (%s)",
     104                       sequencefile.Data()));
    94105
    95106    TSQLResult *res = serv.Query(query);

  • trunk/MagicSoft/Mars/datacenter/scripts/checkfilesforsequenceavail

    r7265 r7426  
    8282   echo "checking files for sequence $sequence..." >> $scriptlog 2>&1
    8383   no=`printf %08d $sequence | cut -c 0-4`
     84   no2=`printf %08d $sequence`
    8485   outpath=$logpath/checkfileavail/$no
    8586   echo "outpath: "$outpath  >> $scriptlog 2>&1
    8687   makedir $outpath  >> $scriptlog 2>&1
     88   
     89   sequencefile=$sequpath/$no/sequence$no2.txt
    8790
    88    check1=`root -q -b $macrospath/checkfileavail.C+\(\""$sequence\""\) | tee $outpath/checkfileavail-$sequence.log | grep int | sed -e 's/(int)//'`
     91   check1=`root -q -b $macrospath/checkfileavail.C+\(\""$sequencefile\""\) | tee $outpath/checkfileavail-$sequence.log | grep int | sed -e 's/(int)//'`
    8992
    9093   case $check1 in

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

    r7322 r7426  
    7272do
    7373   date >> $scriptlog 2>&1
    74    path=`dirname $rootfile`
    75    file=`basename $rootfile`
    76    base=`echo $file | sed -e 's/.root$//g'`
    77    echo "rootfile: $file" >> $scriptlog 2>&1
    78    echo "path    : $path" >> $scriptlog 2>&1
    79    echo "base    : $base" >> $scriptlog 2>&1
     74   psfile=`echo $file | sed -e 's/.root$/.ps/g'`
     75   echo "rootfile: $rootfile" >> $scriptlog 2>&1
     76   echo "psfile:   $psfile" >> $scriptlog 2>&1
    8077   
    81    X=0
    82    while [ "$X" -le "50" ] >> $scriptlog 2>&1
    83    do
    84       X=$((X+1))
    85       echo "$X. step" >> $scriptlog 2>&1
     78   daterootfile=`date +%Y%m%d -r $rootfile` >> $scriptlog 2>&1
     79   datepsfile=`date +%Y%m%d -r $psfile` >> $scriptlog 2>&1
     80   if [ "$datepsfile" = "" ]
     81   then
     82      echo "date of psfile is empty -> the file $psfile doesn't exist" >> $scriptlog 2>&1
     83      echo " -> setting date to 0 and producing psfile..." >> $scriptlog 2>&1
     84      datepsfile=0
     85   fi
    8686
    87       tabfile=$path/$base-tab$X
    88       daterootfile=`date +%Y%m%d -r $rootfile` >> $scriptlog 2>&1
    89       dategiffile=`date +%Y%m%d -r $tabfile.gif` >> $scriptlog 2>&1
    90       if [ "$dategiffile" = "" ]
    91       then
    92          echo "date of gif-file is empty -> the file $tabfile.gif doesn't exist" >> $scriptlog 2>&1
    93          echo " -> setting date to 0 and producing gif-file..." >> $scriptlog 2>&1
    94          dategiffile=0
    95       fi
     87   echo "checking date..."  >> $scriptlog 2>&1
     88   echo "date of rootfile: $daterootfile" >> $scriptlog 2>&1
     89   echo "date of psfile:   $datepsfile"   >> $scriptlog 2>&1
    9690
    97       echo "checking date..."  >> $scriptlog 2>&1
    98       echo "date of rootfile: $daterootfile" >> $scriptlog 2>&1
    99       echo "date of giffile:  $dategiffile"  >> $scriptlog 2>&1
     91   if [ "$datepsfile" -gt "$daterootfile" ] >> $scriptlog 2>&1
     92   then
     93      echo "psfile is older than rootfile -> continue " >> $scriptlog 2>&1
     94      continue
     95   fi
    10096
    101       if [ "$dategiffile" -gt "$daterootfile" ] >> $scriptlog 2>&1
    102       then
    103          echo "gif-file is older than root-file -> continue " >> $scriptlog 2>&1
    104          continue
    105       fi
     97   echo "producing psfile..." >> $scriptlog 2>&1
     98   ./showplot -b --save-as-ps=$psfile $rootfile >> $scriptlog 2>&1
    10699
    107       echo "producing ps-file with plots for tab $X..." >> $scriptlog 2>&1
    108       ./showplot -b --save-as-ps=$tabfile --tab=$X $rootfile >> $scriptlog 2>&1
    109       if ! ls $tabfile.ps >> $scriptlog 2>&1
    110       then
    111          echo "tab $X doen't exist -> break" >> $scriptlog 2>&1
    112          break
    113       fi
    114       echo "converting plots to gif for tab $X..." >> $scriptlog 2>&1
    115       convert -verbose -rotate 90 $tabfile.ps $tabfile.gif >> $scriptlog 2>&1
    116    done
     100   echo "converting plots to png..." >> $scriptlog 2>&1
     101   pstoimg -antialias -flip r270 -density 100 -type png -multipage $psfile >> $scriptlog 2>&1
    117102done
    118103

  • trunk/MagicSoft/Mars/datacenter/scripts/runcallisto

    r7344 r7426  
    9494todofiles=`ls -r $listpath/ToDo-$table-$column-*`
    9595
    96 echo "todofiles: "${todofiles[@]} >> $scriptlog 2>&1
     96#echo "todofiles: "${todofiles[@]} >> $scriptlog 2>&1
    9797
    9898for todofile in ${todofiles[@]}
    … …  
    192192             then
    193193                echo "no ccfile found for run "$runno >> $scriptlog 2>&1
    194                 break
     194                break 2
    195195             fi
    196196             echo "cacofile: "$cacofile >> $scriptlog 2>&1
    … …  
    211211                      continue
    212212                   else
     213                      echo "cacofile: "$cacofile >> $scriptlog 2>&1
    213214                      break
    214                       echo "cacofile: "$cacofile >> $scriptlog 2>&1
    215215                   fi
    216216                done

  • trunk/MagicSoft/Mars/datacenter/scripts/runganymed

    r7381 r7426  
    8686todofiles=`ls $listpath/ToDo-$table-$column-*`
    8787
    88 echo "todofiles: "${todofiles[@]} >> $scriptlog 2>&1
     88#echo "todofiles: "${todofiles[@]} >> $scriptlog 2>&1
    8989
    9090for todofile in ${todofiles[@]}

  • trunk/MagicSoft/Mars/datacenter/scripts/runstar

    r7265 r7426  
    8585todofiles=`ls $listpath/ToDo-$table-$column-*`
    8686
    87 echo "todofiles: "${todofiles[@]} >> $scriptlog 2>&1
     87#echo "todofiles: "${todofiles[@]} >> $scriptlog 2>&1
    8888
    8989for todofile in ${todofiles[@]}
Note: See TracChangeset for help on using the changeset viewer.