Changeset 9474 for trunk/MagicSoft


Ignore:
Timestamp:
07/04/09 18:32:27 (15 years ago)
Author:
Daniela Dorner
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r9473 r9474  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20
     21 2009/07/04 Daniela Dorner
     22
     23   * datacenter/db/ctamcinfo.php, datacenter/db/ctadefs.php,
     24     datacenter/db/menu.php, datacenter/scripts/jobmanager:
     25     - changed fCorsikaSimtelArray to fCorsikaSimTelarray
     26
     27
    2028
    2129 2009/07/02 Thomas Bretz
  • trunk/MagicSoft/Mars/datacenter/db/ctadefs.php

    r9454 r9474  
    33$needs = array
    44    (
    5      "fCorsikaSimtelArray"   => "MCRunProcessStatus.fMCRunNumber",
    6      "fChimp"                => "MCRunProcessStatus.fCorsikaSimtelArray",
     5     "fCorsikaSimTelarray"   => "MCRunProcessStatus.fMCRunNumber",
     6     "fChimp"                => "MCRunProcessStatus.fCorsikaSimTelarray",
    77     "fCTAStar"              => "MCRunProcessStatus.fChimp",
    88     "fStereoB"              => "MCRunProcessStatus.fCTAStar",
     
    1414$timelimits = array
    1515    (
    16      "fCorsikaSimtelArray"   => "30",
     16     "fCorsikaSimTelarray"   => "30",
    1717     "fChimp"                => "4",
    1818     "fCTAStar"              => "2",
     
    3636$checkstatusgroup = array
    3737    (
    38      "fCorsikaSimtelArray" => CheckStatusGroup("fCorsikaSimtelArrayStatus", $_GET),
     38     "fCorsikaSimTelarray" => CheckStatusGroup("fCorsikaSimTelarrayStatus", $_GET),
    3939     "fChimp"              => CheckStatusGroup("fChimpStatus",              $_GET),
    4040     "fCTAStar"            => CheckStatusGroup("fCTAStarStatus",            $_GET),
     
    5353     "SUM(fNumEvents)"       => "Evts",
    5454     "fParticleTypeName"     => "Particle",
    55      "fCorsikaSimtelArray"   => "CorsikaSimtel",
     55     "fCorsikaSimTelarray"   => "CorsikaSimtel",
    5656     "fChimp"                => "Chimp",
    5757     "fCTAStar"              => "Star",
  • trunk/MagicSoft/Mars/datacenter/db/ctamcinfo.php

    r9454 r9474  
    105105            $query0 .= " AND ";
    106106
    107         $query0 .= StatusQuery("fCorsikaSimtelArray", $needs);
     107        $query0 .= StatusQuery("fCorsikaSimTelarray", $needs);
    108108        $query0 .= StatusQuery("fChimp", $needs);
    109109        $query0 .= StatusQuery("fCTAStar", $needs);
  • trunk/MagicSoft/Mars/datacenter/db/menu.php

    r9453 r9474  
    2424    printf("  <tr><td>\n");
    2525
    26     PrintStatusMenu("fCorsikaSimtelArray",    "Corsika and Simtel");
     26    PrintStatusMenu("fCorsikaSimTelarray",    "Corsika and Simtel");
    2727    printf("  </td><td>\n");
    2828    PrintStatusMenu("fChimp",   "Chimp");
     
    13391339function InitCTAMCRunStatus($_GET, $first)
    13401340{
    1341     if (empty($_GET["fCorsikaSimtelArray"]))
    1342         $_GET["fCorsikaSimtelArray"]="Off";
    1343 
    1344     if (empty($_GET["fCorsikaSimtelArrayStatus"]))
    1345         $_GET["fCorsikaSimtelArrayStatus"]="0";
     1341    if (empty($_GET["fCorsikaSimTelarray"]))
     1342        $_GET["fCorsikaSimTelarray"]="Off";
     1343
     1344    if (empty($_GET["fCorsikaSimTelarrayStatus"]))
     1345        $_GET["fCorsikaSimTelarrayStatus"]="0";
    13461346
    13471347    if (empty($_GET["fChimp"]))
     
    13921392        $_GET["fParticleTypeName"]="On";
    13931393
    1394     if (empty($_GET["fCorsikaSimtelArray"]))
    1395         $_GET["fCorsikaSimtelArray"]="Off";
     1394    if (empty($_GET["fCorsikaSimTelarray"]))
     1395        $_GET["fCorsikaSimTelarray"]="Off";
    13961396
    13971397    if (empty($_GET["fChimp"]))
  • trunk/MagicSoft/Mars/datacenter/scripts/jobmanager

    r9457 r9474  
    5757  ctamc) echo "running jobmanager for cta mc" >> $jmscriptlog 2>&1
    5858         scripts=( "runsimtel" )
    59          scriptscolname=( "fCorsikaSimtelArray" )
     59         scriptscolname=( "fCorsikaSimTelarray" )
    6060         pnosweek=( ${pnosimtel[@]} )
    6161         pnoswe=( ${pnosimtelwe[@]} )
    6262         break
    6363         ;;
    64       *) echo "$1 is a wrong commandline option for jobmanager -> exit" >> $jmscriptlog 2>&1
    65          printprocesslog "WARN $1 is wrong commandline option for jobmanager"
     64      *) echo "'$1' is a wrong commandline option for jobmanager -> exit" >> $jmscriptlog 2>&1
     65         echo "'$1' is a wrong commandline option for jobmanager -> exit"
     66         printprocesslog "WARN '$1' is a wrong commandline option for jobmanager"
    6667         finish >> $jmscriptlog 2>&1
    6768         break
Note: See TracChangeset for help on using the changeset viewer.