Changeset 9586 for trunk

Timestamp:

06/14/10 17:21:31 (15 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/scripts/runcorsika (modified) (1 diff)
• datacenter/scripts/setup.wue.fact.mc (modified) (4 diffs)
• datacenter/scripts/sourcefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2010/06/14 Daniela Dorner
+
+   * datacenter/scripts/sourcefile:
+     - bugfix in query
+
+   * datacenter/scripts/runcorsika:
+     - added output of command to processlog
+
+   * datacenter/scripts/setup.wue.fact.mc:
+     - changed setup to be used by user montecarlo to reproduce some 
+       corsikas
+
+
 
  2010/06/11 Daniela Dorner

trunk/MagicSoft/Mars/datacenter/scripts/runcorsika

@@ -201 +201 @@
 cd $corsikapath
 
+printprocesslog "INFO executing 'printinputcard | ./cc6501p-linux >| $logfile 2>&1' in directory $corsikapath "
 printinputcard | ./cc6501p-linux >| $logfile 2>&1
 

trunk/MagicSoft/Mars/datacenter/scripts/setup.wue.fact.mc

@@ -41 +41 @@
 
 # logging and setup
-logpath=/home/montecarlo/fact_db_test
-lockpath=/home/montecarlo/fact_db_test/locks
-setuppath=/home/montecarlo/fact_db_test/setup
+logpath=/magic/datacenter/fact/autologs
+lockpath=/magic/datacenter/fact/locks
+setuppath=/magic/datacenter/fact/setup
 
 ## paths of data
@@ -55 +55 @@
 #mcrawpath=$mcpath/rawfiles
 #mcsequpath=$mcpath/sequences
-#corsikapath=/home/operator/Corsika/Mmcs6500/
-#detectordir=/home/msmeyer/MC/MagicSoft/Simulation/Detector
-#reflectorversion="reflector 0.7"
-#cameraversion="camera 0.8"
-#export FLUPRO=$corsikapath'/fluka2008_3'
+corsikapath=/home/montecarlo/Simulation/Corsika/Mmcs6500
+export FLUPRO=$corsikapath'/fluka2008_3'
 
 
@@ -70 +67 @@
 # rcfiles
 # dependencies of steps
-steps=$mars/resources/steps_fact2.rc
+steps=$mars/resources/steps_fact.rc
 # file with db information
 sqlrc=$mars/sql.rc
@@ -100 +97 @@
 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 )
 
-pnoceres=(        7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7 )
-pnocprun=(        7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7 )
+pnocorsika=(     21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 )
+pnoceres=(       12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 )
+pnocprun=(       12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 )
 pnocallisto=(    32 32 32 32 32 20 20 18 18 12 12 12 12 12 12 12 12 12 12 18 18 20 20 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 )
 
-pnocereswe=(      7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7 )
-pnocprunwe=(      7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7 )
+pnocorsikawe=(   21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 21 )
+pnocereswe=(     12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 )
+pnocprunwe=(     12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 )
 pnocallistowe=(  32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 )
 pnostarwe=(      10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 )
 
-## set variables for jobmanager 
-#scripts=( "runstar2" "runcallisto2" "cprun" "runceres" ) 
-#scriptscolname=( "Star" "Callisto" "CPRun" "Ceres" ) 
-#pnosweek=( ${pnostar[@]} ${pnocallisto[@]} ${pnocprun[@]} ${pnoceres[@]} ) 
-#pnoswe=( ${pnostarwe[@]} ${pnocallistowe[@]} ${pnocprunwe[@]} ${pnocereswe[@]} ) 
+# set variables for jobmanager 
+scripts=( "runcorsika" ) 
+scriptscolname=( "Corsika" ) 
+pnosweek=( ${pnocorsika[@]} ) 
+pnoswe=( ${pnocorsikawe[@]} ) 
 
-# set variables for jobmanager 
-scripts=( "runstar2" "runcallisto2" "runceres" ) 
-scriptscolname=( "Star" "Callisto" "Ceres" ) 
-pnosweek=( ${pnostar[@]} ${pnocallisto[@]} ${pnoceres[@]} ) 
-pnoswe=( ${pnostarwe[@]} ${pnocallistowe[@]} ${pnocereswe[@]} ) 
-

trunk/MagicSoft/Mars/datacenter/scripts/sourcefile

@@ -317 +317 @@
    done
    # add condition for the status of the step itself
-   query=$query" AND ISNULL("$step"Status.fStartTime) "
+   if [ $counter -gt 0 ]
+   then
+      query=$query" AND "
+   fi
+   query=$query" ISNULL("$step"Status.fStartTime) "
    query=$query" AND ISNULL("$step"Status.fStopTime) "
    query=$query" AND ISNULL("$step"Status.fReturnCode) "