Changeset 8886 for trunk

Timestamp:

05/07/08 18:31:04 (17 years ago)

Author:

snruegam

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/scripts/checkmd5sum (modified) (3 diffs)
• datacenter/scripts/checktransfer (modified) (1 diff)
• datacenter/scripts/movingrawfiles2 (added)
• datacenter/scripts/runcallisto (modified) (2 diffs)
• datacenter/scripts/zipscript (modified) (2 diffs)
• resources/calibration_spline.rc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2008/05/07 Stefan Ruegamer
+
+   * datacenter/scripts/checkmd5sum
+     - implemented check of files from /magic and /data
+
+   * datacenter/scripts/checktransfer
+     - changed the search for temporary zipfiles to not search in hidden
+       directories
+
+   * datacenter/scripts/movingrawfiles2
+     - movingrawfiles to move raw files from /data/fromtape
+
+   * datacenter/scripts/runcallisto
+     - changed default callisto.rc to callisto_mux_new.rc
+
+   * datacenter/scripts/zipscript
+     - changed the script due to the fact that /magic/data/rawfiles is
+       now a link
+     - changed the find to not search in hidden directories
+     - added the -n option to ssh
+
+   * resources/calibration_spline.rc
+     - added calibration factors for periods 62-66 but these are not
+       newly calculated, simply pasted from previous periods!
+
+
 
  2008/04/08 Thomas Bretz

trunk/MagicSoft/Mars/datacenter/scripts/checkmd5sum

@@ -20 +20 @@
 #   Author(s): Stefan Ruegamer 05/2007 <mailto:snruegam@astro.uni-wuerzburg.de>
 #
-#   Copyright: MAGIC Software Development, 2000-2007
+#   Copyright: MAGIC Software Development, 2000-2008
 #
 #
@@ -74 +74 @@
       
       # check if the file has been extracted from tape; if not, don't write anything to the logfiles (so they can still be compared)
-      if [ ! -f /magic/datacenter/fromtape/${sum[0]} ]
+      if [ ! -f /magic/datacenter/fromtape/${sum[0]} ] && [ ! -f /data/fromtape/${sum[0]} ]
       then
         echo "File ${sum[0]} does not exist."
@@ -83 +83 @@
       echo "${sum[1]}  ${sum[0]}" >> ${checkpath}/tape_${id}.md5.lapalma
       
-      ssh -nx phoenix nice -n 19 /opt/csw/bin/gmd5sum /magic/datacenter/fromtape/${sum[0]} | sed -e 's/\/magic\/datacenter\/fromtape\///' >> ${checkpath}/tape_${id}.md5.wue
-      #md5sum /magic/datacenter/fromtape/${sum[0]} | sed -e 's/\/magic\/datacenter\/fromtape\///' >> ${checkpath}/tape_${id}.md5.wue
+      if [ ! -f /magic/datacenter/fromtape/${sum[0]} ]
+      then
+         ssh -nx phoenix nice -n 19 /opt/csw/bin/gmd5sum /data/fromtape/${sum[0]} | sed -e 's/\/data\/fromtape\///' >> ${checkpath}/tape_${id}.md5.wue
+      else
+         ssh -nx phoenix nice -n 19 /opt/csw/bin/gmd5sum /magic/datacenter/fromtape/${sum[0]} | sed -e 's/\/magic\/datacenter\/fromtape\///' >> ${checkpath}/tape_${id}.md5.wue
+         #md5sum /magic/datacenter/fromtape/${sum[0]} | sed -e 's/\/magic\/datacenter\/fromtape\///' >> ${checkpath}/tape_${id}.md5.wue
+      fi
    fi
 done < $file

trunk/MagicSoft/Mars/datacenter/scripts/checktransfer

@@ -64 +64 @@
 
 #checking if there are temporary zipfiles
-files=`find $datapath/rawfiles/ -name ".*\.raw\.??????"`
+files=`find $datapath/rawfiles/20[0-1][0-9]/ -name ".*\.raw\.??????"`
 
 for file in ${files[@]}

trunk/MagicSoft/Mars/datacenter/scripts/runcallisto

@@ -71 +71 @@
 sequfile="$sequpath/$no/sequence$no2.txt"
 
-# stage the needed files; to be removed as soon as the correct stub file size has been determined
-echo "staging files:" >> $scriptlog 2>&1
-day=`grep Night $sequfile | cut -c 18-27 | sed -e "s/-/\//g"`
-runs=`grep ^Runs $sequfile | cut -d: -f2`
-i=0
-
-for run in ${runs[@]}
-do
-   files[i]=20*_0*${run}_[PCD]_*_E.raw.gz
-   echo ${datapath}/rawfiles/${day}/${files[i]} >> $scriptlog 2>&1
-   let i++
-done
-
-ssh -nx phoenix "cd ${datapath}/rawfiles/${day}; /opt/SUNWsamfs/bin/stage ${files[@]}"
-
-
 # define callisto.rc files
 callistorcnew=$setuppath/$program/callisto.rc
-callistorcmux=$setuppath/$program/callisto_mux.rc
+#callistorcmux=$setuppath/$program/callisto_mux.rc
+callistorcmux=$setuppath/$program/callisto_mux_new.rc
 # find callisto.rc file
 if [ -e $outpath/callisto.rc ]
@@ -118 +103 @@
 primvar=$no2
 setstatus "start" >> $scriptlog 2>&1
+
+# stage the needed files; to be removed as soon as the correct stub file size has been determined
+echo "staging files:" >> $scriptlog 2>&1
+day=`grep Night $sequfile | cut -c 18-27 | sed -e "s/-/\//g"`
+runs=`grep ^Runs $sequfile | cut -d: -f2`
+i=0
+
+for run in ${runs[@]}
+do
+   files[i]=20*_0*${run}_[PCD]_*_E.raw.gz
+   echo ${datapath}/rawfiles/${day}/${files[i]} >> $scriptlog 2>&1
+   let i++
+done
+
+ssh -nx phoenix "cd ${datapath}/rawfiles/${day}; /opt/SUNWsamfs/bin/stage ${files[@]}"
+
 
 echo "./callisto -b -q -v4 -f --log=$outpath/$program$no2.log --html=$outpath/$program$no2.html --out=$outpath --config=$callistorcseq $sequfile  2>> $scriptlog > /dev/null" >> $scriptlog 2>&1

trunk/MagicSoft/Mars/datacenter/scripts/zipscript

@@ -36 +36 @@
 set -C
 
-rawdatapath=$datapath/rawfiles
-files=`find $rawdatapath -type f -name '*.raw'`
+rawdatapath=$datapath/rawfiles/
+files=`find ${rawdatapath}20* -type f -name '*.raw'`
 
 scriptlog=$runlogpath/$program-$datetime.log
@@ -83 +83 @@
    fi
    echo "zipping $file ..." >> $scriptlog 2>&1
-   if ssh -x phoenix nice -n 19 gzip -1f $file >> $scriptlog 2>&1
+   if ssh -xn phoenix nice -n 19 gzip -1f $file >> $scriptlog 2>&1
    then 
       gzfile=$file".gz"

trunk/MagicSoft/Mars/resources/calibration_spline.rc

@@ -59 +59 @@
 60: 0.93
 61: 0.93
+62: 0.93
+63: 0.93
+64: 0.93
+65: 0.93
+66: 0.93