Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 8761)
+++ trunk/MagicSoft/Mars/Changelog	(revision 8762)
@@ -18,4 +18,12 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2007/10/17 Daniel Hoehne
+
+   * datacenter/scripts/mcsequences:
+     - included sql query and update/insert sequence information in MCDB
+     - small bugfixes: corrected grep for epoch and mode
+
+
 
  2007/10/16 Daniel Hoehne
Index: trunk/MagicSoft/Mars/datacenter/scripts/mcsequences
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/mcsequences	(revision 8761)
+++ trunk/MagicSoft/Mars/datacenter/scripts/mcsequences	(revision 8762)
@@ -49,9 +49,14 @@
 # find montecarlo directories, build one sequence per directory and write sequence file
 printprocesslog "INFO building one sequence per mcdirectory and epoch"
+
+user="test"
+db="TestMonteCarlo"
+pw="Ics+eaTD"
+
 dirs=`find $mcrawpath -type d`
 for dir in ${dirs[@]}
 do 
-   cont=`echo $dir | cut -d/ -f6`
-#   cont=`echo $dir | cut -d/ -f10`
+#   cont=`echo $dir | cut -d/ -f6`
+   cont=`echo $dir | cut -d/ -f10`
    if [ "$cont" == "" ]
    then
@@ -64,7 +69,6 @@
    do
       echo $epoch >> $scriptlog 2>&1
-      calfile=`find $dir -lname *$epoch*.root | grep "_C_"`
-      pedfile=`find $dir -lname *$epoch*.root | grep "_P_"`
-#      datfiles=`find $dir -lname '*$epoch*.root' | grep "_D_"`
+      calfile=`find $dir -lname *${epoch}/*.root | grep "_C_"`
+      pedfile=`find $dir -lname *${epoch}/*.root | grep "_P_"`
       
       calrun=`echo $calfile | cut -d_ -f2`
@@ -74,37 +78,66 @@
       for mode in ${modes[@]}
       do
-         datruns=`find $dir -lname *$epoch*.root | grep $mode | grep "_D_" | cut -d_ -f2 | tr "\n" " "`
+         datruns=`find $dir -lname *${epoch}/*.root | grep ${mode}_ | grep "_D_" | cut -d_ -f2 | tr "\n" " "`
       	 if [ "$datruns" != "" ]
          then
-            # workaround due to 5digit runnumber for data with runnumber < 35487
       	    firstrun=`echo $datruns | cut -c 0-8`
-      	    #   firstrun=`echo $datruns | cut -c 0-5 | sed -e 's/^0//g' -e 's/^0//g' -e 's/^0//g' -e 's/^0//g'`
-      	    date=`echo $dir | cut -c 28-37 | sed -e 's/\//-/g'`
-#      	    date=`echo $dir | cut -c 57-66 | sed -e 's/\//-/g'`
-      	    # for tests
-	    #      date=`echo $dir | cut -c 57-66 | sed -e 's/\//-/g'`
-      
-      	    # workaround due to 5digit runnumber for data with runnumber < 35487
-      	    no=`echo $firstrun | cut -c 0-4`
-      	    #   no=`printf %08d $firstrun | cut -c 0-4`
-      	    #   no2=`printf %08d $firstrun`
-      	    sequpath=$mcsequpath/$no
-      	    makedir $sequpath >> $scriptlog 2>&1
-      	    sequfile=$sequpath/sequence$firstrun.txt
-      	    #   sequfile=$sequpath/sequence$no2.txt
-      	    echo "writing sequfile "$sequfile >> $scriptlog 2>&1
-      	    printprocesslog "INFO writing sequencefile $sequfile"
-      
-      	    echo "Sequence:        $firstrun" >| $sequfile
-      	    echo "Night:           $date" >> $sequfile
-      	    echo "Epoch:           $epoch" >> $sequfile
-      	    echo "Mode:            $mode" >> $sequfile
-      	    echo "" >> $sequfile
-      	    echo "CalRuns:         $calrun" >> $sequfile
-      	    echo "PedRuns:         $pedrun" >> $sequfile
-      	    echo "DatRuns:         $datruns" >> $sequfile
-      	    echo "" >> $sequfile
-      	    echo "MonteCarlo: Yes" >> $sequfile
-      	    echo "" >> $sequfile
+            #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
+               update=" update MCRunData set fSequenceFirst=\"$firstrun\" where fRunNumber=\"$datrun\" "
+   	       mysql -ss -u $user --password=$pw --host=vela $db -e " $update "
+            done   
+
+            query=" select fSpectrumKEY, fPSFKEY, fAmplFadcKEY, fAtmosphericModelKEY, fObservationModeKEY, fMCParticleKEY, fReflectorVersionKEY, fCorsikaVersionKEY, fCameraVersionKEY, fViewConeAngleOKEY from MCRunData where fRunNumber=\"$firstrun\" "
+            values=`mysql -ss -u $user --password=$pw --host=vela $db -e " $query "`
+            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`
+   	    query1=" select fSequenceFirst from MCSequenceProcessStatus where fSequenceFirst=\"$firstrun\" "
+   	    query2=" select fSequenceFirst from MCSequences where fSequenceFirst=\"$firstrun\" "
+   	    check1=`mysql -ss -u $user --password=$pw --host=vela $db -e " $query1 "`
+   	    check2=`mysql -ss -u $user --password=$pw --host=vela $db -e " $query2 "`
+   	    insert1=" insert MCSequenceProcessStatus set fSequenceFirst=\"$firstrun\", fSequenceFileWritten=Now() "
+   	    insert2=" insert MCSequences set fSequenceFirst=\"$firstrun\", fRunStart=\"$date\", fZBin=\"$zbin\", fSpectrumKEY=\"$spec\", fPSFKEY=\"$psf\", fAmplFadcKEY=\"$amplfadc\", fAtmosphericModelKEY=\"$atmo\", fObservationModeKEY=\"$obs\", fMCParticleKEY=\"$part\", fReflectorVersionKEY=\"$refl\", fCorsikaVersionKEY=\"$cors\", fCameraVersionKEY=\"$cam\", fViewConeAngleOKEY=\"$view\" "
+            update2=" update MCSequences set fRunStart=\"$date\", fZBin=\"$zbin\", fSpectrumKEY=\"$spec\", fPSFKEY=\"$psf\", fAmplFadcKEY=\"$amplfadc\", fAtmosphericModelKEY=\"$atmo\", fObservationModeKEY=\"$obs\", fMCParticleKEY=\"$part\", fReflectorVersionKEY=\"$refl\", fCorsikaVersionKEY=\"$cors\", fCameraVersionKEY=\"$cam\", fViewConeAngleOKEY=\"$view\" where fSequenceFirst=\"$firstrun\" "
+            if [ "$check1" == "" ]
+            then
+               mysql -ss -u $user --password=$pw --host=vela $db -e " $insert1 "
+            fi
+            if [ "$check2" == "" ]
+            then
+   	       mysql -ss -u $user --password=$pw --host=vela $db -e " $insert2 "
+            else
+   	       mysql -ss -u $user --password=$pw --host=vela $db -e " $update2 "
+            fi
+            
+            no=`echo $firstrun | cut -c 0-4`
+            sequpath=$mcsequpath/$no
+            makedir $sequpath >> $scriptlog 2>&1
+            sequfile=$sequpath/sequence$firstrun.txt
+            echo "writing sequfile "$sequfile >> $scriptlog 2>&1
+            printprocesslog "INFO writing sequencefile $sequfile"
+   
+            echo "Sequence:        $firstrun" >| $sequfile
+            echo "Night:           $date" >> $sequfile
+            echo "Epoch:           $epoch" >> $sequfile
+            echo "Mode:            $mode" >> $sequfile
+            echo "" >> $sequfile
+            echo "CalRuns:         $calrun" >> $sequfile
+            echo "PedRuns:         $pedrun" >> $sequfile
+            echo "DatRuns:         $datruns" >> $sequfile
+ 	    echo "" >> $sequfile
+            echo "MonteCarlo: Yes" >> $sequfile
+   	    echo "" >> $sequfile
          fi
       done