Changeset 9491 for trunk/MagicSoft

Timestamp:

08/14/09 17:01:45 (15 years ago)

Author:

hoehne

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/scripts/mcsequences (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2009/08/14 Daniel Hoehne-Moench
+
+   * datacenter/scripts/mcsequences:
+     - included display of azimuth range in sequence file
+     - changed sequencing to one sequence per mc run
+
+
 
  2009/08/13 Thomas Bretz

trunk/MagicSoft/Mars/datacenter/scripts/mcsequences

@@ -19 +19 @@
 #
 #   Author(s): Daniela Dorner  12/2005 <mailto:dorner@astro.uni-wuerzburg.de>
-#   Author(s): Daniel Hoehne-Moench  01/2009 <mailto:hoehne@astro.uni-wuerzburg.de>
+#   Author(s): Daniel Hoehne-Moench  08/2009 <mailto:hoehne@astro.uni-wuerzburg.de>
 #
 #   Copyright: MAGIC Software Development, 2000-2009
@@ -26 +26 @@
 # ========================================================================
 #
-# The script is building two sequences per directory and epoch. One for
-# training and one for testing. The relevant parameters are taken from
-# the MC database.
+# The script is building one sequence per mc run. The relevant parameters 
+# are taken from the MC database.
 # 
 
@@ -41 +40 @@
 checklock 
                                               
-# find montecarlo directories, build two sequences per directory and write sequence files
-printprocesslog "INFO building two sequences per mcdirectory and epoch, one for training and one for testing"
+# find montecarlo directories, build one sequence per run
+printprocesslog "INFO building one sequence per run"
 
 getdbsetup
@@ -57 +56 @@
    printprocesslog "INFO dir: "$dir 
    
-   epochs=`ls -l $mcpath/camera | cut -c 52-80`
+   epochs=`ls -l $mcpath/camera | cut -d' ' -f8`
    for epoch in ${epochs[@]}
    do
       printprocesslog "INFO epoch: "$epoch 
+
       calfile=`find $dir -lname *${epoch}/*.root | grep "_C_"`
       pedfile=`find $dir -lname *${epoch}/*.root | grep "_P_"`
-      
       calrun=`echo $calfile | cut -d_ -f2`
       pedrun=`echo $pedfile | cut -d_ -f2`
@@ -71 +70 @@
       do
          datruns=`find $dir -lname *${epoch}/*.root | grep ${mode}_ | grep "_D_" | cut -d_ -f2 | tr "\n" " "`
-         if [ "$datruns" != "" ]
+         if [ "$datruns" != "" ]
          then
-            num=`echo $datruns | wc -w`
-            train=`expr $num / 5`
-            test=`expr $num - $train`
-            last=`expr $num \* 9`
-            train2=`expr $train \* 9`
-            firstrun=`echo $datruns | cut -c 0-8`
-            trainruns=`echo $datruns | cut -c 0-$train2`
-            trainruns2=`echo $trainruns | sed -e 's/ /,/g'`
-            testruns=`echo $datruns | cut -c $train2-$last`
-            testruns2=`echo $testruns | sed -e 's/ /,/g'`
-            firstruntrain=`echo $trainruns | cut -c 0-8`
-            firstruntest=`echo $testruns | cut -c 0-8`
-
             date=`echo $dir | cut -c 28-37 | sed -e 's/\//-/g'`
             #date=`echo $dir | cut -c 57-66 | sed -e 's/\//-/g'`
             zbin=`echo $date | cut -c 3,4`
+         
+            for datrun in ${datruns[@]}
+            do
+               query1=" select fSpectrumKEY, fPSFKEY, fAmplFadcKEY, fAtmosphericModelKEY, fObservationModeKEY, fMCParticleKEY, fReflectorVersionKEY, fCorsikaVersionKEY, fCameraVersionKEY, fViewConeAngleOKEY, fAddSpotSizeKEY, fTriggerFlagKEY, fPhiMax, fPhiMin from MCRunData where fRunNumber=\"$datrun\" "
+               query2=" select sum(fNumEvents), sum(fNumTriggers), sum(fNumSumTriggers) from MCRunData where fRunNumber=\"$datrun\" "
+               values=`mysql -ss -u $us --password=$pw --host=$ho $db -e " $query1 "`
+               values2=`mysql -ss -u $us --password=$pw --host=$ho $db -e " $query2 "`
+               spec=`echo $values | cut -d" " -f1`
+               psf=`echo $values | cut -d" " -f2`
+               amplfadc=`echo $values | cut -d" " -f3`
+               atmo=`echo $values | cut -d" " -f4`
+               obs=`echo $values | cut -d" " -f5`
+               part=`echo $values | cut -d" " -f6`
+               refl=`echo $values | cut -d" " -f7`
+               cors=`echo $values | cut -d" " -f8`
+               cam=`echo $values | cut -d" " -f9`
+               view=`echo $values | cut -d" " -f10`
+               ass=`echo $values | cut -d" " -f11`
+               trig=`echo $values | cut -d" " -f12`
+               azmax=`echo $values | cut -d" " -f13`
+               azmin=`echo $values | cut -d" " -f14`
+               events=`echo $values2 | cut -d" " -f1`
+               triggers=`echo $values2 | cut -d" " -f2`
+               sumtriggers=`echo $values2 | cut -d" " -f3`
+               query3=" select fSequenceFirst from MCSequenceProcessStatus where fSequenceFirst=\"$datrun\" "
+               query4=" select fSequenceFirst from MCSequences where fSequenceFirst=\"$datrun\" "
+               insert1=" insert MCSequenceProcessStatus set fSequenceFirst=\"$datrun\", fPriority=\"$datrun\", fSequenceFileWritten=Now() "
+               insert2=" insert MCSequences set fSequenceFirst=\"$datrun\", fRunStart=\"$date\", fNumEvents=\"$trainevents\", fNumTriggers=\"$triggers\", fNumSumTriggers=\"$sumtriggers\", fZBin=\"$zbin\", fSpectrumKEY=\"$spec\", fPSFKEY=\"$psf\", fAddSpotSizeKEY=\"$ass\", fAmplFadcKEY=\"$amplfadc\", fAtmosphericModelKEY=\"$atmo\", fObservationModeKEY=\"$obs\", fMCParticleKEY=\"$part\", fReflectorVersionKEY=\"$refl\", fCorsikaVersionKEY=\"$cors\", fCameraVersionKEY=\"$cam\", fViewConeAngleOKEY=\"$view\", fTriggerFlagKEY=\"$trig\", fPhiMax=\"$azmax\", fPhiMin=\"$azmin\", fTestTrainKEY=2 "
+               update1=" update MCRunData set fSequenceFirst=\"$datrun\" where fRunNumber=\"$datrun\" "
+               update2=" update MCSequences set fRunStart=\"$date\", fNumEvents=\"$events\", fNumTriggers=\"$triggers\", fNumSumTriggers=\"$sumtriggers\", fZBin=\"$zbin\", fSpectrumKEY=\"$spec\", fPSFKEY=\"$psf\", fAddSpotSizeKEY=\"$ass\", fAmplFadcKEY=\"$amplfadc\", fAtmosphericModelKEY=\"$atmo\", fObservationModeKEY=\"$obs\", fMCParticleKEY=\"$part\", fReflectorVersionKEY=\"$refl\", fCorsikaVersionKEY=\"$cors\", fCameraVersionKEY=\"$cam\", fViewConeAngleOKEY=\"$view\", fTriggerFlagKEY=\"$trig\", fPhiMax=\"$azmax\", fPhiMin=\"$azmin\", fTestTrainKEY=2 where fSequenceFirst=\"$datrun\" "
 
-
-            #training runs
-            for trainrun in ${trainruns[@]}
-            do
-               trainupdate=" update MCRunData set fSequenceFirst=\"$firstruntrain\" where fRunNumber=\"$trainrun\" "
-               mysql -ss -u $us --password=$pw --host=$ho $db -e " $trainupdate "
-            done   
-
-            trainquery1=" select fSpectrumKEY, fPSFKEY, fAmplFadcKEY, fAtmosphericModelKEY, fObservationModeKEY, fMCParticleKEY, fReflectorVersionKEY, fCorsikaVersionKEY, fCameraVersionKEY, fViewConeAngleOKEY, fAddSpotSizeKEY, fTriggerFlagKEY from MCRunData where fRunNumber=\"$firstruntrain\" "
-            trainquery2=" select sum(fNumEvents), sum(fNumTriggers), sum(fNumSumTriggers) from MCRunData where fRunNumber in ($trainruns2) "
-            trainvalues=`mysql -ss -u $us --password=$pw --host=$ho $db -e " $trainquery1 "`
-            trainvalues2=`mysql -ss -u $us --password=$pw --host=$ho $db -e " $trainquery2 "`
-            trainspec=`echo $trainvalues | cut -d" " -f1`
-            trainpsf=`echo $trainvalues | cut -d" " -f2`
-            trainamplfadc=`echo $trainvalues | cut -d" " -f3`
-            traintrainatmo=`echo $trainvalues | cut -d" " -f4`
-            trainobs=`echo $trainvalues | cut -d" " -f5`
-            trainpart=`echo $trainvalues | cut -d" " -f6`
-            trainrefl=`echo $trainvalues | cut -d" " -f7`
-            traincors=`echo $trainvalues | cut -d" " -f8`
-            traincam=`echo $trainvalues | cut -d" " -f9`
-            trainview=`echo $trainvalues | cut -d" " -f10`
-            trainass=`echo $trainvalues | cut -d" " -f11`
-            traintrig=`echo $trainvalues | cut -d" " -f12`
-            trainevents=`echo $trainvalues2 | cut -d" " -f1`
-            traintriggers=`echo $trainvalues2 | cut -d" " -f2`
-            trainsumtriggers=`echo $trainvalues2 | cut -d" " -f3`
-            trainquery3=" select fSequenceFirst from MCSequenceProcessStatus where fSequenceFirst=\"$firstruntrain\" "
-            trainquery4=" select fSequenceFirst from MCSequences where fSequenceFirst=\"$firstruntrain\" "
-            traincheck3=`mysql -ss -u $us --password=$pw --host=$ho $db -e " $trainquery3 "`
-            traincheck4=`mysql -ss -u $us --password=$pw --host=$ho $db -e " $trainquery4 "`
-            traininsert1=" insert MCSequenceProcessStatus set fSequenceFirst=\"$firstruntrain\", fPriority=\"$firstruntrain\", fSequenceFileWritten=Now() "
-            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 "
-            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\" "
-            if [ "$traincheck3" == "" ]
-            then
-               mysql -ss -u $us --password=$pw --host=$ho $db -e " $traininsert1 "
-            fi
-            if [ "$traincheck4" == "" ]
-            then
-               mysql -ss -u $us --password=$pw --host=$ho $db -e " $traininsert2 "
-            else
-               mysql -ss -u $us --password=$pw --host=$ho $db -e " $trainupdate2 "
-            fi
-            
-            trainno=`echo $firstruntrain | cut -c 0-4`
-            trainsequpath=$mcsequpath/$trainno
-            makedir $trainsequpath 
-            trainsequfile=$trainsequpath/sequence$firstruntrain.txt
-            printprocesslog "INFO writing train sequencefile $trainsequfile"
-   
-            echo "Sequence:        $firstruntrain" >| $trainsequfile
-            echo "Night:           $date" >> $trainsequfile
-            echo "Epoch:           $epoch" >> $trainsequfile
-            echo "Mode:            $mode" >> $trainsequfile
-            echo "" >> $trainsequfile
-            echo "CalRuns:         $calrun" >> $trainsequfile
-            echo "PedRuns:         $pedrun" >> $trainsequfile
-            echo "DatRuns:         $trainruns" >> $trainsequfile
-            echo "" >> $trainsequfile
-            echo "MonteCarlo: Yes" >> $trainsequfile
-            echo "Training sequence" >> $trainsequfile
-            echo "" >> $trainsequfile
-
-
-            #test runs
-            for testrun in ${testruns[@]}
-            do
-               testupdate=" update MCRunData set fSequenceFirst=\"$firstruntest\" where fRunNumber=\"$testrun\" "
-               mysql -ss -u $us --password=$pw --host=$ho $db -e " $testupdate "
-            done   
-
-            testquery1=" select fSpectrumKEY, fPSFKEY, fAmplFadcKEY, fAtmosphericModelKEY, fObservationModeKEY, fMCParticleKEY, fReflectorVersionKEY, fCorsikaVersionKEY, fCameraVersionKEY, fViewConeAngleOKEY, fAddSpotSizeKEY, fTriggerFlagKEY from MCRunData where fRunNumber=\"$firstruntest\" "
-            testquery2=" select sum(fNumEvents), sum(fNumTriggers), sum(fNumSumTriggers) from MCRunData where fRunNumber in ($testruns2) "
-            testvalues=`mysql -ss -u $us --password=$pw --host=$ho $db -e " $testquery1 "`
-            testvalues2=`mysql -ss -u $us --password=$pw --host=$ho $db -e " $testquery2 "`
-            testspec=`echo $testvalues | cut -d" " -f1`
-            testpsf=`echo $testvalues | cut -d" " -f2`
-            testamplfadc=`echo $testvalues | cut -d" " -f3`
-            testatmo=`echo $testvalues | cut -d" " -f4`
-            testobs=`echo $testvalues | cut -d" " -f5`
-            testpart=`echo $testvalues | cut -d" " -f6`
-            testrefl=`echo $testvalues | cut -d" " -f7`
-            testcors=`echo $testvalues | cut -d" " -f8`
-            testcam=`echo $testvalues | cut -d" " -f9`
-            testview=`echo $testvalues | cut -d" " -f10`
-            testass=`echo $testvalues | cut -d" " -f11`
-            testtrig=`echo $testvalues | cut -d" " -f12`
-            testevents=`echo $testvalues2 | cut -d" " -f1`
-            testtriggers=`echo $testvalues2 | cut -d" " -f2`
-            testsumtriggers=`echo $testvalues2 | cut -d" " -f3`
-            testquery3=" select fSequenceFirst from MCSequenceProcessStatus where fSequenceFirst=\"$firstruntest\" "
-            testquery4=" select fSequenceFirst from MCSequences where fSequenceFirst=\"$firstruntest\" "
-            testcheck3=`mysql -ss -u $us --password=$pw --host=$ho $db -e " $testquery3 "`
-            testcheck4=`mysql -ss -u $us --password=$pw --host=$ho $db -e " $testquery4 "`
-            testinsert1=" insert MCSequenceProcessStatus set fSequenceFirst=\"$firstruntest\", fPriority=\"$firstruntest\", fSequenceFileWritten=Now() "
-            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 "
-            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\" "
-            if [ "$testcheck3" == "" ]
-            then
-               mysql -ss -u $us --password=$pw --host=$ho $db -e " $testinsert1 "
-            fi
-            if [ "$testcheck4" == "" ]
-            then
-               mysql -ss -u $us --password=$pw --host=$ho $db -e " $testinsert2 "
-            else
-               mysql -ss -u $us --password=$pw --host=$ho $db -e " $testupdate2 "
-            fi
-            
-            testno=`echo $firstruntest | cut -c 0-4`
-            testsequpath=$mcsequpath/$testno
-            makedir $testsequpath 
-            testsequfile=$testsequpath/sequence$firstruntest.txt
-            printprocesslog "INFO writing test sequencefile $testsequfile"
-   
-            echo "Sequence:        $firstruntest" >| $testsequfile
-            echo "Night:           $date" >> $testsequfile
-            echo "Epoch:           $epoch" >> $testsequfile
-            echo "Mode:            $mode" >> $testsequfile
-            echo "" >> $testsequfile
-            echo "CalRuns:         $calrun" >> $testsequfile
-            echo "PedRuns:         $pedrun" >> $testsequfile
-            echo "DatRuns:         $testruns" >> $testsequfile
-            echo "" >> $testsequfile
-            echo "MonteCarlo: Yes" >> $testsequfile
-            echo "Test sequence" >> $testsequfile
-            echo "" >> $testsequfile
+               mysql -ss -u $us --password=$pw --host=$ho $db -e " $update1 "
+               check3=`mysql -ss -u $us --password=$pw --host=$ho $db -e " $query3 "`
+               check4=`mysql -ss -u $us --password=$pw --host=$ho $db -e " $query4 "`
+               if [ "$check3" == "" ]
+               then
+                  mysql -ss -u $us --password=$pw --host=$ho $db -e " $insert1 "
+               fi
+               if [ "$check4" == "" ]
+               then
+                  mysql -ss -u $us --password=$pw --host=$ho $db -e " $insert2 "
+               else
+                  mysql -ss -u $us --password=$pw --host=$ho $db -e " $update2 "
+               fi
+               
+               no=`echo $datrun | cut -c 1-4`
+               sequpath=$mcsequpath/$no
+               makedir $sequpath 
+               sequfile=$sequpath/sequence$datrun.txt
+               printprocesslog "INFO writing sequencefile $sequfile"
+               
+               echo "Sequence:        $datrun" >| $sequfile
+               echo "Night:           $date" >> $sequfile
+               echo "Epoch:           $epoch" >> $sequfile
+               echo "Mode:            $mode" >> $sequfile
+               echo "Azimuth:         $azmin - $azmax" >> $sequfile
+               echo "" >> $sequfile
+               echo "CalRuns:         $calrun" >> $sequfile
+               echo "PedRuns:         $pedrun" >> $sequfile
+               echo "DatRuns:         $datrun" >> $sequfile
+               echo "" >> $sequfile
+               echo "MonteCarlo: Yes" >> $sequfile
+               echo "" >> $sequfile
+               
+            done
          fi
       done