Changeset 9173 for trunk/MagicSoft/Mars

Timestamp:

11/18/08 12:13:38 (16 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/scripts/runcamera (modified) (1 diff)
• datacenter/scripts/runcorsika (modified) (1 diff)
• datacenter/scripts/runreflector (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -23 +23 @@
    * datacenter/scripts/runcamera:
      - redirect output from camera program to scriptlog
+     - changed expected return code (Julian has adapted reflector to 
+       return something in case of successful completion of the 
+       program)
+     - fixed logging
+
+   * datacenter/scripts/runcamera:
+     - redirect output from camera program to scriptlog
      - own failed variable
+     - changed misleading variable name
 
    * datacenter/scripts/setup, datacenter/scripts/runcorsika:

trunk/MagicSoft/Mars/datacenter/scripts/runcamera

@@ -20 +20 @@
 #   Author(s): Daniela Dorner  05/2007 <mailto:dorner@astro.uni-wuerzburg.de>
 #
-#   Copyright: MAGIC Software Development, 2000-2007
+#   Copyright: MAGIC Software Development, 2000-2008
 #
 #

trunk/MagicSoft/Mars/datacenter/scripts/runcorsika

@@ -20 +20 @@
 #   Author(s): Daniela Dorner  05/2007 <mailto:dorner@astro.uni-wuerzburg.de>
 #
-#   Copyright: MAGIC Software Development, 2000-2007
+#   Copyright: MAGIC Software Development, 2000-2008
 #
 #

trunk/MagicSoft/Mars/datacenter/scripts/runreflector

@@ -20 +20 @@
 #   Author(s): Daniela Dorner  05/2007 <mailto:dorner@astro.uni-wuerzburg.de>
 #
-#   Copyright: MAGIC Software Development, 2000-2007
+#   Copyright: MAGIC Software Development, 2000-2008
 #
 #
@@ -64 +64 @@
 
 # get sequence # 
-gettodo >> $scriptlog 2>&1
-run=$process
+gettodo "1">> $scriptlog 2>&1
+run=${primaries[0]}
 # get reflector runnumber
 query="SELECT fReflectorRunNumber FROM MCRunData where fMCRunNumber="$run
@@ -116 +116 @@
 cd $detectordir/ReflectorII
 
-echo "INPUTCARD:" >> $logfile 2>&1
+echo "INPUTCARD:" >| $logfile 2>&1
 printinputcard >> $logfile 2>&1
 echo "" >> $logfile 2>&1
 echo "" >> $logfile 2>&1
-printinputcard | ./reflector
+printinputcard | ./reflector >> $logfile 2>&1
 
 check1=$?
@@ -127 +127 @@
 
 case $check1 in
-   22)   echo " check1=$check1 -> everything ok " >> $scriptlog 2>&1
-         printprocesslog "INFO $program finished successfully for sequence $sequence"
-         ;;
-    *)   echo " check1=$check1 -> ERROR -> step has to be repeated" >> $scriptlog 2>&1
-         printprocesslog "ERROR $program failed for sequence $sequence"
-         com=$Freflector
-         check=$check1
-         ;;
+   0)   echo " check1=$check1 -> everything ok " >> $scriptlog 2>&1
+        printprocesslog "INFO $program finished successfully for run $reflectorrunno"
+        ;;
+   *)   echo " check1=$check1 -> ERROR -> step has to be repeated" >> $scriptlog 2>&1
+        printprocesslog "ERROR $program failed for run $reflectorrunno"
+        com=$Freflector
+        check=$check1
+        ;;
 esac