Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 9603)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 9604)
@@ -19,4 +19,33 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2010/06/30 Daniela Dorner
+
+   * datacenter/db/mcinfo.php:
+     - added output to step column in case job is running
+     - fixed typo
+
+   * datacenter/scripts/runcorsika:
+     - small bugfix (new version of 'cut' gives error for '-c 0-4')
+
+   * datacenter/scripts/runceres:
+     - added (script to run telescope simulation of file basis)
+
+   * datacenter/scripts/setup.wue.magic.data,
+     datacenter/scripts/setup.wue.magic.mc,
+     datacenter/scripts/setup.wue.fact.mc:
+     - added condorpath
+
+   * datacenter/scripts/jobmanager,
+     datacenter/scripts/scriptlauncher:
+     - implemented condorpath
+
+   * datacenter/scripts/sourcefile:
+     - changed log and error file name for jobmanager
+
+   * resources/steps_fact.rc:
+     - fixed typo
+
+
+
  2010/06/29 Daniela Dorner
 
@@ -116,7 +145,4 @@
 
  2010/06/24 Daniela Dorner
-
-   * datacenter/scripts/runceres:
-     - added (script to run telescope simulation of file basis)
 
    * datacenter/scripts/sourcefile, resources/steps_fact.rc:
Index: /trunk/MagicSoft/Mars/datacenter/scripts/jobmanager
===================================================================
--- /trunk/MagicSoft/Mars/datacenter/scripts/jobmanager	(revision 9603)
+++ /trunk/MagicSoft/Mars/datacenter/scripts/jobmanager	(revision 9604)
@@ -60,6 +60,6 @@
             ;;
    condor)  echo " on queuing system 'condor'" >> $jmscriptlog 2>&1
-            alias 'queuesubmit'='/usr/local/bin/condor_submit -a path=`echo $scriptspath` -a prog=`echo ${scripts[$i]}` -a date=`echo $date` -a dir=`echo $runlogpath` -a automationsetup=$AUTOMATIONSETUP `echo $scriptspath`/run.condor'
-            alias 'checkqueue'='/usr/local/bin/condor_q -global -format "Owner%s " Owner -format "%s" CMD -format "Jobstatus%s\n" Jobstatus '
+            alias 'queuesubmit'='$condorpath/condor_submit -a path=`echo $scriptspath` -a prog=`echo ${scripts[$i]}` -a date=`echo $date` -a dir=`echo $runlogpath` -a automationsetup=$AUTOMATIONSETUP `echo $scriptspath`/run.condor'
+            alias 'checkqueue'='$condorpath/condor_q -global -format "Owner%s " Owner -format "%s" CMD -format "Jobstatus%s\n" Jobstatus '
             break
             ;;
Index: /trunk/MagicSoft/Mars/datacenter/scripts/scriptlauncher
===================================================================
--- /trunk/MagicSoft/Mars/datacenter/scripts/scriptlauncher	(revision 9603)
+++ /trunk/MagicSoft/Mars/datacenter/scripts/scriptlauncher	(revision 9604)
@@ -75,6 +75,6 @@
    fi
    echo " launching $1..." >> $scriptlog 2>&1
-   echo "/usr/local/bin/condor_submit -a path=$path -a prog=$prog -a args=\"$arguments\" -a date=$date -a dir=$runlogpath -a automationsetup=$AUTOMATIONSETUP $path/run.condor 2>> $errorlog | grep 'submitted to cluster' | cut -dr -f2" >> $scriptlog 2>&1
-   pid=`/usr/local/bin/condor_submit -a path=$path -a prog=$prog -a args="$arguments" -a date=$date -a dir=$runlogpath -a automationsetup=$AUTOMATIONSETUP $path/run.condor 2>> $errorlog | grep 'submitted to cluster' | cut -dr -f2`
+   echo "$condorpath/condor_submit -a path=$path -a prog=$prog -a args=\"$arguments\" -a date=$date -a dir=$runlogpath -a automationsetup=$AUTOMATIONSETUP $path/run.condor 2>> $errorlog | grep 'submitted to cluster' | cut -dr -f2" >> $scriptlog 2>&1
+   pid=`$condorpath/condor_submit -a path=$path -a prog=$prog -a args="$arguments" -a date=$date -a dir=$runlogpath -a automationsetup=$AUTOMATIONSETUP $path/run.condor 2>> $errorlog | grep 'submitted to cluster' | cut -dr -f2`
    if [ "$pid" = "" ]
    then 
@@ -88,5 +88,5 @@
    then
       echo "  waiting for $1 to be done..." >> $scriptlog 2>&1
-      /usr/local/bin/condor_wait $runlogpath/condor-$date.log $pid >/dev/null 2>$errorlog
+      $condorpath/condor_wait $runlogpath/condor-$date.log $pid >/dev/null 2>$errorlog
    fi
    shift
Index: /trunk/MagicSoft/Mars/datacenter/scripts/setup.wue.fact.mc
===================================================================
--- /trunk/MagicSoft/Mars/datacenter/scripts/setup.wue.fact.mc	(revision 9603)
+++ /trunk/MagicSoft/Mars/datacenter/scripts/setup.wue.fact.mc	(revision 9604)
@@ -39,4 +39,5 @@
 # queuing system
 queuesys=condor # wuerzburg data center
+condorpath=/usr/local/bin
 
 # logging and setup
@@ -82,5 +83,5 @@
 sleeptimelimit=360 #360
 errorsleeptimedefault=60 #60
-max=42 #maximum number of processes for one script in case there are more than one and the others do not have anything to do
+max=30 #maximum number of processes for one script in case there are more than one and the others do not have anything to do
 totalmax=40 #maximum number of processes (total) overwrites pnototal(we) in case it is smaller
 
@@ -97,11 +98,11 @@
 pnototalwe=(     42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 )
 
-pnocorsika=(     20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 )
+pnocorsika=(     30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 )
 pnoceres=(       15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 )
 pnocprun=(       15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 )
-pnocallisto=(    32 32 32 32 32 20 20 18 18 15 15 15 15 15 15 15 15 15 15 18 18 20 20 32 )
+pnocallisto=(    32 32 32 32 32 30 30 18 18 15 15 15 15 15 15 15 15 15 15 18 18 30 30 32 )
 pnostar=(        10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 )
 
-pnocorsikawe=(   20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 )
+pnocorsikawe=(   30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 )
 pnocereswe=(     15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 )
 pnocprunwe=(     15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 )
Index: /trunk/MagicSoft/Mars/datacenter/scripts/setup.wue.magic.data
===================================================================
--- /trunk/MagicSoft/Mars/datacenter/scripts/setup.wue.magic.data	(revision 9603)
+++ /trunk/MagicSoft/Mars/datacenter/scripts/setup.wue.magic.data	(revision 9604)
@@ -39,4 +39,5 @@
 # queuing system
 queuesys=condor # wuerzburg data center
+condorpath=/usr/local/bin
 
 # logging and setup
Index: /trunk/MagicSoft/Mars/datacenter/scripts/setup.wue.magic.mc
===================================================================
--- /trunk/MagicSoft/Mars/datacenter/scripts/setup.wue.magic.mc	(revision 9603)
+++ /trunk/MagicSoft/Mars/datacenter/scripts/setup.wue.magic.mc	(revision 9604)
@@ -39,4 +39,5 @@
 # queuing system
 queuesys=condor # wuerzburg data center
+condorpath=/usr/local/bin
 
 # logging and setup
Index: /trunk/MagicSoft/Mars/datacenter/scripts/sourcefile
===================================================================
--- /trunk/MagicSoft/Mars/datacenter/scripts/sourcefile	(revision 9603)
+++ /trunk/MagicSoft/Mars/datacenter/scripts/sourcefile	(revision 9604)
@@ -162,6 +162,6 @@
 #   log files (can't be defined in script itself, as script can run longer 
 #   than one day
-jmerrorlog=$runlogpath/jobmanager-error`date +%F`.log
-jmscriptlog=$runlogpath/jobmanager`date +%F`.log
+jmerrorlog=$runlogpath/jobmanager-`whoami`-$HOSTNAME-$AUTOMATIONSETUP-`date +%F`-error.log
+jmscriptlog=$runlogpath/jobmanager-`whoami`-$HOSTNAME-$AUTOMATIONSETUP-`date +%F`.log
 
 # check if rc-files are available
Index: /trunk/MagicSoft/Mars/resources/steps_fact.rc
===================================================================
--- /trunk/MagicSoft/Mars/resources/steps_fact.rc	(revision 9603)
+++ /trunk/MagicSoft/Mars/resources/steps_fact.rc	(revision 9604)
@@ -10,5 +10,5 @@
 
 SequenceFile.Primaries: fSequenceNumber
-SequenceFile.Join: LEFT JOIN SequenceFile USING(fSequenceNumber)
+SequenceFile.Join: LEFT JOIN SequenceFileStatus USING(fSequenceNumber)
 
 Callisto.Primaries: fSequenceNumber, fCeresSetupKEY