Changeset 9408 for trunk/MagicSoft


Ignore:
Timestamp:
03/19/09 08:55:23 (16 years ago)
Author:
hoehne
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r9402 r9408  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20 2009/03/19 Daniel Hoehne-Moench
     21
     22   * datacenter/scropts/mcsequences:
     23     - bugfix: replaced $user by $us
     24     - bugfix: fPriority is now inserted into the correct table
     25
     26
     27
    2028 2009/03/16 Thomas Bretz
    2129
  • trunk/MagicSoft/Mars/datacenter/scripts/mcsequences

    r9355 r9408  
    9595            do
    9696               trainupdate=" update MCRunData set fSequenceFirst=\"$firstruntrain\" where fRunNumber=\"$trainrun\" "
    97                mysql -ss -u $user --password=$pw --host=$ho $db -e " $trainupdate "
     97               mysql -ss -u $us --password=$pw --host=$ho $db -e " $trainupdate "
    9898            done   
    9999
    100100            trainquery1=" select fSpectrumKEY, fPSFKEY, fAmplFadcKEY, fAtmosphericModelKEY, fObservationModeKEY, fMCParticleKEY, fReflectorVersionKEY, fCorsikaVersionKEY, fCameraVersionKEY, fViewConeAngleOKEY, fAddSpotSizeKEY, fTriggerFlagKEY from MCRunData where fRunNumber=\"$firstruntrain\" "
    101101            trainquery2=" select sum(fNumEvents), sum(fNumTriggers), sum(fNumSumTriggers) from MCRunData where fRunNumber in ($trainruns2) "
    102             trainvalues=`mysql -ss -u $user --password=$pw --host=$ho $db -e " $trainquery1 "`
    103             trainvalues2=`mysql -ss -u $user --password=$pw --host=$ho $db -e " $trainquery2 "`
     102            trainvalues=`mysql -ss -u $us --password=$pw --host=$ho $db -e " $trainquery1 "`
     103            trainvalues2=`mysql -ss -u $us --password=$pw --host=$ho $db -e " $trainquery2 "`
    104104            trainspec=`echo $trainvalues | cut -d" " -f1`
    105105            trainpsf=`echo $trainvalues | cut -d" " -f2`
     
    119119            trainquery3=" select fSequenceFirst from MCSequenceProcessStatus where fSequenceFirst=\"$firstruntrain\" "
    120120            trainquery4=" select fSequenceFirst from MCSequences where fSequenceFirst=\"$firstruntrain\" "
    121             traincheck3=`mysql -ss -u $user --password=$pw --host=$ho $db -e " $trainquery3 "`
    122             traincheck4=`mysql -ss -u $user --password=$pw --host=$ho $db -e " $trainquery4 "`
    123             traininsert1=" insert MCSequenceProcessStatus set fSequenceFirst=\"$firstruntrain\", fSequenceFileWritten=Now() "
    124             traininsert2=" insert MCSequences set fSequenceFirst=\"$firstruntrain\", fPriority=\"$firstruntrain\", fRunStart=\"$date\", fNumEvents=\"$trainevents\", fNumTriggers=\"$traintriggers\", fNumSumTriggers=\"$trainsumtriggers\", fZBin=\"$zbin\", fSpectrumKEY=\"$trainspec\", fPSFKEY=\"$trainpsf\", fAddSpotSizeKEY=\"$trainass\", fAmplFadcKEY=\"$trainamplfadc\", fAtmosphericModelKEY=\"$trainatmo\", fObservationModeKEY=\"$trainobs\", fMCParticleKEY=\"$trainpart\", fReflectorVersionKEY=\"$trainrefl\", fCorsikaVersionKEY=\"$traincors\", fCameraVersionKEY=\"$traincam\", fViewConeAngleOKEY=\"$trainview\", fTriggerFlagKEY=\"$traintrig\", fTestTrainKEY=2 "
     121            traincheck3=`mysql -ss -u $us --password=$pw --host=$ho $db -e " $trainquery3 "`
     122            traincheck4=`mysql -ss -u $us --password=$pw --host=$ho $db -e " $trainquery4 "`
     123            traininsert1=" insert MCSequenceProcessStatus set fSequenceFirst=\"$firstruntrain\", fPriority=\"$firstruntrain\", fSequenceFileWritten=Now() "
     124            traininsert2=" insert MCSequences set fSequenceFirst=\"$firstruntrain\", fRunStart=\"$date\", fNumEvents=\"$trainevents\", fNumTriggers=\"$traintriggers\", fNumSumTriggers=\"$trainsumtriggers\", fZBin=\"$zbin\", fSpectrumKEY=\"$trainspec\", fPSFKEY=\"$trainpsf\", fAddSpotSizeKEY=\"$trainass\", fAmplFadcKEY=\"$trainamplfadc\", fAtmosphericModelKEY=\"$trainatmo\", fObservationModeKEY=\"$trainobs\", fMCParticleKEY=\"$trainpart\", fReflectorVersionKEY=\"$trainrefl\", fCorsikaVersionKEY=\"$traincors\", fCameraVersionKEY=\"$traincam\", fViewConeAngleOKEY=\"$trainview\", fTriggerFlagKEY=\"$traintrig\", fTestTrainKEY=2 "
    125125            trainupdate2=" update MCSequences set fRunStart=\"$date\", fNumEvents=\"$trainevents\", fNumTriggers=\"$traintriggers\", fNumSumTriggers=\"$trainsumtriggers\", fZBin=\"$zbin\", fSpectrumKEY=\"$trainspec\", fPSFKEY=\"$trainpsf\", fAddSpotSizeKEY=\"$trainass\", fAmplFadcKEY=\"$trainamplfadc\", fAtmosphericModelKEY=\"$trainatmo\", fObservationModeKEY=\"$trainobs\", fMCParticleKEY=\"$trainpart\", fReflectorVersionKEY=\"$trainrefl\", fCorsikaVersionKEY=\"$traincors\", fCameraVersionKEY=\"$traincam\", fViewConeAngleOKEY=\"$trainview\", fTriggerFlagKEY=\"$traintrig\", fTestTrainKEY=2 where fSequenceFirst=\"$firstruntrain\" "
    126126            if [ "$traincheck3" == "" ]
    127127            then
    128                mysql -ss -u $user --password=$pw --host=$ho $db -e " $traininsert1 "
     128               mysql -ss -u $us --password=$pw --host=$ho $db -e " $traininsert1 "
    129129            fi
    130130            if [ "$traincheck4" == "" ]
    131131            then
    132                mysql -ss -u $user --password=$pw --host=$ho $db -e " $traininsert2 "
     132               mysql -ss -u $us --password=$pw --host=$ho $db -e " $traininsert2 "
    133133            else
    134                mysql -ss -u $user --password=$pw --host=$ho $db -e " $trainupdate2 "
     134               mysql -ss -u $us --password=$pw --host=$ho $db -e " $trainupdate2 "
    135135            fi
    136136           
     
    159159            do
    160160               testupdate=" update MCRunData set fSequenceFirst=\"$firstruntest\" where fRunNumber=\"$testrun\" "
    161                mysql -ss -u $user --password=$pw --host=$ho $db -e " $testupdate "
     161               mysql -ss -u $us --password=$pw --host=$ho $db -e " $testupdate "
    162162            done   
    163163
    164164            testquery1=" select fSpectrumKEY, fPSFKEY, fAmplFadcKEY, fAtmosphericModelKEY, fObservationModeKEY, fMCParticleKEY, fReflectorVersionKEY, fCorsikaVersionKEY, fCameraVersionKEY, fViewConeAngleOKEY, fAddSpotSizeKEY, fTriggerFlagKEY from MCRunData where fRunNumber=\"$firstruntest\" "
    165165            testquery2=" select sum(fNumEvents), sum(fNumTriggers), sum(fNumSumTriggers) from MCRunData where fRunNumber in ($testruns2) "
    166             testvalues=`mysql -ss -u $user --password=$pw --host=$ho $db -e " $testquery1 "`
    167             testvalues2=`mysql -ss -u $user --password=$pw --host=$ho $db -e " $testquery2 "`
     166            testvalues=`mysql -ss -u $us --password=$pw --host=$ho $db -e " $testquery1 "`
     167            testvalues2=`mysql -ss -u $us --password=$pw --host=$ho $db -e " $testquery2 "`
    168168            testspec=`echo $testvalues | cut -d" " -f1`
    169169            testpsf=`echo $testvalues | cut -d" " -f2`
     
    183183            testquery3=" select fSequenceFirst from MCSequenceProcessStatus where fSequenceFirst=\"$firstruntest\" "
    184184            testquery4=" select fSequenceFirst from MCSequences where fSequenceFirst=\"$firstruntest\" "
    185             testcheck3=`mysql -ss -u $user --password=$pw --host=$ho $db -e " $testquery3 "`
    186             testcheck4=`mysql -ss -u $user --password=$pw --host=$ho $db -e " $testquery4 "`
    187             testinsert1=" insert MCSequenceProcessStatus set fSequenceFirst=\"$firstruntest\", fSequenceFileWritten=Now() "
    188             testinsert2=" insert MCSequences set fSequenceFirst=\"$firstruntest\", fPriority=\"$firstruntest\", fRunStart=\"$date\", fNumEvents=\"$testevents\", fNumTriggers=\"$testtriggers\", fNumSumTriggers=\"$testsumtriggers\", fZBin=\"$zbin\", fSpectrumKEY=\"$testspec\", fPSFKEY=\"$testpsf\", fAddSpotSizeKEY=\"$testass\", fAmplFadcKEY=\"$testamplfadc\", fAtmosphericModelKEY=\"$testatmo\", fObservationModeKEY=\"$testobs\", fMCParticleKEY=\"$testpart\", fReflectorVersionKEY=\"$testrefl\", fCorsikaVersionKEY=\"$testcors\", fCameraVersionKEY=\"$testcam\", fViewConeAngleOKEY=\"$testview\", fTriggerFlagKEY=\"$testtrig\", fTestTrainKEY=3 "
     185            testcheck3=`mysql -ss -u $us --password=$pw --host=$ho $db -e " $testquery3 "`
     186            testcheck4=`mysql -ss -u $us --password=$pw --host=$ho $db -e " $testquery4 "`
     187            testinsert1=" insert MCSequenceProcessStatus set fSequenceFirst=\"$firstruntest\", fPriority=\"$firstruntest\", fSequenceFileWritten=Now() "
     188            testinsert2=" insert MCSequences set fSequenceFirst=\"$firstruntest\", fRunStart=\"$date\", fNumEvents=\"$testevents\", fNumTriggers=\"$testtriggers\", fNumSumTriggers=\"$testsumtriggers\", fZBin=\"$zbin\", fSpectrumKEY=\"$testspec\", fPSFKEY=\"$testpsf\", fAddSpotSizeKEY=\"$testass\", fAmplFadcKEY=\"$testamplfadc\", fAtmosphericModelKEY=\"$testatmo\", fObservationModeKEY=\"$testobs\", fMCParticleKEY=\"$testpart\", fReflectorVersionKEY=\"$testrefl\", fCorsikaVersionKEY=\"$testcors\", fCameraVersionKEY=\"$testcam\", fViewConeAngleOKEY=\"$testview\", fTriggerFlagKEY=\"$testtrig\", fTestTrainKEY=3 "
    189189            testupdate2=" update MCSequences set fRunStart=\"$date\", fNumEvents=\"$testevents\", fNumTriggers=\"$testtriggers\", fNumSumTriggers=\"$testsumtriggers\", fZBin=\"$zbin\", fSpectrumKEY=\"$testspec\", fPSFKEY=\"$testpsf\", fAddSpotSizeKEY=\"$testass\", fAmplFadcKEY=\"$testamplfadc\", fAtmosphericModelKEY=\"$testatmo\", fObservationModeKEY=\"$testobs\", fMCParticleKEY=\"$testpart\", fReflectorVersionKEY=\"$testrefl\", fCorsikaVersionKEY=\"$testcors\", fCameraVersionKEY=\"$testcam\", fViewConeAngleOKEY=\"$testview\", fTriggerFlagKEY=\"$testtrig\", fTestTrainKEY=3 where fSequenceFirst=\"$firstruntest\" "
    190190            if [ "$testcheck3" == "" ]
    191191            then
    192                mysql -ss -u $user --password=$pw --host=$ho $db -e " $testinsert1 "
     192               mysql -ss -u $us --password=$pw --host=$ho $db -e " $testinsert1 "
    193193            fi
    194194            if [ "$testcheck4" == "" ]
    195195            then
    196                mysql -ss -u $user --password=$pw --host=$ho $db -e " $testinsert2 "
     196               mysql -ss -u $us --password=$pw --host=$ho $db -e " $testinsert2 "
    197197            else
    198                mysql -ss -u $user --password=$pw --host=$ho $db -e " $testupdate2 "
     198               mysql -ss -u $us --password=$pw --host=$ho $db -e " $testupdate2 "
    199199            fi
    200200           
Note: See TracChangeset for help on using the changeset viewer.