Changeset 7426

Timestamp:

11/25/05 11:17:51 (19 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/checkfileavail.C (modified) (2 diffs)
• datacenter/scripts/checkfilesforsequenceavail (modified) (1 diff)
• datacenter/scripts/dowebplots (modified) (1 diff)
• datacenter/scripts/movingrawfiles (added)
• datacenter/scripts/movingsubsystemfiles (added)
• datacenter/scripts/runcallisto (modified) (3 diffs)
• datacenter/scripts/runganymed (modified) (1 diff)
• datacenter/scripts/runstar (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2005/11/25 Daniela Dorner
+
+   * datacenter/scripts/runcallisto, runstar, runganymed:
+     - removed some not-needed logging outpu
+
+   * datacenter/scripts/dowebplots:
+     - changed algorithm to create gifs/pngs from the root files
+
+   * datacenter/scripts/checkfilesforsequenceavail, 
+     datacenter/macros/checkfilesavail.C:
+     - fixed problem with manually inserted sequences
+
+   * datacenter/scripts/movingrawfiles, movingsubsystemfiles:
+     - added (scripts to move files from old (LP) to new structure (DC)
+
+
+
  2005/11/22 Thomas Bretz
 

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

@@ -71 +71 @@
 }
 
-int checkfileavail(TString sequenceno)
+int checkfileavail(TString sequencefile)
 {
     TEnv env("sql.rc");
@@ -89 +89 @@
     TEnv rc("steps.rc");
 
-    cout << "sequ: " << sequenceno.Data() << endl;
-    TString query(Form("SELECT fRunNumber FROM RunData WHERE fSequenceFirst=%s",
-                       sequenceno.Data()));
+    TEnv sequ(sequencefile);
+
+    TString runs;
+    runs = sequ.GetValue("Runs", "");
+    runs.ReplaceAll(" ", ",");
+    if (runs.IsNull())
+    {
+        cout << "ERROR - No runs in file " << sequencefile << " found." << endl;
+        return 0;
+    }
+
+    cout << "sequ file: " << sequencefile.Data() << endl;
+    TString query(Form("SELECT fRunNumber FROM RunData WHERE fRunNumber in (%s)",
+                       sequencefile.Data()));
 
     TSQLResult *res = serv.Query(query);

trunk/MagicSoft/Mars/datacenter/scripts/checkfilesforsequenceavail

@@ -82 +82 @@
    echo "checking files for sequence $sequence..." >> $scriptlog 2>&1 
    no=`printf %08d $sequence | cut -c 0-4`
+   no2=`printf %08d $sequence`
    outpath=$logpath/checkfileavail/$no
    echo "outpath: "$outpath  >> $scriptlog 2>&1 
    makedir $outpath  >> $scriptlog 2>&1 
+   
+   sequencefile=$sequpath/$no/sequence$no2.txt
 
-   check1=`root -q -b $macrospath/checkfileavail.C+\(\""$sequence\""\) | tee $outpath/checkfileavail-$sequence.log | grep int | sed -e 's/(int)//'`
+   check1=`root -q -b $macrospath/checkfileavail.C+\(\""$sequencefile\""\) | tee $outpath/checkfileavail-$sequence.log | grep int | sed -e 's/(int)//'`
 
    case $check1 in

trunk/MagicSoft/Mars/datacenter/scripts/dowebplots

@@ -72 +72 @@
 do 
    date >> $scriptlog 2>&1
-   path=`dirname $rootfile`
-   file=`basename $rootfile`
-   base=`echo $file | sed -e 's/.root$//g'`
-   echo "rootfile: $file" >> $scriptlog 2>&1
-   echo "path    : $path" >> $scriptlog 2>&1
-   echo "base    : $base" >> $scriptlog 2>&1
+   psfile=`echo $file | sed -e 's/.root$/.ps/g'`
+   echo "rootfile: $rootfile" >> $scriptlog 2>&1
+   echo "psfile:   $psfile" >> $scriptlog 2>&1
    
-   X=0
-   while [ "$X" -le "50" ] >> $scriptlog 2>&1
-   do 
-      X=$((X+1))
-      echo "$X. step" >> $scriptlog 2>&1
+   daterootfile=`date +%Y%m%d -r $rootfile` >> $scriptlog 2>&1
+   datepsfile=`date +%Y%m%d -r $psfile` >> $scriptlog 2>&1
+   if [ "$datepsfile" = "" ]
+   then
+      echo "date of psfile is empty -> the file $psfile doesn't exist" >> $scriptlog 2>&1
+      echo " -> setting date to 0 and producing psfile..." >> $scriptlog 2>&1
+      datepsfile=0
+   fi
 
-      tabfile=$path/$base-tab$X
-      daterootfile=`date +%Y%m%d -r $rootfile` >> $scriptlog 2>&1
-      dategiffile=`date +%Y%m%d -r $tabfile.gif` >> $scriptlog 2>&1
-      if [ "$dategiffile" = "" ]
-      then
-         echo "date of gif-file is empty -> the file $tabfile.gif doesn't exist" >> $scriptlog 2>&1
-         echo " -> setting date to 0 and producing gif-file..." >> $scriptlog 2>&1
-         dategiffile=0
-      fi
+   echo "checking date..."  >> $scriptlog 2>&1
+   echo "date of rootfile: $daterootfile" >> $scriptlog 2>&1
+   echo "date of psfile:   $datepsfile"   >> $scriptlog 2>&1
 
-      echo "checking date..."  >> $scriptlog 2>&1
-      echo "date of rootfile: $daterootfile" >> $scriptlog 2>&1
-      echo "date of giffile:  $dategiffile"  >> $scriptlog 2>&1
+   if [ "$datepsfile" -gt "$daterootfile" ] >> $scriptlog 2>&1
+   then
+      echo "psfile is older than rootfile -> continue " >> $scriptlog 2>&1
+      continue
+   fi
 
-      if [ "$dategiffile" -gt "$daterootfile" ] >> $scriptlog 2>&1
-      then
-         echo "gif-file is older than root-file -> continue " >> $scriptlog 2>&1
-         continue
-      fi
+   echo "producing psfile..." >> $scriptlog 2>&1
+   ./showplot -b --save-as-ps=$psfile $rootfile >> $scriptlog 2>&1
 
-      echo "producing ps-file with plots for tab $X..." >> $scriptlog 2>&1
-      ./showplot -b --save-as-ps=$tabfile --tab=$X $rootfile >> $scriptlog 2>&1
-      if ! ls $tabfile.ps >> $scriptlog 2>&1
-      then 
-         echo "tab $X doen't exist -> break" >> $scriptlog 2>&1
-         break
-      fi
-      echo "converting plots to gif for tab $X..." >> $scriptlog 2>&1
-      convert -verbose -rotate 90 $tabfile.ps $tabfile.gif >> $scriptlog 2>&1
-   done
+   echo "converting plots to png..." >> $scriptlog 2>&1
+   pstoimg -antialias -flip r270 -density 100 -type png -multipage $psfile >> $scriptlog 2>&1
 done
 

trunk/MagicSoft/Mars/datacenter/scripts/runcallisto

@@ -94 +94 @@
 todofiles=`ls -r $listpath/ToDo-$table-$column-*`
 
-echo "todofiles: "${todofiles[@]} >> $scriptlog 2>&1
+#echo "todofiles: "${todofiles[@]} >> $scriptlog 2>&1
 
 for todofile in ${todofiles[@]}
@@ -192 +192 @@
              then
                 echo "no ccfile found for run "$runno >> $scriptlog 2>&1
-                break
+                break 2
              fi
              echo "cacofile: "$cacofile >> $scriptlog 2>&1
@@ -211 +211 @@
                       continue
                    else
+                      echo "cacofile: "$cacofile >> $scriptlog 2>&1
                       break
-                      echo "cacofile: "$cacofile >> $scriptlog 2>&1
                    fi
                 done

trunk/MagicSoft/Mars/datacenter/scripts/runganymed

@@ -86 +86 @@
 todofiles=`ls $listpath/ToDo-$table-$column-*`
 
-echo "todofiles: "${todofiles[@]} >> $scriptlog 2>&1
+#echo "todofiles: "${todofiles[@]} >> $scriptlog 2>&1
 
 for todofile in ${todofiles[@]}

trunk/MagicSoft/Mars/datacenter/scripts/runstar

@@ -85 +85 @@
 todofiles=`ls $listpath/ToDo-$table-$column-*`
 
-echo "todofiles: "${todofiles[@]} >> $scriptlog 2>&1
+#echo "todofiles: "${todofiles[@]} >> $scriptlog 2>&1
 
 for todofile in ${todofiles[@]}