Changeset 8433

Timestamp:

04/23/07 19:58:21 (18 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/scripts/linkmc (modified) (2 diffs)
• datacenter/scripts/runganymed (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2007/04/23 Daniela Dorner
+
+   * datacenter/scripts/linkmc:
+     - removed workaround for 5-digit runnumbers
+
+   * datacenter/scripts/runganymed:
+     - adapted chosing of ganymed rc-file
+     - added output of ganymed command line
+
+
+
  2007/04/20 Daniel Hoehne
 

trunk/MagicSoft/Mars/datacenter/scripts/linkmc

@@ -124 +124 @@
    file=`basename $camfile` #filename
    no=`printf %08d $runno | cut -c 0-5` #first 5 digits of a 8digit runno -> for path
-#   no2=`printf %08d $runno` #runno with 8 digits
-# workaround due to 5digit runnumber for data with runnumber < 35487
-   no2=`printf %05d $runno`
+   no2=`printf %08d $runno` #runno with 8 digits
    zbin=`echo $file | cut -d_ -f2 | cut -c 5-6` #zbin from filename 
    zbin=`printf %02d $zbin` #2digit
@@ -215 +213 @@
    
    #create new filenames and link files
-# workaround due to 5digit runnumber for data with runnumber < 35487
-#   newcalfile="${dir}/${date}_00000002_C_MonteCarlo_E.root"
-   newcalfile="${dir}/${date}_00002_C_MonteCarlo_E.root"
+   newcalfile="${dir}/${date}_00000002_C_MonteCarlo_E.root"
    ln -sv $calfile $newcalfile >> $scriptlog 2>&1
-# workaround due to 5digit runnumber for data with runnumber < 35487
-#   newpedfile="${dir}/${date}_00000001_P_MonteCarlo_E.root"
-   newpedfile="${dir}/${date}_00001_P_MonteCarlo_E.root"
+   newpedfile="${dir}/${date}_00000001_P_MonteCarlo_E.root"
    ln -sv $pedfile $newpedfile >> $scriptlog 2>&1
 done

trunk/MagicSoft/Mars/datacenter/scripts/runganymed

@@ -67 +67 @@
 
 datasetfile="$datasetpath/$no/dataset$no2.txt"
-# get observation mode to choose ganymed.rc file
-wobble=`grep 'WobbleMode:' $datasetfile` >> $scriptlog 2>&1 
-wobble2=`echo $wobble | grep ^\#` >> $scriptlog 2>&1 
-if [ "$wobble2" = "" ]
+# choose ganymed.rc file
+if grep 'WobbleMode:' $datasetfile >/dev/null
 then 
-   mode="wobble" >> $scriptlog 2>&1 
+   ganymedrc=$setuppath/ganymed/ganymed_wobble.rc
 else
-   mode="onoff" >> $scriptlog 2>&1 
+   ganymedrc=$setuppath/ganymed/ganymed_onoff.rc
 fi
-ganymedrc=$setuppath/ganymed/ganymed_$mode.rc
 
 setstatus "start" >> $scriptlog 2>&1
 
+echo "./ganymed -b -q -v4 -f --ind=$datapath/star --ins=$sequpath --config=$ganymedrc --log=$outpath/$program$no2.log --html=$outpath/$program$no2.html --out=$outpath $datasetfile "  >> $scriptlog 2>&1
 ./ganymed -b -q -v4 -f --ind=$datapath/star --ins=$sequpath --config=$ganymedrc --log=$outpath/$program$no2.log --html=$outpath/$program$no2.html --out=$outpath $datasetfile  2>> $scriptlog> /dev/null
 check1=$?