Changeset 9618 for trunk


Ignore:
Timestamp:
07/28/10 14:52:12 (14 years ago)
Author:
Daniela Dorner
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r9615 r9618  
    1919                                                 -*-*- END OF LINE -*-*-
    2020
     21 2010/07/28 Daniela Dorner
     22
     23   * datacenter/db/menu.php:
     24     - updated initial parameter selection for mcinfo.php
     25     - changed table for GetMin/Max to CeresInfo
     26
     27   * datacenter/db/mcinfo.php:
     28     - bugfix for removing WHERE or AND at end of queries
     29     - added fStopTime to status-column in case of failure
     30     - bugfix for correct joins in case of group-by
     31
     32   * datacenter/db/mcdefs.php:
     33     - updated runtime of ceres
     34     - updated joins for status tables
     35
     36   * datacenter/scripts/insertmc:
     37     - added (script to add runs to the database)
     38
     39   * datacenter/scripts/runcorsika:
     40     - added check if 'END OF FILE' is contained in logfile
     41     - added check if file number > 999 and change filename if it is
     42
     43   * datacenter/scripts/setup.wue.fact.mc:
     44     - removed cprun
     45     - added callisto and star in scripts-array
     46
     47   * datacenter/scripts/sourcefile:
     48     - removed variables for fProgramId
     49
     50   * resources/steps_fact.rc:
     51     - added missing needs
     52
     53
     54
    2155 2010/07/09 Thomas Bretz
    2256

  • trunk/MagicSoft/Mars/datacenter/scripts/runcorsika

    r9605 r9618  
    207207case $check1 in
    208208   0)   printprocesslog "INFO $program finished successfully for run $run file $file (return code $check1)"
     209        if [ $file -gt 999 ]
     210        then
     211           corsikafilenew=$mcpath/$program/`printf %08d $run | cut -c 1-4`/`printf %08d $run | cut -c 5-8`/cer000`printf %06d $file | cut -c 4-6`
     212           corsikafileold=$mcpath/$program/`printf %08d $run | cut -c 1-4`/`printf %08d $run | cut -c 5-8`/cer`printf %06d $file`
     213           if ! mv $corsikafileold $corsikafilenew
     214           then
     215              printprocesslog "ERROR could not mv $corsikafileold to $corsikafilenew"
     216              check=2
     217           fi
     218        fi
     219        if ! grep 'END OF RUN' $logfile
     220        then
     221           printprocesslog "ERROR could not find 'END OF RUN' in $logfile => unknown error for run $run file $file "
     222           check=2
     223        fi
    209224        ;;
    210225   *)   printprocesslog "ERROR $program failed for run $run file $file (return code $check1)"

  • trunk/MagicSoft/Mars/datacenter/scripts/setup.wue.fact.mc

    r9604 r9618  
    9595
    9696#hour:            0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
    97 pnototal=(       42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 )
    98 pnototalwe=(     42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 )
     97pnototal=(       32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 )
     98pnototalwe=(     32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 )
    9999
    100100pnocorsika=(     30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 )
    101 pnoceres=(       15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 )
    102 pnocprun=(       15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 )
    103 pnocallisto=(    32 32 32 32 32 30 30 18 18 15 15 15 15 15 15 15 15 15 15 18 18 30 30 32 )
     101pnoceres=(       20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 )
     102pnocallisto=(    32 32 32 32 32 30 30 18 18 20 20 20 20 20 20 20 20 20 20 18 18 30 30 32 )
    104103pnostar=(        10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 )
    105104
    106105pnocorsikawe=(   30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 )
    107 pnocereswe=(     15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 )
    108 pnocprunwe=(     15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 )
     106pnocereswe=(     20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 )
    109107pnocallistowe=(  32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 )
    110108pnostarwe=(      10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 )
    111109
    112110# set variables for jobmanager
    113 scripts=( "runcorsika" "runceres" )
    114 scriptscolname=( "Corsika" "Ceres" )
    115 pnosweek=( ${pnocorsika[@]} ${pnoceres[@]} )
    116 pnoswe=( ${pnocorsikawe[@]} ${pnocereswe[@]} )
     111scripts=( "runcorsika" "runceres" "runcallisto_mc" "runstar_mc" )
     112scriptscolname=( "Corsika" "Ceres" "Callisto" "Star" )
     113pnosweek=( ${pnocorsika[@]} ${pnoceres[@]} ${pnocallisto[@]} ${pnostar[@]} )
     114pnoswe=( ${pnocorsikawe[@]} ${pnocereswe[@]} ${pnocallistowe[@]} ${pnostarwe[@]} )
    117115

  • trunk/MagicSoft/Mars/datacenter/scripts/sourcefile

    r9610 r9618  
    108108check="ok"
    109109
    110 #failed codes
    111 #sequence build status
    112 Fbuildsequ=1
    113 Fdoexcl=2
    114 #run process status
    115 Ftimecorr=3
    116 Ffillraw=4
    117 Fsinope=5
    118 Ffillsinope=6
    119 Fresetexcl=7
    120 #sequence process status
    121 Fwritesequfile=8
    122 Ffilesavail=9
    123 Fnoccfile=10
    124 Fnocacofile=11
    125 Fmerppcc=12
    126 Fmerppcaco=13
    127 Fcallisto=14
    128 Ffillcalib=15
    129 Ffillsignal=16
    130 Fstar=17
    131 Ffillstar=18
    132 #dataset process status
    133 Fwritedatasetfile=19
    134 Fstardone=20
    135 Fganymed=21
    136 Ffillganymed=22
    137 #again run process status
    138 FCompmux=26
    139 Fdowebplots=27
    140 #again mc run process status
    141 Fmccallisto=28
    142 Ffillmccalib=29
    143 Ffillmcsignal=30
    144 Fmcstar=31
    145 Ffillmcstar=32
    146 Fcorsikasimtel=33
    147 Fchimp=34
    148 Fchimpcp=35
    149 Fctastar=36
    150 Fctastarcp=37
    151 FctastereoA=38
    152 FctastereoB=39
    153 FctastereoC=40
    154 FctastereoD=41
    155 FctastereoE=42
    156 FctastereoF=43
    157 FctastereoG=44
    158 FctastereoH=45
    159 Fctastereocp=46
    160 
    161110# setup for jobmanager:
    162111#   log files (can't be defined in script itself, as script can run longer
    … …  
    177126fi
    178127
    179 # resetting values
     128# resetting values for jobmanager
    180129pno=0
    181130totalpno=0

  • trunk/MagicSoft/Mars/resources/steps_fact.rc

    r9605 r9618  
    33
    44Ceres.Primaries: fRunNumber, fFileNumber, fCeresSetupKEY
     5Ceres.Needs: Corsika
    56Ceres.SpecialNeedJoin: LEFT JOIN CeresInfo USING(fSequenceNumber, fCeresSetupKEY)
    67Ceres.SpecialInfluenceJoin: LEFT JOIN CeresInfo USING(fRunNumber, fFileNumber, fCeresSetupKEY)
Note: See TracChangeset for help on using the changeset viewer.