Index: trunk/MagicSoft/Mars/scripts/preparemc
===================================================================
--- trunk/MagicSoft/Mars/scripts/preparemc	(revision 8226)
+++ trunk/MagicSoft/Mars/scripts/preparemc	(revision 8227)
@@ -33,64 +33,53 @@
 #
 # variables, that have to be set by the user:
-# - dir        directory, where the mc sequence and dataset files are stored 
-#               be careful: don't move the sequence files afterwards, as the 
-#               paths are stored in the datasetfiles
-# - mars       directory, where your Mars version is stored
-#               only needed, if you want to create a rf-root-file for the 
-#               energy estimation 
-# - sourcefile directory, where your Mars version is stored
-#               only needed, if you want to create a rf-root-file for the 
-#               energy estimation 
-#               be careful, you also have to set the mars path in sourcefile
-# - zdmin      minimum zenith distance
-# - zdmax      maximum zenith distance
-# - psf        psf 
-#               at the moment mc with psf 14 and 20 is available
-# - modes      observation mode
-#               the explanation for the modes can be found in 
-#                /montecarlo/rawfiles/README.txt
-# - numruns    num of runs, that are in the sequence file, which are used for
-#              training (SequencesOn in $mcdataset)
+# - dir          directory, where the mc sequence and dataset files are stored 
+#                 be careful: don't move the sequence files afterwards, as the 
+#                 paths are stored in the datasetfiles
+# - mars         directory, where your Mars version is stored
+#                 only needed, if you want to create a rf-root-file for the 
+#                 energy estimation 
+# - zdmin        minimum zenith distance
+# - zdmax        maximum zenith distance
+# - psf          psf 
+#                 at the moment mc with psf 14 and 20 is available
+# - modes        observation mode
+#                 the explanation for the modes can be found in 
+#                  /montecarlo/rawfiles/README.txt
+# - numruns      num of runs, that are in the sequence file, which are used 
+#                 for training (SequencesOn in $mcdataset)
+# - trainenergy  if set to 'yes', the rf for energy estimation is trained
 #
-# If you want to create a rf-root-file for the energy estimation, you have to 
-# comment out the 'exit' before the last lines of the script. 
 # 
 ##############################################################################
-
-#function to create directory
-function makedir()
-{
-   if [ ! -d $@ ]
-   then
-     mkdir -pv $@ 
-     if [ ! -d $@ ]
-     then 
-        echo "could not make dir "$@
-        exit
-     fi
-   fi
-}
 
 
 
 #to be set by the user 
-dir=/home/operator/mc 
-mars=/home/operator/Mars.cvs 
-zdmin=9
-zdmax=51
+dir=/home/dorner/crabspectrum 
+mars=/home/dorner/mars.cvs 
+zdmin=5
+zdmax=35
 psf=14
 modes=( "02" "04" ) # e.g. nowobble
 numruns=5
+# set here if you want to train a rf-engery-estimator
+#trainenergy=
+trainenergy="yes"
 
-makedir $dir
 
-#needed if not set in .bashrc or when script is e.g. executed in cronjob
-export ROOTSYS=/opt/root_v5.12.00f
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ROOTSYS/lib
-export PATH=$PATH:$ROOTSYS/bin
+# begin of script
+datasetdir=$dir/datasets
+sequencedir=$dir/sequences
+setupdir=$dir/setup
+mcdir=/magic/montecarlo
+mcrawdir=$mcdir/rawfiles
+mcstardir=$mcdir/star
+mcdataset=$datasetdir/mcdataset-test-train.txt
+mcdataset2=$datasetdir/mcdataset-for-sponde.txt
 
-mcdir=/magic/montecarlo/rawfiles
-mcdataset=$dir/mcdataset-test-train.txt
-mcdataset2=$dir/mcdataset-for-ganymed.txt
+# make directories 
+mkdir -pv $dir
+mkdir -v $sequencedir
+mkdir -v $datasetdir
 
 #calculation of the zbin
@@ -110,5 +99,5 @@
       zbin=`printf %02d $i`
       echo "zbin: $zbin"
-      path=$mcdir/19$zbin/$mode/$psf
+      path=$mcrawdir/19$zbin/$mode/$psf
       runsforfirst=
 
@@ -130,7 +119,9 @@
          unset runs[$k]
       done
-      date=`echo $path | cut -c 22-31 | sed -e 's/\//-/g'`
+      mcrawdir2=`echo $mcrawdir | sed -e 's/\//\\\\\//g'` 
+      date=`echo $path | sed -e "s/$mcrawdir2\///" -e 's/\//-/g'` 
+#      date=`echo $path | cut -c 22-31 | sed -e 's/\//-/g'`
       
-      trainsequfile=$dir/sequence$firstrunno.txt
+      trainsequfile=$sequencedir/sequence$firstrunno.txt
       trainsequences[$j]=$firstrunno
       echo "  writing train-sequfile "$trainsequfile 
@@ -143,5 +134,5 @@
       echo "" >> $trainsequfile
 
-      testsequfile=$dir/sequence$secondrunno.txt
+      testsequfile=$sequencedir/sequence$secondrunno.txt
       testsequences[$j]=$secondrunno
       echo "  writing test-sequfile "$testsequfile 
@@ -157,4 +148,5 @@
    done
 done
+
 
 echo "# test sequences: ${#testsequences[@]}"
@@ -181,24 +173,24 @@
    numtrain=${trainsequences[$i]}
    notrain=`echo $numtrain | cut -c 0-4`
-   echo "Sequence$numtrain.File: $dir/sequence$numtrain.txt" >> $mcdataset
-   echo "Sequence$numtrain.Dir:  /montecarlo/star/$notrain/$numtrain" >> $mcdataset
-   echo "Sequence$numtrain.File: $dir/sequence$numtrain.txt" >> $mcdataset2
-   echo "Sequence$numtrain.Dir:  /montecarlo/star/$notrain/$numtrain" >> $mcdataset2
+   echo "Sequence$numtrain.File: $sequencedir/sequence$numtrain.txt" >> $mcdataset
+   echo "Sequence$numtrain.Dir:  $mcstardir/$notrain/$numtrain" >> $mcdataset
+   echo "Sequence$numtrain.File: $sequencedir/sequence$numtrain.txt" >> $mcdataset2
+   echo "Sequence$numtrain.Dir:  $mcstardir/$notrain/$numtrain" >> $mcdataset2
 
    numtest=${testsequences[$i]}
    notest=`echo $numtest | cut -c 0-4`
-   echo "Sequence$numtest.File: $dir/sequence$numtest.txt" >> $mcdataset
-   echo "Sequence$numtest.Dir:  /montecarlo/star/$notrain/$numtrain" >> $mcdataset
-   echo "Sequence$numtest.File: $dir/sequence$numtest.txt" >> $mcdataset2
-   echo "Sequence$numtest.Dir:  /montecarlo/star/$notrain/$numtrain" >> $mcdataset2
+   echo "Sequence$numtest.File: $sequencedir/sequence$numtest.txt" >> $mcdataset
+   echo "Sequence$numtest.Dir:  $mcstardir/$notrain/$numtrain" >> $mcdataset
+   echo "Sequence$numtest.File: $sequencedir/sequence$numtest.txt" >> $mcdataset2
+   echo "Sequence$numtest.Dir:  $mcstardir/$notrain/$numtrain" >> $mcdataset2
 done
 
-# put # before the 'exit' to create rf-root-file for energy-estimation
-exit
 
-echo "creating rf-root-file for energy-estimation..."
-cd $mars
-logfile=$dir/trainenergy.log
+if [ "$trainenergy" == "yes" ]
+then 
+   echo "creating rf-root-file for energy-estimation..."
+   cd $mars
+   logfile=$setupdir/trainenergy.log
 
-root -q -b $macrospath/trainenergy.C+\("\"$mcdataset\""\,"\"$dir/\""\) | tee $logfile
-
+   root -q -b $mars/datacenter/macros/trainenergy.C+\("\"$mcdataset\""\,"\"$setupdir/\""\) | tee $logfile
+fi