Changeset 9408 for trunk/MagicSoft
- Timestamp:
- 03/19/09 08:55:23 (16 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r9402 r9408 18 18 19 19 -*-*- 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 20 28 2009/03/16 Thomas Bretz 21 29 -
trunk/MagicSoft/Mars/datacenter/scripts/mcsequences
r9355 r9408 95 95 do 96 96 trainupdate=" update MCRunData set fSequenceFirst=\"$firstruntrain\" where fRunNumber=\"$trainrun\" " 97 mysql -ss -u $us er--password=$pw --host=$ho $db -e " $trainupdate "97 mysql -ss -u $us --password=$pw --host=$ho $db -e " $trainupdate " 98 98 done 99 99 100 100 trainquery1=" select fSpectrumKEY, fPSFKEY, fAmplFadcKEY, fAtmosphericModelKEY, fObservationModeKEY, fMCParticleKEY, fReflectorVersionKEY, fCorsikaVersionKEY, fCameraVersionKEY, fViewConeAngleOKEY, fAddSpotSizeKEY, fTriggerFlagKEY from MCRunData where fRunNumber=\"$firstruntrain\" " 101 101 trainquery2=" select sum(fNumEvents), sum(fNumTriggers), sum(fNumSumTriggers) from MCRunData where fRunNumber in ($trainruns2) " 102 trainvalues=`mysql -ss -u $us er--password=$pw --host=$ho $db -e " $trainquery1 "`103 trainvalues2=`mysql -ss -u $us er--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 "` 104 104 trainspec=`echo $trainvalues | cut -d" " -f1` 105 105 trainpsf=`echo $trainvalues | cut -d" " -f2` … … 119 119 trainquery3=" select fSequenceFirst from MCSequenceProcessStatus where fSequenceFirst=\"$firstruntrain\" " 120 120 trainquery4=" select fSequenceFirst from MCSequences where fSequenceFirst=\"$firstruntrain\" " 121 traincheck3=`mysql -ss -u $us er--password=$pw --host=$ho $db -e " $trainquery3 "`122 traincheck4=`mysql -ss -u $us er--password=$pw --host=$ho $db -e " $trainquery4 "`123 traininsert1=" insert MCSequenceProcessStatus set fSequenceFirst=\"$firstruntrain\", f SequenceFileWritten=Now() "124 traininsert2=" insert MCSequences set fSequenceFirst=\"$firstruntrain\", f Priority=\"$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 " 125 125 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\" " 126 126 if [ "$traincheck3" == "" ] 127 127 then 128 mysql -ss -u $us er--password=$pw --host=$ho $db -e " $traininsert1 "128 mysql -ss -u $us --password=$pw --host=$ho $db -e " $traininsert1 " 129 129 fi 130 130 if [ "$traincheck4" == "" ] 131 131 then 132 mysql -ss -u $us er--password=$pw --host=$ho $db -e " $traininsert2 "132 mysql -ss -u $us --password=$pw --host=$ho $db -e " $traininsert2 " 133 133 else 134 mysql -ss -u $us er--password=$pw --host=$ho $db -e " $trainupdate2 "134 mysql -ss -u $us --password=$pw --host=$ho $db -e " $trainupdate2 " 135 135 fi 136 136 … … 159 159 do 160 160 testupdate=" update MCRunData set fSequenceFirst=\"$firstruntest\" where fRunNumber=\"$testrun\" " 161 mysql -ss -u $us er--password=$pw --host=$ho $db -e " $testupdate "161 mysql -ss -u $us --password=$pw --host=$ho $db -e " $testupdate " 162 162 done 163 163 164 164 testquery1=" select fSpectrumKEY, fPSFKEY, fAmplFadcKEY, fAtmosphericModelKEY, fObservationModeKEY, fMCParticleKEY, fReflectorVersionKEY, fCorsikaVersionKEY, fCameraVersionKEY, fViewConeAngleOKEY, fAddSpotSizeKEY, fTriggerFlagKEY from MCRunData where fRunNumber=\"$firstruntest\" " 165 165 testquery2=" select sum(fNumEvents), sum(fNumTriggers), sum(fNumSumTriggers) from MCRunData where fRunNumber in ($testruns2) " 166 testvalues=`mysql -ss -u $us er--password=$pw --host=$ho $db -e " $testquery1 "`167 testvalues2=`mysql -ss -u $us er--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 "` 168 168 testspec=`echo $testvalues | cut -d" " -f1` 169 169 testpsf=`echo $testvalues | cut -d" " -f2` … … 183 183 testquery3=" select fSequenceFirst from MCSequenceProcessStatus where fSequenceFirst=\"$firstruntest\" " 184 184 testquery4=" select fSequenceFirst from MCSequences where fSequenceFirst=\"$firstruntest\" " 185 testcheck3=`mysql -ss -u $us er--password=$pw --host=$ho $db -e " $testquery3 "`186 testcheck4=`mysql -ss -u $us er--password=$pw --host=$ho $db -e " $testquery4 "`187 testinsert1=" insert MCSequenceProcessStatus set fSequenceFirst=\"$firstruntest\", f SequenceFileWritten=Now() "188 testinsert2=" insert MCSequences set fSequenceFirst=\"$firstruntest\", f Priority=\"$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 " 189 189 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\" " 190 190 if [ "$testcheck3" == "" ] 191 191 then 192 mysql -ss -u $us er--password=$pw --host=$ho $db -e " $testinsert1 "192 mysql -ss -u $us --password=$pw --host=$ho $db -e " $testinsert1 " 193 193 fi 194 194 if [ "$testcheck4" == "" ] 195 195 then 196 mysql -ss -u $us er--password=$pw --host=$ho $db -e " $testinsert2 "196 mysql -ss -u $us --password=$pw --host=$ho $db -e " $testinsert2 " 197 197 else 198 mysql -ss -u $us er--password=$pw --host=$ho $db -e " $testupdate2 "198 mysql -ss -u $us --password=$pw --host=$ho $db -e " $testupdate2 " 199 199 fi 200 200
Note:
See TracChangeset
for help on using the changeset viewer.