Changeset 9474 for trunk/MagicSoft
- Timestamp:
- 07/04/09 18:32:27 (15 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r9473 r9474 18 18 19 19 -*-*- 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 20 28 21 29 2009/07/02 Thomas Bretz -
trunk/MagicSoft/Mars/datacenter/db/ctadefs.php
r9454 r9474 3 3 $needs = array 4 4 ( 5 "fCorsikaSim telArray" => "MCRunProcessStatus.fMCRunNumber",6 "fChimp" => "MCRunProcessStatus.fCorsikaSim telArray",5 "fCorsikaSimTelarray" => "MCRunProcessStatus.fMCRunNumber", 6 "fChimp" => "MCRunProcessStatus.fCorsikaSimTelarray", 7 7 "fCTAStar" => "MCRunProcessStatus.fChimp", 8 8 "fStereoB" => "MCRunProcessStatus.fCTAStar", … … 14 14 $timelimits = array 15 15 ( 16 "fCorsikaSim telArray" => "30",16 "fCorsikaSimTelarray" => "30", 17 17 "fChimp" => "4", 18 18 "fCTAStar" => "2", … … 36 36 $checkstatusgroup = array 37 37 ( 38 "fCorsikaSim telArray" => CheckStatusGroup("fCorsikaSimtelArrayStatus", $_GET),38 "fCorsikaSimTelarray" => CheckStatusGroup("fCorsikaSimTelarrayStatus", $_GET), 39 39 "fChimp" => CheckStatusGroup("fChimpStatus", $_GET), 40 40 "fCTAStar" => CheckStatusGroup("fCTAStarStatus", $_GET), … … 53 53 "SUM(fNumEvents)" => "Evts", 54 54 "fParticleTypeName" => "Particle", 55 "fCorsikaSim telArray" => "CorsikaSimtel",55 "fCorsikaSimTelarray" => "CorsikaSimtel", 56 56 "fChimp" => "Chimp", 57 57 "fCTAStar" => "Star", -
trunk/MagicSoft/Mars/datacenter/db/ctamcinfo.php
r9454 r9474 105 105 $query0 .= " AND "; 106 106 107 $query0 .= StatusQuery("fCorsikaSim telArray", $needs);107 $query0 .= StatusQuery("fCorsikaSimTelarray", $needs); 108 108 $query0 .= StatusQuery("fChimp", $needs); 109 109 $query0 .= StatusQuery("fCTAStar", $needs); -
trunk/MagicSoft/Mars/datacenter/db/menu.php
r9453 r9474 24 24 printf(" <tr><td>\n"); 25 25 26 PrintStatusMenu("fCorsikaSim telArray", "Corsika and Simtel");26 PrintStatusMenu("fCorsikaSimTelarray", "Corsika and Simtel"); 27 27 printf(" </td><td>\n"); 28 28 PrintStatusMenu("fChimp", "Chimp"); … … 1339 1339 function InitCTAMCRunStatus($_GET, $first) 1340 1340 { 1341 if (empty($_GET["fCorsikaSim telArray"]))1342 $_GET["fCorsikaSim telArray"]="Off";1343 1344 if (empty($_GET["fCorsikaSim telArrayStatus"]))1345 $_GET["fCorsikaSim telArrayStatus"]="0";1341 if (empty($_GET["fCorsikaSimTelarray"])) 1342 $_GET["fCorsikaSimTelarray"]="Off"; 1343 1344 if (empty($_GET["fCorsikaSimTelarrayStatus"])) 1345 $_GET["fCorsikaSimTelarrayStatus"]="0"; 1346 1346 1347 1347 if (empty($_GET["fChimp"])) … … 1392 1392 $_GET["fParticleTypeName"]="On"; 1393 1393 1394 if (empty($_GET["fCorsikaSim telArray"]))1395 $_GET["fCorsikaSim telArray"]="Off";1394 if (empty($_GET["fCorsikaSimTelarray"])) 1395 $_GET["fCorsikaSimTelarray"]="Off"; 1396 1396 1397 1397 if (empty($_GET["fChimp"])) -
trunk/MagicSoft/Mars/datacenter/scripts/jobmanager
r9457 r9474 57 57 ctamc) echo "running jobmanager for cta mc" >> $jmscriptlog 2>&1 58 58 scripts=( "runsimtel" ) 59 scriptscolname=( "fCorsikaSim telArray" )59 scriptscolname=( "fCorsikaSimTelarray" ) 60 60 pnosweek=( ${pnosimtel[@]} ) 61 61 pnoswe=( ${pnosimtelwe[@]} ) 62 62 break 63 63 ;; 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" 66 67 finish >> $jmscriptlog 2>&1 67 68 break
Note:
See TracChangeset
for help on using the changeset viewer.