Changeset 7572 for trunk/MagicSoft

Timestamp:

03/06/06 03:06:23 (19 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/resetcolumn.C (modified) (1 diff)
• datacenter/scripts/makecallistolinks (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -24 +24 @@
      - improved layout
 
+   * datacenter/script/makecallistolinks: 
+     - changed condition, when to make the link: only, if the link is 
+       not yet existing, it is done
+     - added resetting of db: if link is done, callisto is resetted
+
+   * datacenter/macros/resetcolumn.C: 
+     - added failure columns to the resetting
+
 
 

trunk/MagicSoft/Mars/datacenter/macros/resetcolumn.C

@@ -106 +106 @@
     //build query and reset columns
     TString query(Form("Update %s SET %s=NULL ", table.Data(), column.Data()));
+    query+=", fStartTime=NULL, fFailedTime=NULL, fReturnCode=NULL, fFailedCode=NULL, fFailedCodeAdd=NULL ";
 
     TIter Next(&l);

trunk/MagicSoft/Mars/datacenter/scripts/makecallistolinks

@@ -63 +63 @@
 for file in $files
 do 
-  pulse=`cat $file | grep "$reason1\|$reason2"` >> $scriptlog 2>&1
-  if [ ! "$pulse" = "" ]
-  then
-     path=`dirname $file` >> $scriptlog 2>&1
-     ln -vfs $setuppath/callisto/$callistorcnew $path/$callistorcseq >> $scriptlog 2>&1
-  fi
+   pulse=`cat $file | grep "$reason1\|$reason2"` >> $scriptlog 2>&1
+   sequ=`echo $file | cut -d/ -f6`
+
+   if [ ! "$pulse" = "" ]
+   then
+      if ! ls -l $callistorcseq | grep $callistorcnew >> $scriptlog 2>&1
+      then 
+         # resetting the calibration
+         echo "resetting the callisto for sequence $sequ" >> $scriptlog 2>&1
+         resetlogpath=$logpath/resetcallisto
+         echo "resetlogpath: $resetlogpath" >> $scriptlog 2>&1
+         makedir $resetlogpath >> $scriptlog 2>&1
+         resetlog=$resetlogpath/reset-callisto-$sequ.log
+
+         check1=`root -q -b $macrospath/resetcolumn.C+\("\"fCallisto\""\,"\"SequenceProcessStatus\""\,"\"$sequ\""\,"\"$sequ\""\,kFALSE\) | tee $resetlog | grep int | sed -e 's/(int)//'`
+         case $check1 in
+            1)   echo "check1=$check1 -> everything ok, callisto has been reset " >> $scriptlog 2>&1
+                 ;;
+            *)   echo "check1=$check1 -> ERROR -> step could not be resetted -> continue " >> $scriptlog 2>&1
+                 continue ;;
+         esac
+      #linking callisto.rc
+      path=`dirname $file` >> $scriptlog 2>&1
+      ln -vfs $setuppath/callisto/$callistorcnew $path/$callistorcseq >> $scriptlog 2>&1
+      fi
+   fi
 done