Changeset 7909 for trunk


Ignore:
Timestamp:
08/22/06 13:42:30 (18 years ago)
Author:
Daniela Dorner
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r7908 r7909  
    6868   * steps.rc:
    6969     - fixed typo
     70
     71   * datacenter/scripts/buildsequenceentries,
     72     datacenter/scripts/checkfilesforsequenceavail,
     73     datacenter/scripts/checkstardone, datacenter/scripts/correcttime,
     74     datacenter/scripts/dodatacheck, datacenter/scripts/doexclusions,
     75     datacenter/scripts/fillcallisto, datacenter/scripts/fillganymed,
     76     datacenter/scripts/fillstar, datacenter/scripts/runcallisto,
     77     datacenter/scripts/runganymed, datacenter/scripts/runstar,
     78     datacenter/scripts/writesequencefiles:
     79     - implemented usage of gettodo instead of getdolist (faster)
    7080
    7181
  • trunk/MagicSoft/Mars/datacenter/scripts/buildsequenceentries

    r7902 r7909  
    2929#
    3030# After checking, if the script is already running, the todolist is
    31 # written by using the macro getdolist.C
     31# written.
    3232# Then the sequences are built for each date in the todolist using the
    3333# macro buildsequenceentries.C
     
    4141set -C
    4242
    43 cd $mars
    44 
    45 table=SequenceBuildStatus
    4643column=fSequenceEntriesBuilt
    4744
    48 todofile=$listpath/ToDo-$table-$column.txt
    4945lockfile=$lockpath/lock-$program.txt
    5046
     
    5955
    6056# get todo list
    61 getdolist  >> $scriptlog 2>&1
     57gettodo  >> $scriptlog 2>&1
    6258
    6359# retrieve dates from todofile
     
    6864   finish >> $scriptlog 2>&1
    6965fi
     66
     67cd $mars
    7068
    7169echo "dates: "${dates[@]} >> $scriptlog 2>&1
  • trunk/MagicSoft/Mars/datacenter/scripts/checkfilesforsequenceavail

    r7902 r7909  
    2929#
    3030# After checking, if the script is already running, the todolist is
    31 # written by using the macro getdolist.C
     31# written
    3232# Then for each sequence the availability of the files (raw, cc, caco) is
    3333# checked by using the macro checkfilesavail.C
     
    3939source `dirname $0`/sourcefile
    4040
    41 table=SequenceProcessStatus
    4241column=fAllFilesAvail
    4342
    44 todofile=$listpath/ToDo-$table-$column.txt
    4543lockfile=$lockpath/lock-$program.txt
    4644
     
    5149date >> $scriptlog 2>&1
    5250
    53 cd $mars
    54 
    5551# check if script is already running
    5652checklock  >> $scriptlog 2>&1
    5753
    5854# get todo list
    59 getdolist  >> $scriptlog 2>&1
     55gettodo  >> $scriptlog 2>&1
    6056
    6157# retrieve sequences from todofile
     
    6662   finish >> $scriptlog 2>&1
    6763fi
     64
     65cd $mars
    6866
    6967echo "sequences: "${sequences[@]} >> $scriptlog 2>&1
  • trunk/MagicSoft/Mars/datacenter/scripts/checkstardone

    r7902 r7909  
    2929#
    3030# After checking, if the script is already running, the todolist is
    31 # written by using the macro getdolist.C
     31# written
    3232# Then for each dataset the sequences are extracted from the datasetfile
    3333# and for each sequence the availability of the star files checked by using
     
    4040source `dirname $0`/sourcefile
    4141
    42 table=DataSetProcessStatus
    4342column=fStarFilesAvail
    4443
    45 todofile=$listpath/ToDo-$table-$column.txt
    4644lockfile=$lockpath/lock-$program.txt
    4745
     
    5250date >> $scriptlog 2>&1
    5351
    54 cd $mars
    55 
    5652# check if script is already running
    5753checklock  >> $scriptlog 2>&1
    5854
    5955# get todo list
    60 getdolist  >> $scriptlog 2>&1
     56gettodot  >> $scriptlog 2>&1
    6157
    6258datasets=(`cat $todofile`)
     
    6662   finish >> $scriptlog 2>&1
    6763fi
     64
     65cd $mars
    6866
    6967echo "datasets: "${datasets[@]} #>> $scriptlog 2>&1
  • trunk/MagicSoft/Mars/datacenter/scripts/correcttime

    r7902 r7909  
    2929#
    3030# After checking, if the script is already running, the todolist is
    31 # written by using the macro getdolist.C
     31# written
    3232# Then for each run the timing correction is done
    3333# If this was successful, the status is inserted into the database using
     
    4141source `dirname $0`/sourcefile
    4242
    43 table=RunProcessStatus
    4443column=fTimingCorrection
    4544
    46 todofile=$listpath/ToDo-$table-$column.txt
    4745lockfile=$lockpath/lock-$program.txt
    4846
     
    5351fi
    5452
    55 cd $mars
    56 
    5753# get todo list
    58 getdolist  >> $scriptlog 2>&1
     54gettodo  >> $scriptlog 2>&1
    5955
    6056# retrieving runs from todo file
     
    6561   finish >> $scriptlog 2>&1
    6662fi
     63
     64cd $mars
    6765
    6866echo "runs: "${runs[@]}
  • trunk/MagicSoft/Mars/datacenter/scripts/dodatacheck

    r7902 r7909  
    2929#
    3030# After checking, if the script is already running, the todolist is
    31 # written by using the macro getdolist.C
     31# written
    3232# Then for each run the following steps are done:
    3333#  - filldotraw.C
     
    4545set -C
    4646
    47 cd $mars
    48 
    49 table=RunProcessStatus
    5047column=fDataCheckDone
    5148
    52 todofile=$listpath/ToDo-$table-$column
    5349lockfile=$lockpath/lock-getting-$program-list.txt
    5450
     
    6965   checklock "getting list of" >> $scriptlog 2>&1
    7066   # get todo list
    71    getdolist  >> $scriptlog 2>&1
     67   gettodolist  >> $scriptlog 2>&1
    7268   rm -v $lockfile >> $scriptlog 2>&1
    7369fi
     
    114110   finish >> $scriptlog 2>&1
    115111fi
     112
     113cd $mars
    116114
    117115# processing run(s)
  • trunk/MagicSoft/Mars/datacenter/scripts/doexclusions

    r7902 r7909  
    2929#
    3030# After checking, if the script is already running, the todolist is
    31 # written by using the macro getdolist.C
     31# written
    3232# Then the run are excluded for each date in the todolist using the
    3333# macro doexclusions.C
     
    4141set -C
    4242
    43 cd $mars
    44 
    45 table=SequenceBuildStatus
    4643column=fExclusionsDone
    4744
    48 todofile=$listpath/ToDo-$table-$column.txt
    4945lockfile=$lockpath/lock-$program.txt
    5046
     
    5955
    6056# get todo list
    61 getdolist  >> $scriptlog 2>&1
     57gettodo  >> $scriptlog 2>&1
    6258
    6359dates=(`cat $todofile`)
     
    6763   finish >> $scriptlog 2>&1
    6864fi
     65
     66cd $mars
    6967
    7068# do exclusions for each date in the todo file
  • trunk/MagicSoft/Mars/datacenter/scripts/fillcallisto

    r7902 r7909  
    2929#
    3030# After checking, if the script is already running, the todolist is
    31 # written by using the macro getdolist.C
     31# written
    3232# Then for each sequence in the todo list the calibration results are
    3333# filled into the table Calibration in the database using the macros
     
    4242set -C
    4343
    44 table=SequenceProcessStatus
    4544column=fFillCallisto
    4645
    47 todofile=$listpath/ToDo-$table-$column.txt
    4846lockfile=$lockpath/lock-$program.txt
    4947
     
    5452date >> $scriptlog 2>&1
    5553
    56 cd $mars
    57 
    5854# check if the script is already running
    5955checklock  >> $scriptlog 2>&1
    6056
    6157# get todo file
    62 getdolist  >> $scriptlog 2>&1
     58gettodolist  >> $scriptlog 2>&1
    6359
    6460sequences=(`cat $todofile`)
     
    6864   finish >> $scriptlog 2>&1
    6965fi
     66
     67cd $mars
    7068
    7169# fill information into the database for all sequences in the todo file
  • trunk/MagicSoft/Mars/datacenter/scripts/fillganymed

    r7902 r7909  
    2929#
    3030# After checking, if the script is already running, the todolist is
    31 # written by using the macro getdolist.C
     31# written
    3232# Then for each dataset in the todo list the ganymed results are filled
    3333# into the table Ganymed in the database using the macro fillganymed.C
     
    4141set -C
    4242
    43 table=DataSetProcessStatus
    4443column=fFillGanymed
    4544
    46 todofile=$listpath/ToDo-$table-$column.txt
    4745lockfile=$lockpath/lock-$program.txt
    4846
     
    5351date >> $scriptlog 2>&1
    5452
    55 cd $mars
    56 
    5753# check if script is already running
    5854checklock  >> $scriptlog 2>&1
    5955
    6056# get todo list
    61 getdolist  >> $scriptlog 2>&1
     57gettodo  >> $scriptlog 2>&1
    6258
    6359# retrieve datasets from todo file
     
    6864   finish >> $scriptlog 2>&1
    6965fi
     66
     67cd $mars
    7068
    7169# run fillganymed for datasets
  • trunk/MagicSoft/Mars/datacenter/scripts/fillstar

    r7902 r7909  
    2929#
    3030# After checking, if the script is already running, the todolist is
    31 # written by using the macro getdolist.C
     31# written
    3232# Then for each sequence in the todo list the star results are filled
    3333# into the table Star in the database using the macro fillstar.C
     
    4141set -C
    4242
    43 table=SequenceProcessStatus
    4443column=fFillStar
    4544
    46 todofile=$listpath/ToDo-$table-$column.txt
    4745lockfile=$lockpath/lock-$program.txt
    4846
     
    5351date >> $scriptlog 2>&1
    5452
    55 cd $mars
    56 
    5753# check if the script is already running
    5854checklock  >> $scriptlog 2>&1
    5955
    6056# get todo list
    61 getdolist  >> $scriptlog 2>&1
     57gettodo  >> $scriptlog 2>&1
    6258
    6359
     
    6965   finish >> $scriptlog 2>&1
    7066fi
     67
     68cd $mars
    7169
    7270# run fillstar for sequences
  • trunk/MagicSoft/Mars/datacenter/scripts/runcallisto

    r7902 r7909  
    4646callistorcmarapr05=$setuppath/$program/callisto_MarApr05.rc
    4747
    48 table=SequenceProcessStatus
    4948column=fCallisto
    5049#pno=500 # number of processes, i.e. number of todo-files
    5150
    52 todofile=$listpath/ToDo-$table-$column
    5351lockfile=$lockpath/lock-getting-$program-list.txt
    5452
     
    5856
    5957date >> $scriptlog 2>&1
    60 
    61 cd $mars
    6258
    6359# get todo file
     
    7167   checklock "getting list of" >> $scriptlog 2>&1
    7268   # get todo list
    73    getdolist  >> $scriptlog 2>&1
     69   gettodo  >> $scriptlog 2>&1
    7470   rm -v $lockfile >> $scriptlog 2>&1
    7571fi
     
    113109   finish >> $scriptlog 2>&1
    114110fi
     111
     112cd $mars
    115113
    116114# run calibration for sequence(s)
  • trunk/MagicSoft/Mars/datacenter/scripts/runganymed

    r7902 r7909  
    4242set -C
    4343
    44 table=DataSetProcessStatus
    4544column=fGanymed
    4645#pno=24 # number of processes, i.e. number of todo-files
    4746
    48 todofile=$listpath/ToDo-$table-$column
    4947lockfile=$lockpath/lock-getting-$program-list.txt
    5048
     
    5452
    5553date >> $scriptlog 2>&1
    56 
    57 cd $mars
    5854
    5955# finding todo file
     
    6763   checklock "getting list of" >> $scriptlog 2>&1
    6864   # get todo list
    69    getdolist  >> $scriptlog 2>&1
     65   gettodo  >> $scriptlog 2>&1
    7066   rm -v $lockfile >> $scriptlog 2>&1
    7167fi
  • trunk/MagicSoft/Mars/datacenter/scripts/runstar

    r7902 r7909  
    4242set -C
    4343
    44 table=SequenceProcessStatus
    4544column=fStar
    4645#pno=500 # number of processes, i.e. number of todo-files
    4746
    48 todofile=$listpath/ToDo-$table-$column
    4947lockfile=$lockpath/lock-getting-$program-list.txt
    5048
     
    5452
    5553date >> $scriptlog 2>&1
    56 
    57 cd $mars
    5854
    5955# finding todo file
     
    6763   checklock "getting list of" >> $scriptlog 2>&1
    6864   # get todo list
    69    getdolist  >> $scriptlog 2>&1
     65   gettodo  >> $scriptlog 2>&1
    7066   rm -v $lockfile >> $scriptlog 2>&1
    7167fi
     
    110106fi
    111107
     108cd $mars
     109
    112110# run star for sequence
    113111echo "sequences: "${sequences[@]} >> $scriptlog 2>&1
  • trunk/MagicSoft/Mars/datacenter/scripts/sourcefile

    r7908 r7909  
    296296      done
    297297   fi
    298    query=$query" isnull(fStartTime) and isnull(fFailedTime) and isnull(fFailedCode) and isnull(fFailedCodeAdd) and isnull(fReturnCode) order by $primary desc "
     298   query=$query" isnull($column) "
     299   query=$query" and isnull(fStartTime) and isnull(fFailedTime) and isnull(fFailedCode) and isnull(fFailedCodeAdd) and isnull(fReturnCode) "
     300   query=$query" order by $primary desc "
    299301   if [ "$singleprocess" = "yes" ]
    300302   then
     
    311313      if [ "$singleprocess" = "yes" ]
    312314      then
    313          listfile=$listpath/ToDo-$table-$column-$process.txt
     315         todofile=$listpath/ToDo-$table-$column-$process.txt
    314316         echo "  => found $process"
    315317      else
    316          listfile=$listpath/ToDo-$table-$column.txt
     318         todofile=$listpath/ToDo-$table-$column.txt
    317319         echo "found processes"
    318320      fi
    319 #      echo " list: "$listfile
     321#      echo " list: "$todofile
    320322     
    321       if ls $listfile > /dev/null 2>&1
     323      if ls $todofile > /dev/null 2>&1
    322324      then
    323          echo "$listfile exists already"
     325         echo "$todofile exists already"
    324326         contex
    325327      fi
    326       echo $process > $listfile
    327    fi
    328 }
     328      echo $process > $todofile
     329   fi
     330}
  • trunk/MagicSoft/Mars/datacenter/scripts/writesequencefiles

    r7902 r7909  
    2929#
    3030# After checking, if the script is already running, the todolist is
    31 # written by using the macro getdolist.C
     31# written
    3232# Then the sequence file is written for each sequence in the todolist using
    3333# the macro writesequencefile.C
     
    4141set -C
    4242
    43 table=SequenceProcessStatus
    4443column=fSequenceFileWritten
    4544
    46 todofile=$listpath/ToDo-$table-$column.txt
    4745lockfile=$lockpath/lock-$program.txt
    4846
     
    5351date >> $scriptlog 2>&1
    5452
    55 cd $mars
    56 
    5753# check if script is already running
    5854checklock  >> $scriptlog 2>&1
    5955
    6056# get todo list
    61 getdolist  >> $scriptlog 2>&1
     57gettodo  >> $scriptlog 2>&1
    6258
    6359# get sequences from todo file
     
    6864   finish >> $scriptlog 2>&1
    6965fi
     66
     67cd $mars
    7068
    7169# write sequence file for all sequences in todo file
Note: See TracChangeset for help on using the changeset viewer.