Changeset 9593 for trunk


Ignore:
Timestamp:
06/24/10 12:03:34 (15 years ago)
Author:
Daniela Dorner
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r9592 r9593  
    1919                                                 -*-*- END OF LINE -*-*-
    2020
     21 2010/06/24 Daniela Dorner
     22
     23   * datacenter/scripts/runceres:
     24     - added (script to run telescope simulation of file basis)
     25
     26   * datacenter/scripts/sourcefile, resources/steps_fact.rc:
     27     - bugfixes: changed joins to get correct queries for all cases
     28
     29   * datacenter/scripts/setup.wue.fact.mc:
     30     - changed path for setup files
     31     - added runceres to jobmanager settings
     32
     33
     34
    2135 2010/06/22 Daniela Dorner
    2236

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

    r9590 r9593  
    4343logpath=/magic/datacenter/fact/autologs
    4444lockpath=/magic/datacenter/fact/locks
    45 setuppath=/magic/datacenter/fact/setup
     45setuppath=/magic/simulated/setup
    4646
    4747## paths of data
    … …  
    7373
    7474#addresses to which the errors are sent
    75 erradrs="daniela.dorner@unige.ch"
     75erradrs="dorner@astro.uni-wuerzburg.de"
    7676#addresses to which the changes are sent
    77 adrs="daniela.dorner@unige.ch"
     77adrs="dorner@astro.uni-wuerzburg.de"
    7878
    7979
    … …  
    9797pnototalwe=(     42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 )
    9898
    99 pnocorsika=(     30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 )
    100 pnoceres=(       12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 )
    101 pnocprun=(       12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 )
    102 pnocallisto=(    32 32 32 32 32 20 20 18 18 12 12 12 12 12 12 12 12 12 12 18 18 20 20 32 )
     99pnocorsika=(     20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 )
     100pnoceres=(       15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 )
     101pnocprun=(       15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 )
     102pnocallisto=(    32 32 32 32 32 20 20 18 18 15 15 15 15 15 15 15 15 15 15 18 18 20 20 32 )
    103103pnostar=(        10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 )
    104104
    105 pnocorsikawe=(   30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 )
    106 pnocereswe=(     12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 )
    107 pnocprunwe=(     12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 )
     105pnocorsikawe=(   20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 )
     106pnocereswe=(     15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 )
     107pnocprunwe=(     15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 )
    108108pnocallistowe=(  32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 )
    109109pnostarwe=(      10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 )
    110110
    111111# set variables for jobmanager
    112 scripts=( "runcorsika" )
    113 scriptscolname=( "Corsika" )
    114 pnosweek=( ${pnocorsika[@]} )
    115 pnoswe=( ${pnocorsikawe[@]} )
     112scripts=( "runcorsika" "runceres" )
     113scriptscolname=( "Corsika" "Ceres" )
     114pnosweek=( ${pnocorsika[@]} ${pnoceres[@]} )
     115pnoswe=( ${pnocorsikawe[@]} ${pnocereswe[@]} )
    116116

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

    r9592 r9593  
    500500   query=" UPDATE "$step"Status "
    501501   # add joins to the influenced tables
     502   stepspecialjoin=""
    502503   for influence in $influences
    503504   do
    504       # make sure that the right join is done
    505       #   in case the is a 'Join' given for the
    506       #   influenced step, this is added
    507       # otherwise it is checked whether the executed step
    508       #   itself needs a 'Join' (i.e. has different primaries)
    509       #   if yes, the tables are joined with the primaries of the influenced step
    510       #   else with the primaries of the executed step itself
    511       stdjoin=`getjoin $influence`
    512       if ! [ "$stdjoin" = "" ]
     505      inflprims=( `getprimary $influence` )
     506      # make sure that the correct joins are used
     507      # in case the primaries of the step and the influence are
     508      #   the same, the tables are join with these primaries
     509      # otherwise they are joined with the primaries of the influence
     510      if [ "`echo ${inflprims[@]}`" == "`echo ${prims[@]}`" ]
    513511      then
    514          query=$query" "$stdjoin" "
    515       else
    516          stdjoin2=`getjoin $step`
    517          if [ "$stdjoin2" == "" ]
     512         query=$query" LEFT JOIN "$influence"Status USING (${prims[@]}) "
     513      else
     514         prims2=`getprimary $step | sed -e "s/\ //g"`
     515         primstest=`echo ${inflprims[@]} | sed -e "s/\ //g" | sed -e "s/$prims2//g"`
     516         if [ "$primstest" == "`echo ${inflprims[@]} | sed -e "s/\ //g"`" ]
    518517         then
    519             query=$query" LEFT JOIN "$influence"Status USING("`getprimary $influence`") "
     518            if [ "$stepspecialjoin" == "" ]
     519            then
     520               stepspecialjoin=`getspecialjoin $step`
     521               query=$query" "$stepspecialjoin" "
     522            fi
     523            query=$query" LEFT JOIN "$influence"Status USING (${inflprims[@]}) "
    520524         else
    521             query=$query" LEFT JOIN "$influence"Status USING("`getprimary $step`") "
     525            infljoin=`getjoin $influence`
     526            if [ "$infljoin" = "" ]
     527            then
     528               query=$query" LEFT JOIN "$influence"Status USING (${prims[@]}) "
     529            else
     530               query=$query" "$infljoin
     531               # warning: this is a workaround
     532               #  it has to be checked whether it works for all steps
     533               stepspecialjoin="not empty"
     534            fi
    522535         fi
    523536      fi
    … …  
    543556      s=0
    544557   fi
    545    query=$query" "`echo ${prims[0]} | sed -e 's/,//g'`"='${primaries[$s*${#prims[@]}]}'"
     558   query=$query" "$step"Status."`echo ${prims[0]} | sed -e 's/,//g'`"='${primaries[$s*${#prims[@]}]}'"
    546559   for (( j=1 ; j < ${#prims[@]} ; j++ ))
    547560   do
    548       query=$query" AND "`echo ${prims[$j]} | sed -e 's/,//g'`"='${primaries[$s*${#prims[@]}+$j]}' "
     561      query=$query" AND "$step"Status."`echo ${prims[$j]} | sed -e 's/,//g'`"='${primaries[$s*${#prims[@]}+$j]}' "
    549562   done   
    550563   # print query

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

    r9591 r9593  
    22Corsika.Primaries: fRunNumber, fFileNumber
    33Corsika.SpecialJoin: LEFT JOIN CeresInfo USING(fRunNumber, fFileNumber)
     4Corsika.Join: LEFT JOIN CorsikaStatus USING(fRunNumber, fFileNumber)
    45
    56Ceres.Primaries: fRunNumber, fFileNumber, fCeresSetupKEY
    6 Ceres.SpecialJoin: LEFT JOIN CeresInfo USING(fRunNumber, fFileNumber)
     7Ceres.SpecialJoin: LEFT JOIN CeresInfo USING(fRunNumber, fFileNumber, fCeresSetupKEY)
    78Ceres.Join: LEFT JOIN CeresStatus USING(fRunNumber, fFileNumber) LEFT JOIN CeresInfo USING(fRunNumber, fFileNumber, fCeresSetupKEY)
    89Ceres.Needs: Corsika
Note: See TracChangeset for help on using the changeset viewer.