Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 9146) +++ trunk/MagicSoft/Mars/Changelog (revision 9147) @@ -18,4 +18,12 @@ -*-*- END OF LINE -*-*- + + 2008/11/11 Daniela Dorner + + * datacenter/scripts/budb, datacenter/scripts/fillcamera, + datacenter/scripts/mcsequences: + - exchanged vela by variable for host + + 2008/10/29 Thomas Bretz Index: trunk/MagicSoft/Mars/datacenter/scripts/budb =================================================================== --- trunk/MagicSoft/Mars/datacenter/scripts/budb (revision 9146) +++ trunk/MagicSoft/Mars/datacenter/scripts/budb (revision 9147) @@ -64,5 +64,5 @@ # complete databases -if ! mysqldump --host=vela --all-databases -u dump | bzip2 -9 -c >| $zipfile 2>> $logfile +if ! mysqldump --host=$ho --all-databases -u dump | bzip2 -9 -c >| $zipfile 2>> $logfile then printprocesslog "ERROR mysqldump failed " @@ -71,5 +71,5 @@ echo "writing create commands to $command..." >> $logfile 2>&1 # commands to create MyMagic -if ! mysqldump --host=vela --database $dbname -u dump --no-data >| $command 2>> $logfile +if ! mysqldump --host=$ho --database $dbname -u dump --no-data >| $command 2>> $logfile then printprocesslog "ERROR mysqldump failed " Index: trunk/MagicSoft/Mars/datacenter/scripts/fillcamera =================================================================== --- trunk/MagicSoft/Mars/datacenter/scripts/fillcamera (revision 9146) +++ trunk/MagicSoft/Mars/datacenter/scripts/fillcamera (revision 9147) @@ -124,6 +124,6 @@ pquery=" select fRunNumber from MCRunProcessStatus where fFileName=\"$pedfile\" " - crun=`mysql -ss -u $user --password=$pw --host=vela $db -e " $cquery "` - prun=`mysql -ss -u $user --password=$pw --host=vela $db -e " $pquery "` + crun=`mysql -ss -u $user --password=$pw --host=$ho $db -e " $cquery "` + prun=`mysql -ss -u $user --password=$pw --host=$ho $db -e " $pquery "` cnum=`printf %08d $crun` pnum=`printf %08d $prun` @@ -150,9 +150,9 @@ echo "P run already there, do mysql update" >> $scriptlog 2>&1 # continue - mysql -ss -u $user --password=$pw --host=vela $db -e " $pupdate " + mysql -ss -u $user --password=$pw --host=$ho $db -e " $pupdate " else echo "linking P run for epoch $epo" >> $scriptlog 2>&1 ln -sv $pedfile $newpedfile >> $scriptlog 2>&1 - mysql -ss -u $user --password=$pw --host=vela $db -e " $pupdate " + mysql -ss -u $user --password=$pw --host=$ho $db -e " $pupdate " fi @@ -161,9 +161,9 @@ echo "C run already there, do mysql update" >> $scriptlog 2>&1 # continue - mysql -ss -u $user --password=$pw --host=vela $db -e " $cupdate " + mysql -ss -u $user --password=$pw --host=$ho $db -e " $cupdate " else echo "linking C run for epoch $epo" >> $scriptlog 2>&1 ln -sv $calfile $newcalfile >> $scriptlog 2>&1 - mysql -ss -u $user --password=$pw --host=vela $db -e " $cupdate " + mysql -ss -u $user --password=$pw --host=$ho $db -e " $cupdate " fi Index: trunk/MagicSoft/Mars/datacenter/scripts/mcsequences =================================================================== --- trunk/MagicSoft/Mars/datacenter/scripts/mcsequences (revision 9146) +++ trunk/MagicSoft/Mars/datacenter/scripts/mcsequences (revision 9147) @@ -19,5 +19,5 @@ # # Author(s): Daniela Dorner 12/2005 -# Author(s): Daniela Dorner 06/2008 +# Author(s): Daniel Hoehne 06/2008 # # Copyright: MAGIC Software Development, 2000-2008 @@ -103,11 +103,11 @@ do trainupdate=" update MCRunData set fSequenceFirst=\"$firstruntrain\" where fRunNumber=\"$trainrun\" " - mysql -ss -u $user --password=$pw --host=vela $db -e " $trainupdate " + mysql -ss -u $user --password=$pw --host=$ho $db -e " $trainupdate " done trainquery1=" select fSpectrumKEY, fPSFKEY, fAmplFadcKEY, fAtmosphericModelKEY, fObservationModeKEY, fMCParticleKEY, fReflectorVersionKEY, fCorsikaVersionKEY, fCameraVersionKEY, fViewConeAngleOKEY, fAddSpotSizeKEY from MCRunData where fRunNumber=\"$firstruntrain\" " trainquery2=" select sum(fNumEvents), sum(fNumtriggers) from MCRunData where fRunNumber in ($trainruns2) " - trainvalues=`mysql -ss -u $user --password=$pw --host=vela $db -e " $trainquery1 "` - trainvalues2=`mysql -ss -u $user --password=$pw --host=vela $db -e " $trainquery2 "` + trainvalues=`mysql -ss -u $user --password=$pw --host=$ho $db -e " $trainquery1 "` + trainvalues2=`mysql -ss -u $user --password=$pw --host=$ho $db -e " $trainquery2 "` trainspec=`echo $trainvalues | cut -d" " -f1` trainpsf=`echo $trainvalues | cut -d" " -f2` @@ -125,6 +125,6 @@ trainquery3=" select fSequenceFirst from MCSequenceProcessStatus where fSequenceFirst=\"$firstruntrain\" " trainquery4=" select fSequenceFirst from MCSequences where fSequenceFirst=\"$firstruntrain\" " - traincheck3=`mysql -ss -u $user --password=$pw --host=vela $db -e " $trainquery3 "` - traincheck4=`mysql -ss -u $user --password=$pw --host=vela $db -e " $trainquery4 "` + traincheck3=`mysql -ss -u $user --password=$pw --host=$ho $db -e " $trainquery3 "` + traincheck4=`mysql -ss -u $user --password=$pw --host=$ho $db -e " $trainquery4 "` traininsert1=" insert MCSequenceProcessStatus set fSequenceFirst=\"$firstruntrain\", fSequenceFileWritten=Now() " traininsert2=" insert MCSequences set fSequenceFirst=\"$firstruntrain\", fRunStart=\"$date\", fNumEvents=\"$trainevents\", fNumTriggers=\"$traintriggers\", fZBin=\"$zbin\", fSpectrumKEY=\"$trainspec\", fPSFKEY=\"$trainpsf\", fAddSpotSizeKEY=\"$trainass\", fAmplFadcKEY=\"$trainamplfadc\", fAtmosphericModelKEY=\"$trainatmo\", fObservationModeKEY=\"$trainobs\", fMCParticleKEY=\"$trainpart\", fReflectorVersionKEY=\"$trainrefl\", fCorsikaVersionKEY=\"$traincors\", fCameraVersionKEY=\"$traincam\", fViewConeAngleOKEY=\"$trainview\", fTestTrainKEY=2 " @@ -132,11 +132,11 @@ if [ "$traincheck3" == "" ] then - mysql -ss -u $user --password=$pw --host=vela $db -e " $traininsert1 " + mysql -ss -u $user --password=$pw --host=$ho $db -e " $traininsert1 " fi if [ "$traincheck4" == "" ] then - mysql -ss -u $user --password=$pw --host=vela $db -e " $traininsert2 " + mysql -ss -u $user --password=$pw --host=$ho $db -e " $traininsert2 " else - mysql -ss -u $user --password=$pw --host=vela $db -e " $trainupdate2 " + mysql -ss -u $user --password=$pw --host=$ho $db -e " $trainupdate2 " fi @@ -166,11 +166,11 @@ do testupdate=" update MCRunData set fSequenceFirst=\"$firstruntest\" where fRunNumber=\"$testrun\" " - mysql -ss -u $user --password=$pw --host=vela $db -e " $testupdate " + mysql -ss -u $user --password=$pw --host=$ho $db -e " $testupdate " done testquery1=" select fSpectrumKEY, fPSFKEY, fAmplFadcKEY, fAtmosphericModelKEY, fObservationModeKEY, fMCParticleKEY, fReflectorVersionKEY, fCorsikaVersionKEY, fCameraVersionKEY, fViewConeAngleOKEY, fAddSpotSizeKEY from MCRunData where fRunNumber=\"$firstruntest\" " testquery2=" select sum(fNumEvents), sum(fNumtriggers) from MCRunData where fRunNumber in ($testruns2) " - testvalues=`mysql -ss -u $user --password=$pw --host=vela $db -e " $testquery1 "` - testvalues2=`mysql -ss -u $user --password=$pw --host=vela $db -e " $testquery2 "` + testvalues=`mysql -ss -u $user --password=$pw --host=$ho $db -e " $testquery1 "` + testvalues2=`mysql -ss -u $user --password=$pw --host=$ho $db -e " $testquery2 "` testspec=`echo $testvalues | cut -d" " -f1` testpsf=`echo $testvalues | cut -d" " -f2` @@ -188,6 +188,6 @@ testquery3=" select fSequenceFirst from MCSequenceProcessStatus where fSequenceFirst=\"$firstruntest\" " testquery4=" select fSequenceFirst from MCSequences where fSequenceFirst=\"$firstruntest\" " - testcheck3=`mysql -ss -u $user --password=$pw --host=vela $db -e " $testquery3 "` - testcheck4=`mysql -ss -u $user --password=$pw --host=vela $db -e " $testquery4 "` + testcheck3=`mysql -ss -u $user --password=$pw --host=$ho $db -e " $testquery3 "` + testcheck4=`mysql -ss -u $user --password=$pw --host=$ho $db -e " $testquery4 "` testinsert1=" insert MCSequenceProcessStatus set fSequenceFirst=\"$firstruntest\", fSequenceFileWritten=Now() " testinsert2=" insert MCSequences set fSequenceFirst=\"$firstruntest\", fRunStart=\"$date\", fNumEvents=\"$testevents\", fNumTriggers=\"$testtriggers\", fZBin=\"$zbin\", fSpectrumKEY=\"$testspec\", fPSFKEY=\"$testpsf\", fAddSpotSizeKEY=\"$testass\", fAmplFadcKEY=\"$testamplfadc\", fAtmosphericModelKEY=\"$testatmo\", fObservationModeKEY=\"$testobs\", fMCParticleKEY=\"$testpart\", fReflectorVersionKEY=\"$testrefl\", fCorsikaVersionKEY=\"$testcors\", fCameraVersionKEY=\"$testcam\", fViewConeAngleOKEY=\"$testview\", fTestTrainKEY=3 " @@ -195,11 +195,11 @@ if [ "$testcheck3" == "" ] then - mysql -ss -u $user --password=$pw --host=vela $db -e " $testinsert1 " + mysql -ss -u $user --password=$pw --host=$ho $db -e " $testinsert1 " fi if [ "$testcheck4" == "" ] then - mysql -ss -u $user --password=$pw --host=vela $db -e " $testinsert2 " + mysql -ss -u $user --password=$pw --host=$ho $db -e " $testinsert2 " else - mysql -ss -u $user --password=$pw --host=vela $db -e " $testupdate2 " + mysql -ss -u $user --password=$pw --host=$ho $db -e " $testupdate2 " fi