Changeset 9054 for trunk/MagicSoft


Ignore:
Timestamp:
07/30/08 16:31:01 (16 years ago)
Author:
Daniela Dorner
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r9049 r9054  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20
     21 2008/07/30 Daniela Dorner
     22
     23   * resources/steps.rc:
     24     - added
     25     - adapted to new data structure
     26
     27   * steps.rc:
     28     - removed
     29
     30   * datacenter/macros/setupdb.C, datacenter/macros/setstatus.C,
     31     datacenter/macros/getdolist.C:
     32     - removed
     33
     34   * datacenter/db/datacheck.php, datacenter/db/datasetinfo.php,
     35     datacenter/db/magicdefs.php, datacenter/db/menu.php,
     36     datacenter/db/resetseq.php, datacenter/db/runinfo.php,
     37     datacenter/db/sequinfo.php, datacenter/macros/resetcolumn.C:
     38     - removed fFailedCodeAdd
     39     - changed fFailedCode to fProgramId
     40
     41   * datacenter/scripts/sourcefile:
     42     - adapted path of steps.rc
     43     - added new additional primaries to functions setstatus, getstatus
     44       gettodo and getdolist
     45     - merged function gettodo and getdolist
     46     - removed todofile
     47     - removed fFailedCodeAdd
     48     - changed fFailedCode to fProgramId
     49
     50   * datacenter/scripts/buildsequenceentries,
     51     datacenter/scripts/checkfilesforsequenceavail,
     52     datacenter/scripts/checkstardone, datacenter/scripts/doexclusions,
     53     datacenter/scripts/fillcallisto, datacenter/scripts/fillstar,
     54     datacenter/scripts/fillganymed,
     55     datacenter/scripts/writedatasetfiles,
     56     datacenter/scripts/writesequencefiles:
     57     - implemented usage of getodo (new merged function)
     58     - removed todofile
     59     - removed primval
     60
     61   * datacenter/scripts/runcallisto, datacenter/scripts/dodatacheck,
     62     datacenter/scripts/runganymed, datacenter/scripts/runstar:
     63     - implemented usage of getodo (new merged function)
     64     - removed primval
     65
     66   * datacenter/scripts/checkstardone
     67     - removed comadd
     68
     69   * datacenter/scripts/runcallisto
     70     - append output of stage.C instead of overwriting logfile
     71
     72
    2073
    2174 2008/07/29 Stefan Ruegamer

  • trunk/MagicSoft/Mars/datacenter/scripts/buildsequenceentries

    r9047 r9054  
    5050
    5151# get todo list
    52 getdolist  >> $scriptlog 2>&1
    53 
    54 # retrieve dates from todofile
    55 dates=(`cat $todofile`)
    56 if [ "$dates" = "" ]
    57 then
    58    echo "nothing to do -> exit"  >> $scriptlog 2>&1
    59    finish >> $scriptlog 2>&1
    60 fi
    61 echo "dates: "${dates[@]} >> $scriptlog 2>&1
    62 rm -v $todofile >> $scriptlog 2>&1
     52gettodo  >> $scriptlog 2>&1
    6353
    6454cd $mars
    6555
    66 for date in ${dates[@]}
    67 do
     56for (( s=0 ; s < $num ; s++ ))
     57do
     58   date=${primaries[$s+$s]}
     59   telnum=${primaries[$s+$s+1]}
    6860   echo "building sequence entries for date $date..." >> $scriptlog 2>&1
    6961   printprocesslog "INFO build sequence entries for $date"
    … …  
    7365   buildsequentrieslog=$buildsequentriespath/buildsequenceentries-$date.log
    7466
    75    primvar=$date
    7667   setstatus "start" >> $scriptlog 2>&1
    7768
    78    check1=`root -q -b $macrospath/buildsequenceentries.C+\("\"$date\""\,"\"$datapath\""\,"\"$sequpath\""\,1\,kFALSE\) | tee $buildsequentrieslog | intgrep`
     69   check1=`root -q -b $macrospath/buildsequenceentries.C+\("\"$date\""\,"\"$datapath\""\,"\"$sequpath\""\,$telnum\,kFALSE\) | tee $buildsequentrieslog | intgrep`
    7970
    8071   case $check1 in

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

    r9036 r9054  
    5050
    5151# get todo list
    52 getdolist  >> $scriptlog 2>&1
    53 
    54 # retrieve sequences from todofile
    55 sequences=(`cat $todofile`)
    56 if [ "$sequences" = "" ]
    57 then
    58    echo "nothing to do -> exit"  >> $scriptlog 2>&1
    59    finish >> $scriptlog 2>&1
    60 fi
    61 echo "sequences: "${sequences[@]} >> $scriptlog 2>&1
    62 rm -v $todofile >> $scriptlog 2>&1
     52gettodo  >> $scriptlog 2>&1
    6353
    6454cd $mars
    6555
    66 for sequence in ${sequences[@]}
    67 do
     56for (( s=0 ; s < $num ; s++ ))
     57do
     58   sequence=${primaries[$s+$s]}
     59   telnum=${primaries[$s+$s+1]}
    6860   echo "checking files for sequence $sequence..." >> $scriptlog 2>&1
    6961   printprocesslog "INFO checking files for sequence $sequence"
    … …  
    7466   checkfileavaillog=$checkfileavailpath/$program-$no2.log
    7567
    76    primvar=$sequence
    7768   setstatus "start" >> $scriptlog 2>&1
    7869
    79    check1=`root -q -b $macrospath/checkfileavail.C+\($sequence,1\) | tee $checkfileavaillog | intgrep`
     70   check1=`root -q -b $macrospath/checkfileavail.C+\($sequence,$telnum\) | tee $checkfileavaillog | intgrep`
    8071
    8172   case $check1 in

  • trunk/MagicSoft/Mars/datacenter/scripts/checkstardone

    r9018 r9054  
    4848
    4949# get todo list
    50 getdolist  >> $scriptlog 2>&1
    51 
    52 datasets=(`cat $todofile`)
    53 if [ "$datasets" = "" ]
    54 then
    55    echo "nothing to do -> exit"  >> $scriptlog 2>&1
    56    finish >> $scriptlog 2>&1
    57 fi
    58 echo "datasets: "${datasets[@]} >> $scriptlog 2>&1
    59 rm -v $todofile >> $scriptlog 2>&1
     50gettodo  >> $scriptlog 2>&1
    6051
    6152cd $mars
    6253
    63 for dataset in ${datasets[@]}
    64 do
     54for (( s=0 ; s < $num ; s++ ))
     55do
     56   dataset=${primaries[$s+$s]}
     57   telnum=${primaries[$s+$s+1]}
    6558   echo "checking star done for sequences of dataset $dataset..." >> $scriptlog 2>&1
    6659   printprocesslog "INFO checking star done for sequences of dataset $dataset"
    … …  
    7568   makedir $outpath  >> $scriptlog 2>&1
    7669
    77    primvar=$dataset
    7870   setstatus "start" >> $scriptlog 2>&1
    7971
    … …  
    9587           printprocesslog "ERROR checkstardone.C failed"
    9688           com=$Fstardone
    97            comadd=$sequence
    9889           check=$check1
    9990           break

  • trunk/MagicSoft/Mars/datacenter/scripts/dodatacheck

    r9046 r9054  
    4242printprocesslog "INFO starting $0"
    4343echo "This script has not been adapted to the new file structure (MAGIC II). "
     44echo "Only the usage of getodo has been adapted, but not tested."
    4445echo "Please adapt it before using it."
    4546exit
    … …  
    5455
    5556# get run #
    56 gettodo >> $scriptlog 2>&1
    57 run=$process
     57gettodo "1" >> $scriptlog 2>&1
     58run=${primaries[0]}
     59telnum=${primaries[1]}
     60filenum=${primaries[2]}
    5861
    5962# lock sequ
    … …  
    7477date2=`echo $date | sed -e 's/\//-/g'`
    7578
    76 primvar=$no2
     79#primvar=$no2
    7780setstatus "start" >> $scriptlog 2>&1
    7881

  • trunk/MagicSoft/Mars/datacenter/scripts/doexclusions

    r9047 r9054  
    5050
    5151# get todo list
    52 getdolist  >> $scriptlog 2>&1
    53 
    54 dates=(`cat $todofile`)
    55 if [ "$dates" = "" ]
    56 then
    57    echo "nothing to do -> exit"  >> $scriptlog 2>&1
    58    finish >> $scriptlog 2>&1
    59 fi
    60 echo "dates: "${dates[@]} >> $scriptlog 2>&1
    61 rm -v $todofile >> $scriptlog 2>&1
     52gettodo  >> $scriptlog 2>&1
    6253
    6354cd $mars
    6455
    6556# do exclusions for each date in the todo file
    66 for date in ${dates[@]}
    67 do
     57for (( s=0 ; s < $num ; s++ ))
     58do
     59   date=${primaries[$s+$s]}
     60   telnum=${primaries[$s+$s+1]}
    6861   echo "do exclusions for date "$date >> $scriptlog 2>&1
    6962   printprocesslog "INFO do exclusions for $date"
    … …  
    7366   doexclusionslog=$doexclusionspath/doexclusions-$date.log
    7467
    75    primvar=$date
    7668   setstatus "start" >> $scriptlog 2>&1
    7769
    78    check1=`root -q -b $macrospath/doexclusions.C+\("\"$date\""\,1\,kFALSE\) | tee $doexclusionslog | intgrep`
     70   check1=`root -q -b $macrospath/doexclusions.C+\("\"$date\""\,$telnum\,kFALSE\) | tee $doexclusionslog | intgrep`
    7971
    8072   case $check1 in

  • trunk/MagicSoft/Mars/datacenter/scripts/fillcallisto

    r8482 r9054  
    5151
    5252# get todo file
    53 getdolist  >> $scriptlog 2>&1
    54 
    55 sequences=(`cat $todofile`)
    56 if [ "$sequences" = "" ]
    57 then
    58    echo "nothing to do -> exit"  >> $scriptlog 2>&1
    59    finish >> $scriptlog 2>&1
    60 fi
    61 echo "sequences: "${sequences[@]} >> $scriptlog 2>&1
    62 rm -v $todofile >> $scriptlog 2>&1
     53gettodo  >> $scriptlog 2>&1
    6354
    6455cd $mars
    6556
    6657# fill information into the database for all sequences in the todo file
    67 for sequence in ${sequences[@]}
    68 do
     58for (( s=0 ; s < $num ; s++ ))
     59do
     60   sequence=${primaries[$s+$s]}
     61   telnum=${primaries[$s+$s+1]}
    6962   printprocesslog "INFO starting $program for sequence $sequence"
    7063   no=`printf %08d $sequence | cut -c 0-4`
    … …  
    7972
    8073   echo "run $program for sequence $sequence" >> $scriptlog 2>&1
    81    primvar=$no2
    8274   setstatus "start" >> $scriptlog 2>&1
    8375   echo "run fillcalib..." >> $scriptlog 2>&1

  • trunk/MagicSoft/Mars/datacenter/scripts/fillganymed

    r8482 r9054  
    5050
    5151# get todo list
    52 getdolist  >> $scriptlog 2>&1
    53 
    54 # retrieve datasets from todo file
    55 datasets=(`cat $todofile`)
    56 if [ "$datasets" = "" ]
    57 then
    58    echo "nothing to do -> exit"  >> $scriptlog 2>&1
    59    finish >> $scriptlog 2>&1
    60 fi
    61 echo "datasets: "${datasets[@]} >> $scriptlog 2>&1
    62 rm -v $todofile >> $scriptlog 2>&1
     52gettodo  >> $scriptlog 2>&1
    6353
    6454cd $mars
    6555
    6656# run fillganymed for datasets
    67 for dataset in ${datasets[@]}
    68 do
     57for (( s=0 ; s < $num ; s++ ))
     58do
     59   dataset=${primaries[$s+$s]}
     60   telnum=${primaries[$s+$s+1]}
    6961   printprocesslog "INFO starting $program for dataset $dataset"
    7062   no=`printf %08d $dataset | cut -c 0-5`
    … …  
    7769
    7870   echo "run $program for dataset $dataset" >> $scriptlog 2>&1
    79    primvar=$no2
    8071   setstatus "start" >> $scriptlog 2>&1
    8172

  • trunk/MagicSoft/Mars/datacenter/scripts/fillstar

    r8482 r9054  
    5050
    5151# get todo list
    52 getdolist  >> $scriptlog 2>&1
    53 
    54 # retrieve sequences from todo file
    55 sequences=(`cat $todofile`)
    56 if [ "$sequences" = "" ]
    57 then
    58    echo "nothing to do -> exit"  >> $scriptlog 2>&1
    59    finish >> $scriptlog 2>&1
    60 fi
    61 echo "sequences: "${sequences[@]} >> $scriptlog 2>&1
    62 rm -v $todofile >> $scriptlog 2>&1
     52gettodo  >> $scriptlog 2>&1
    6353
    6454cd $mars
    6555
    6656# run fillstar for sequences
    67 for sequence in ${sequences[@]}
    68 do
     57for (( s=0 ; s < $num ; s++ ))
     58do
     59   sequence=${primaries[$s+$s]}
     60   telnum=${primaries[$s+$s+1]}
    6961   printprocesslog "INFO starting $program for sequence $sequence"
    7062   no=`printf %08d $sequence | cut -c 0-4`
    … …  
    7769
    7870   echo "run $program for sequence $sequence" >> $scriptlog 2>&1
    79    primvar=$no2
    8071   setstatus "start" >> $scriptlog 2>&1
    8172

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

    r9040 r9054  
    5353
    5454# get sequence #
    55 gettodo >> $scriptlog 2>&1
    56 sequence=$process
     55gettodo "1" >> $scriptlog 2>&1
     56sequence=${primaries[0]}
     57telnum=${primaries[1]}
    5758
    5859# lock sequ for cal
    … …  
    103104fi
    104105
    105 primvar=$no2
    106106setstatus "start" >> $scriptlog 2>&1
    107107
    … …  
    109109echo "staging files:" >> $scriptlog 2>&1
    110110
    111 echo 'root -q -b $macrospath/stage.C\("\"$sequfile\""\) | tee $scriptlog | intgrep' >> $scriptlog 2>&1
    112 check0=`root -q -b $macrospath/stage.C\("\"$sequfile\""\) | tee $scriptlog | intgrep`
     111echo 'root -q -b $macrospath/stage.C\("\"$sequfile\""\) | tee -a $scriptlog | intgrep' >> $scriptlog 2>&1
     112check0=`root -q -b $macrospath/stage.C\("\"$sequfile\""\) | tee -a $scriptlog | intgrep`
    113113
    114114case $check0 in

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

    r8525 r9054  
    5151
    5252# get dataset #
    53 gettodo >> $scriptlog 2>&1
    54 dataset=$process
     53gettodo "1" >> $scriptlog 2>&1
     54dataset=${primaries[0]}
     55telnum=${primaries[1]}
    5556
    5657# lock sequ
    … …  
    7677fi
    7778
    78 primvar=$no2
    7979setstatus "start" >> $scriptlog 2>&1
    8080

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

    r8723 r9054  
    5252
    5353# get sequence #
    54 gettodo >> $scriptlog 2>&1
    55 sequence=$process
     54gettodo "1" >> $scriptlog 2>&1
     55sequence=${primaries[0]}
     56telnum=${primaries[1]}
    5657
    5758# lock sequ
    … …  
    7172sequfile="$sequpath/$no/sequence$no2.txt"
    7273
    73 primvar=$no2
    7474setstatus "start" >> $scriptlog 2>&1
    7575

  • trunk/MagicSoft/Mars/datacenter/scripts/writedatasetfiles

    r8482 r9054  
    4949
    5050# get todo list
    51 getdolist  >> $scriptlog 2>&1
    52 
    53 datasets=(`cat $todofile`)
    54 if [ "$datasets" = "" ]
    55 then
    56    echo "nothing to do -> exit"  >> $scriptlog 2>&1
    57    finish >> $scriptlog 2>&1
    58 fi
    59 echo "datasets: "${datasets[@]} >> $scriptlog 2>&1
    60 rm -v $todofile >> $scriptlog 2>&1
     51gettodo  >> $scriptlog 2>&1
    6152
    6253cd $mars
    6354
    64 for dataset in ${datasets[@]}
    65 do
     55for (( s=0 ; s < $num ; s++ ))
     56do
     57   dataset=${primaries[$s+$s]}
     58   telnum=${primaries[$s+$s+1]}
    6659   echo "writing dataset file for dataset $dataset..." >> $scriptlog 2>&1
    6760   printprocesslog "INFO writing datasetfile for dataset $dataset"
    … …  
    7467   logfile=$writedatasetfilelogpath/$program-$no2.log
    7568
    76    primvar=$dataset
    7769   setstatus "start" >> $scriptlog 2>&1
    7870   

  • trunk/MagicSoft/Mars/datacenter/scripts/writesequencefiles

    r9047 r9054  
    5050
    5151# get todo list
    52 getdolist  >> $scriptlog 2>&1
    53 
    54 # get sequences from todo file
    55 sequences=(`cat $todofile`)
    56 if [ "$sequences" = "" ]
    57 then
    58    echo "nothing to do -> exit"  >> $scriptlog 2>&1
    59    finish >> $scriptlog 2>&1
    60 fi
    61 echo "sequences: "${sequences[@]} >> $scriptlog 2>&1
    62 rm -v $todofile >> $scriptlog 2>&1
     52gettodo  >> $scriptlog 2>&1
    6353
    6454cd $mars
    6555
    66 # write sequence file for all sequences in todo file
    67 for sequence in ${sequences[@]}
    68 do
     56# write sequence file for all sequences which don't have one yet
     57for (( s=0 ; s < $num ; s++ ))
     58do
     59   sequence=${primaries[$s+$s]}
     60   telnum=${primaries[$s+$s+1]}
    6961   printprocesslog "INFO write sequence files for sequence $sequence"
    7062   no=`printf %08d $sequence | cut -c 0-4`
    … …  
    7870
    7971   echo "write sequencefile for sequence $sequence" >> $scriptlog 2>&1
    80    primvar=$no2
    8172   setstatus "start" >> $scriptlog 2>&1
    8273
    83    check2=`root -q -b $macrospath/writesequencefile.C\($sequence\,1\,"\"$sequpath\""\) | tee $writesequencefilelog | intgrep`
     74   check2=`root -q -b $macrospath/writesequencefile.C\($sequence\,$telnum\,"\"$sequpath\""\) | tee $writesequencefilelog | intgrep`
    8475   case $check2 in
    8576      1)   echo " check2=$check2 -> everything ok " >> $scriptlog 2>&1
Note: See TracChangeset for help on using the changeset viewer.