Changeset 9217

Timestamp:

01/09/09 22:34:21 (16 years ago)

Author:

hoehne

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -27 +27 @@
        parameter had unreasonable values (negative) which were filled
        into the mcdb, now->0
+
+   * datacenter/scripts/fillcamera, mcsequences:
+     - implemented call of getdbsetup
 
 

trunk/MagicSoft/Mars/datacenter/scripts/fillcamera

@@ -42 +42 @@
 checklock  >> $scriptlog 2>&1
 
+getdbsetup
+
 #mccampath=$mcpath/camera
 mccampath=/magic/montecarlo/camera
 #workaround
 cameradirs=`find /magic/montecarlo/camera -maxdepth 4 -mindepth 2 -type d ! -name Gamma ! -name Muon ! -name Proton ! -name Spot_?.?`
-#cameradirs=`find /magic/montecarlo/camera -maxdepth 3 -mindepth 2 -type d ! -name Gamma ! -name Muon ! -name Proton`
-#cameradirs=`find $mccampath -maxdepth 1 -mindepth 1 -type d`
 echo "camera dirs: "${cameradirs[@]}  >> $scriptlog 2>&1
 echo "" >> $scriptlog 2>&1
@@ -115 +115 @@
       
       
-      #   user="test"
-      #   db="TestMonteCarlo"
-      #   pw="Ics+eaTD"
-      user="operator"
-      db="MyMagicMonteCarlo"
-      pw="Ics+eMM!"
       cquery=" select fRunNumber from MCRunProcessStatus where fFileName=\"$calfile\" "
       pquery=" select fRunNumber from MCRunProcessStatus where fFileName=\"$pedfile\" "
       
-      crun=`mysql -ss -u $user --password=$pw --host=$ho $db -e " $cquery "`
-      prun=`mysql -ss -u $user --password=$pw --host=$ho $db -e " $pquery "`
+      crun=`mysql -ss -u $us --password=$pw --host=$ho $db -e " $cquery "`
+      prun=`mysql -ss -u $us --password=$pw --host=$ho $db -e " $pquery "`
       cnum=`printf %08d $crun`
       pnum=`printf %08d $prun`
@@ -150 +144 @@
             echo "P run already there, do mysql update" >> $scriptlog 2>&1
    #         continue
-            mysql -ss -u $user --password=$pw --host=$ho $db -e " $pupdate "
+            mysql -ss -u $us --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=$ho $db -e " $pupdate "
+            mysql -ss -u $us --password=$pw --host=$ho $db -e " $pupdate "
          fi
          
@@ -161 +155 @@
             echo "C run already there, do mysql update" >> $scriptlog 2>&1
    #         continue
-            mysql -ss -u $user --password=$pw --host=$ho $db -e " $cupdate "
+            mysql -ss -u $us --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=$ho $db -e " $cupdate "
+            mysql -ss -u $us --password=$pw --host=$ho $db -e " $cupdate "
          fi
    

trunk/MagicSoft/Mars/datacenter/scripts/mcsequences

@@ -47 +47 @@
 printprocesslog "INFO building two sequences per mcdirectory and epoch, one for training and one for testing"
 
-#user="test"
-#db="TestMonteCarlo"
-#pw="Ics+eaTD"
-user="operator"
-db="MyMagicMonteCarlo"
-pw="Ics+eMM!"
+getdbsetup
 
 dirs=`find $mcrawpath -type d`