Changeset 7232 for trunk/MagicSoft

Timestamp:

07/29/05 23:13:12 (19 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/buildsequenceentries.C (modified) (16 diffs)
• datacenter/macros/createdataset.C (modified) (1 diff)
• datacenter/macros/findcacofiles.C (modified) (2 diffs)
• datacenter/macros/getdolist.C (modified) (2 diffs)
• datacenter/macros/resetcolumn.C (modified) (1 diff)
• datacenter/macros/writesequencefile.C (modified) (4 diffs)
• datacenter/scripts/buildsequenceentries (modified) (2 diffs)
• datacenter/scripts/checkfilesforsequenceavail (modified) (1 diff)
• datacenter/scripts/checkstardone (modified) (2 diffs)
• datacenter/scripts/correcttime (modified) (1 diff)
• datacenter/scripts/doexclusions (modified) (1 diff)
• datacenter/scripts/filesondisk (modified) (1 diff)
• datacenter/scripts/fillcallisto (modified) (1 diff)
• datacenter/scripts/fillstar (modified) (1 diff)
• datacenter/scripts/insertdatasets (modified) (1 diff)
• datacenter/scripts/runcallisto (modified) (3 diffs)
• datacenter/scripts/runganymed (modified) (3 diffs)
• datacenter/scripts/runstar (modified) (2 diffs)
• datacenter/scripts/sourcefile (modified) (1 diff)
• datacenter/scripts/writesequencefiles (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2005/07/29 Daniela Dorner
+
+   * datacenter/scripts/sourcefile:
+     - added four more general paths to the sourcefile to make it 
+       easier to use the software for different users, paths and setups
+
+   * datacenter/scripts/buildsequenceentries, checkstardone, 
+     checkfilesforsequenceavail, correcttime, doexclusions, filesondisk,
+     fillcallisto, fillstar, insertdatasets, runcallisto, runganymed, 
+     runstar, writesequencefiles:
+     - adapted this scripts to the usage of the paths
+
+   * datacenter/macros/buildsequenceentries.C, findcacofiles.C, 
+     getdolist.C, writesequencefile.C:
+     - adapted this macros to the usage of the paths
+
+   * datacenter/macros/buildsequenceentries.C, createdataset.C, 
+     resetcolumn.C:
+     - fixed documentation of this macros
+
+
+
  2005/07/27 Markus Meyer, Daniela Dorner
 
-   * datacenter/fillstar.C:
+   * datacenter/macros/fillstar.C:
      - implemented new algorithm and new values for the calculation 
        of the muon parameter in the database

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

@@ -31 +31 @@
 // to group the runs of one night into sequences, this marco:
 // - reads the runinformation of one night from the database
-// - sorts the runs by source
-// - groups the runs to sequences such that each run belongs
+// - group the runs into sets of following runs with the same conditions
+// - groups the runs in this sets to sequences such that each run belongs
 //   to the nearest (in time) calibration run
-//
-// apart from that the runs in one sequence must have the same
-// hv-settings, trigger tables, light conditions, DT tables,
-// trigger delay tables and testflag
+// - check if the runs with the same runtype have the same calibration script
+//   and the same trigger tables
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -62 +60 @@
 int debug = 0;
 
-Bool_t DeleteSequence(MSQLServer &serv, Int_t sequ, Bool_t dummy)
+Bool_t DeleteSequence(MSQLServer &serv, TString datapath, TString sequpath, Int_t sequ, Bool_t dummy)
 {
     TString query1(Form("DELETE FROM Calibration WHERE fSequenceFirst=%d", sequ));
@@ -70 +68 @@
     TString query5(Form("DELETE FROM Sequences WHERE fSequenceFirst=%d AND fManuallyChangedKEY=1", sequ));
 
-    TString fname(Form("/mnt/stk01/sequences/%04d/sequence%08d.txt", sequ/10000, sequ));
-    TString command(Form("rm -r /magic/data/callisto/%04d/%08d/", sequ/10000, sequ));
-    TString command2(Form("rm -r /magic/data/star/%04d/%08d/", sequ/10000, sequ));
+    TString fname(Form("%s/%04d/sequence%08d.txt", sequpath.Data(),sequ/10000, sequ));
+    TString command(Form("rm -r %s/callisto/%04d/%08d/", datapath.Data(), sequ/10000, sequ));
+    TString command2(Form("rm -r %s/star/%04d/%08d/", datapath.Data(), sequ/10000, sequ));
 
     if (dummy)
@@ -177 +175 @@
 }
 
-Bool_t CheckSequence(MSQLServer &serv, Int_t from, Int_t to, Bool_t dummy)
+Bool_t CheckSequence(MSQLServer &serv, TString datapath, TString sequpath, Int_t from, Int_t to, Bool_t dummy)
 {
     Bool_t rc=kFALSE;
@@ -213 +211 @@
             {
                 cout << "deleting sequence " << sequences.At(i) << "... <" << i << ">" << endl;
-                if(!DeleteSequence(serv, sequences.At(i), dummy))
+                if(!DeleteSequence(serv, datapath, sequpath, sequences.At(i), dummy))
                    rc=kFALSE;
             }
@@ -267 +265 @@
         {
             cout << "different sequsizes -> deleting sequence " << sequences.At(0) << endl;
-            return DeleteSequence(serv, sequences.At(0), dummy);
+            return DeleteSequence(serv, datapath, sequpath, sequences.At(0), dummy);
         }
 
@@ -275 +273 @@
                 continue;
             cout << "different runs -> deleting sequence " << sequences.At(0) << endl;
-            return DeleteSequence(serv, sequences.At(0), dummy);
+            return DeleteSequence(serv, datapath, sequpath, sequences.At(0), dummy);
         }
 
@@ -405 +403 @@
 }
 
-Bool_t NewSequence(MSQLServer &serv, Int_t from, Int_t to, Bool_t dummy)
+Bool_t NewSequence(MSQLServer &serv, TString datapath, TString sequpath, Int_t from, Int_t to, Bool_t dummy)
 {
     cout << "Found Sequence (" << from << ", " << to << ") ... checking runs..." << flush;
@@ -429 +427 @@
     cout << "checking Sequence..." << endl;
 
-    if (!CheckSequence(serv, from, to, dummy))
+    if (!CheckSequence(serv, datapath, sequpath, from, to, dummy))
     {
         cout << " inserting sequence not necessary" << endl;
@@ -446 +444 @@
 }
 
-Bool_t Process(MSQLServer &serv, Int_t from, Int_t to, Bool_t dummy)
+Bool_t Process(MSQLServer &serv, TString datapath, TString sequpath, Int_t from, Int_t to, Bool_t dummy)
 {
 
@@ -589 +587 @@
             if (n!=-1)
             {
-                if (!NewSequence(serv, start, last, dummy))
+                if (!NewSequence(serv, datapath, sequpath, start, last, dummy))
                 {
                     rc = kFALSE;
@@ -605 +603 @@
     if (n!=-1 && start!=last)
     {
-        if (!NewSequence(serv, start, last, dummy))
+        if (!NewSequence(serv, datapath, sequpath, start, last, dummy))
             rc = kFALSE;
     }
@@ -617 +615 @@
 
 
-int buildsequenceentries(TString day, Bool_t dummy=kTRUE)
+int buildsequenceentries(TString day, TString datapath, TString sequpath, Bool_t dummy=kTRUE)
 {
     TEnv env("sql.rc");
@@ -704 +702 @@
         cout << endl << "datablock from " << runstart2 << " to " << runstop2 << endl;
 
-        if (!Process(serv, runstart2, runstop2, dummy))
+        if (!Process(serv, datapath, sequpath, runstart2, runstop2, dummy))
             rc = kFALSE;
 
@@ -712 +710 @@
 
 
-int buildsequenceentries()
+int buildsequenceentries(TString datapath, TString sequpath, Bool_t dummy=kTRUE)
 {
     TEnv env("sql.rc");
@@ -733 +731 @@
     {
         cout << "date: " << (*row)[0] << endl;
-        buildsequenceentries((*row)[0]);
+        buildsequenceentries((*row)[0], dummy);
     }
 

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

@@ -27 +27 @@
 // createdataset.C
 // ===============
+//
+// this script is not run automatically
+// the purpose of this script is to make it easier for people to write
+// datasetfiles
+//
+// be careful with the path in this macro, if you use it for test-reasons!
 //
 /////////////////////////////////////////////////////////////////////////////

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

@@ -44 +44 @@
 
 
-int findcacofiles(TString date)
+int findcacofiles(TString date, TString logpath)
 {
     TEnv env("sql.rc");
@@ -72 +72 @@
     }
 
-    Int_t idx = date.First('-');
-    TString year = date(0, idx);
-    cout << "year: " << year << endl;
-
-    ofstream fout("/magic/datacenter/autologs/filesondisk/"+year+"/findcacofiles-"+date+".txt");
+    TString filename(Form("%s/findcacofiles-%s.txt", logpath.Data(), date.Data()));
+    ofstream fout(filename, ios::app);
     if (!fout)
     {
-        cout << "ERROR - Cannot open file." << endl;
-        return kFALSE;
+        cout << "ERROR - Cannot open file " << filename << endl;
+        return 0;
     }
-    TString runnumber=0;
+
     TSQLRow *row=0;
     while ((row = res->Next()))

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

@@ -45 +45 @@
 
 
-int getdolist(TString table, TString column, TString date)
+int getdolist(TString table, TString column, TString date, TString listpath)
 {
     TEnv env("sql.rc");
@@ -118 +118 @@
         return 0;
 
-    ofstream fout("/magic/datacenter/lists/ToDo-"+table+"-"+column+".txt", ios::app);
-//    ofstream fout("/data/MAGIC/datacenter/"+table+"-"+column+".txt", ios::app);
+    TString filename(Form("%s/ToDo%s-%s.txt", listpath.Data(), table.Data(), column.Data()));
+    ofstream fout(filename, ios::app);
+    if (!fout)
+    {
+        cout << "ERROR - Cannot open file " << filename << endl;
+        return 0;
+    }
 
     TSQLRow *row=0;

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

@@ -33 +33 @@
 // for this step in the DB has to be reset. This can be done with this macro.
 //
-// As arguments you have to give the column, the table and the from which
+// As arguments you have to give the column, the table and from which
 // to which Date/Sequence/Run you want to reset the value.
 //

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

@@ -233 +233 @@
 }
 
-Bool_t GetSequence(MSQLServer &serv, TSQLRow &data)
+Bool_t GetSequence(MSQLServer &serv, TSQLRow &data, TString sequpath)
 {
     UShort_t y;
@@ -257 +257 @@
         return kFALSE;
 
-    TString fname(Form("/mnt/stk01/sequences/%04d/sequence%08d.txt", atoi(data[0])/10000, atoi(data[0])));
+    TString fname(Form("%s/sequences/%04d/sequence%08d.txt", sequpath.Data(), atoi(data[0])/10000, atoi(data[0])));
     cout << "Creating " << fname << "..." << flush;
 
@@ -308 +308 @@
 
 // This tool will work from Period017 (2004_05_17) on...
-int writesequencefile(Int_t sequno)
+int writesequencefile(Int_t sequno, TString sequpath)
 {
     TEnv env("sql.rc");
@@ -333 +333 @@
     TSQLRow *row = 0;
     while ((row = res->Next()))
-        if (!GetSequence(serv, *row))
+        if (!GetSequence(serv, *row, sequpath))
             return 0;
 

trunk/MagicSoft/Mars/datacenter/scripts/buildsequenceentries

@@ -83 +83 @@
 
 echo "getting list..." >> $scriptlog 2>&1
-check0=`root -q -b $macrospath/getdolist.C+\("\"$table\""\,"\"$column\""\,"\"$date\""\) | tee $getstatus.log | grep int | sed -e 's/(int)//'`
+check0=`root -q -b $macrospath/getdolist.C+\("\"$table\""\,"\"$column\""\,"\"$date\""\,"\"$listpath\""\) | tee $getstatus.log | grep int | sed -e 's/(int)//'`
 
 case $check0 in 
@@ -117 +117 @@
       fi
    fi
-   check1=`root -q -b $macrospath/buildsequenceentries.C+\("\"$date\""\,kFALSE\) | tee $buildsequentriespath/buildsequenceentries-$date.log | grep int | sed -e 's/(int)//'`
+   check1=`root -q -b $macrospath/buildsequenceentries.C+\("\"$date\""\,"\"$datapath\""\,"\"$sequpath\""\,kFALSE\) | tee $buildsequentriespath/buildsequenceentries-$date.log | grep int | sed -e 's/(int)//'`
 
    case $check1 in

trunk/MagicSoft/Mars/datacenter/scripts/checkfilesforsequenceavail

@@ -74 +74 @@
 
 echo "getting list..." >> $scriptlog 2>&1
-check0=`root -q -b $macrospath/getdolist.C+\("\"$table\""\,"\"$column\""\,"\"$date\""\) | tee $getstatuslog | grep int | sed -e 's/(int)//'`
+check0=`root -q -b $macrospath/getdolist.C+\("\"$table\""\,"\"$column\""\,"\"$date\""\,"\"$listpath\""\) | tee $getstatuslog | grep int | sed -e 's/(int)//'`
 
 case $check0 in 

trunk/MagicSoft/Mars/datacenter/scripts/checkstardone

@@ -75 +75 @@
 
 echo "getting list..." >> $scriptlog 2>&1
-check0=`root -q -b $macrospath/getdolist.C+\("\"$table\""\,"\"$column\""\,"\"$date\""\) | tee $getstatuslog | grep int | sed -e 's/(int)//'`
+check0=`root -q -b $macrospath/getdolist.C+\("\"$table\""\,"\"$column\""\,"\"$date\""\,"\"$listpath\""\) | tee $getstatuslog | grep int | sed -e 's/(int)//'`
 
 case $check0 in 
@@ -99 +99 @@
    no=`printf %08d $dataset | cut -c 0-5`
    echo "checking files for dataset $dataset..." >> $scriptlog 2>&1 
-   datasetfile=/magic/datasets/$no/dataset`printf %08d $dataset`.txt
+   datasetfile=$datasetpath/$no/dataset`printf %08d $dataset`.txt
    sequences=(`cat $datasetfile | grep Sequences | sed -e 's/SequencesOn://g' | sed -e 's/SequencesOff://g'`)
    

trunk/MagicSoft/Mars/datacenter/scripts/correcttime

@@ -59 +59 @@
 
 echo "getting list..."
-check0=`root -q -b $macrospath/getdolist.C+\("\"$table\""\,"\"$column\""\,"\"$date\""\) | tee $getstatuslog | grep int | sed -e 's/(int)//'`
+check0=`root -q -b $macrospath/getdolist.C+\("\"$table\""\,"\"$column\""\,"\"$date\""\,"\"$listpath\""\) | tee $getstatuslog | grep int | sed -e 's/(int)//'`
 
 case $check0 in 

trunk/MagicSoft/Mars/datacenter/scripts/doexclusions

@@ -83 +83 @@
 
 echo "getting list..." >> $scriptlog 2>&1
-check0=`root -q -b $macrospath/getdolist.C+\("\"$table\""\,"\"$column\""\,"\"$date\""\) | tee $getstatuslog | grep int | sed -e 's/(int)//'`
+check0=`root -q -b $macrospath/getdolist.C+\("\"$table\""\,"\"$column\""\,"\"$date\""\,"\"$listpath\""\) | tee $getstatuslog | grep int | sed -e 's/(int)//'`
 
 case $check0 in 

trunk/MagicSoft/Mars/datacenter/scripts/filesondisk

@@ -85 +85 @@
 
 echo "checking missing cacofiles..."
-check1=`root -q -b $macrospath/findcacofiles.C+\("\"$date\""\) | tee $filesondisklogpath/findcacofiles-$date.log | grep int | sed -e 's/(int)//'`
+check1=`root -q -b $macrospath/findcacofiles.C+\("\"$date\""\,"\"$filesondisklogpath\""\) | tee $filesondisklogpath/findcacofiles-$date.log | grep int | sed -e 's/(int)//'`
 
 case $check1 in 

trunk/MagicSoft/Mars/datacenter/scripts/fillcallisto

@@ -83 +83 @@
 
 echo "getting list..." >> $scriptlog 2>&1
-check0=`root -q -b $macrospath/getdolist.C+\("\"$table\""\,"\"$column\""\,"\"$date\""\) | tee $getstatuslog | grep int | sed -e 's/(int)//'`
+check0=`root -q -b $macrospath/getdolist.C+\("\"$table\""\,"\"$column\""\,"\"$date\""\,"\"$listpath\""\) | tee $getstatuslog | grep int | sed -e 's/(int)//'`
 
 case $check0 in 

trunk/MagicSoft/Mars/datacenter/scripts/fillstar

@@ -83 +83 @@
 
 echo "getting list..." >> $scriptlog 2>&1
-check0=`root -q -b $macrospath/getdolist.C+\("\"$table\""\,"\"$column\""\,"\"$date\""\) | tee $getstatuslog | grep int | sed -e 's/(int)//'`
+check0=`root -q -b $macrospath/getdolist.C+\("\"$table\""\,"\"$column\""\,"\"$date\""\,"\"$listpath\""\) | tee $getstatuslog | grep int | sed -e 's/(int)//'`
 
 case $check0 in 

trunk/MagicSoft/Mars/datacenter/scripts/insertdatasets

@@ -64 +64 @@
 
 
-datasetfiles=(`ls /magic/datasets/*/*`)
+datasetfiles=(`ls $datasetpath/*/*`)
 echo "datasetfiles: "${datasetfiles[@]}  >> $scriptlog 2>&1 
 echo "" >> $scriptlog 2>&1 

trunk/MagicSoft/Mars/datacenter/scripts/runcallisto

@@ -32 +32 @@
 set -C
 
-callistorcnew=/magic/datacenter/setup/callisto/callisto.rc
+callistorcnew=$setuppath/callisto/callisto.rc
 
 table=SequenceProcessStatus
@@ -95 +95 @@
    
    echo "getting list..." >> $scriptlog 2>&1
-   check0=`root -q -b $macrospath/getdolist.C+\("\"$table\""\,"\"$column\""\,"\"$date\""\) | tee $getstatuslog | grep int | sed -e 's/(int)//'`
+   check0=`root -q -b $macrospath/getdolist.C+\("\"$table\""\,"\"$column\""\,"\"$date\""\,"\"$listpath\""\) | tee $getstatuslog | grep int | sed -e 's/(int)//'`
    
    case $check0 in 
@@ -187 +187 @@
     fi
   fi
-  sequfile="/magic/sequences/$no/sequence$no2.txt"
+  sequfile="$sequpath/$no/sequence$no2.txt"
   echo "sequfile: "$sequfile >> $scriptlog 2>&1
   

trunk/MagicSoft/Mars/datacenter/scripts/runganymed

@@ -90 +90 @@
 else
    echo "getting list..." >> $scriptlog 2>&1
-   check0=`root -q -b $macrospath/getdolist.C+\("\"$table\""\,"\"$column\""\,"\"$date\""\) | tee $getstatuslog | grep int | sed -e 's/(int)//'`
+   check0=`root -q -b $macrospath/getdolist.C+\("\"$table\""\,"\"$column\""\,"\"$date\""\,"\"$listpath\""\) | tee $getstatuslog | grep int | sed -e 's/(int)//'`
    
    case $check0 in 
@@ -181 +181 @@
     fi
   fi
-  datasetfile="/magic/datasets/$no/dataset$no2.txt"
+  datasetfile="$datasetpath/$no/dataset$no2.txt"
   echo "datasetfile: "$datasetfile >> $scriptlog 2>&1
   wobble=`grep 'WobbleMode:' $datasetfile` >> $scriptlog 2>&1 
@@ -191 +191 @@
      mode="onoff" >> $scriptlog 2>&1 
   fi
-  ganymedrc=/magic/datacenter/setup/ganymed/ganymed_$mode.rc
+  ganymedrc=$setuppath/ganymed/ganymed_$mode.rc
   
   echo "run ganymed..." >> $scriptlog 2>&1

trunk/MagicSoft/Mars/datacenter/scripts/runstar

@@ -90 +90 @@
 else
    echo "getting list..." >> $scriptlog 2>&1
-   check0=`root -q -b $macrospath/getdolist.C+\("\"$table\""\,"\"$column\""\,"\"$date\""\) | tee $getstatuslog | grep int | sed -e 's/(int)//'`
+   check0=`root -q -b $macrospath/getdolist.C+\("\"$table\""\,"\"$column\""\,"\"$date\""\,"\"$listpath\""\) | tee $getstatuslog | grep int | sed -e 's/(int)//'`
    
    case $check0 in 
@@ -184 +184 @@
     fi
   fi
-  sequfile="/magic/sequences/$no/sequence$no2.txt"
+  sequfile="$sequpath/$no/sequence$no2.txt"
   echo "sequfile: "$sequfile >> $scriptlog 2>&1
   

trunk/MagicSoft/Mars/datacenter/scripts/sourcefile

@@ -35 +35 @@
 scriptspath=$mars/datacenter/scripts
 
+logpath=/magic/datacenter/autologs
 lockpath=/magic/datacenter/locks
 listpath=/magic/datacenter/lists
-logpath=/magic/datacenter/autologs
+setuppath=/magic/datacenter/setup
+
 datapath=/magic/data
+subsystempath=/magic/subsystemdata
+sequpath=/magic/sequences
+datasetpath=/magic/datasets
 

trunk/MagicSoft/Mars/datacenter/scripts/writesequencefiles

@@ -83 +83 @@
 
 echo "getting list..." >> $scriptlog 2>&1
-check0=`root -q -b $macrospath/getdolist.C+\("\"$table\""\,"\"$column\""\,"\"$date\""\) | tee $getstatuslog | grep int | sed -e 's/(int)//'`
+check0=`root -q -b $macrospath/getdolist.C+\("\"$table\""\,"\"$column\""\,"\"$date\""\,"\"$listpath\""\) | tee $getstatuslog | grep int | sed -e 's/(int)//'`
 
 case $check0 in 
@@ -107 +107 @@
    no=`printf %08d $sequence | cut -c 0-4`
    no2=`printf %08d $sequence`
-   sequencepath=/magic/sequences/$no
+   sequencepath=$sequpath/$no
    if [ ! -d $sequencepath ]
    then
@@ -131 +131 @@
 
    echo "write sequencefile for sequence $sequence" >> $scriptlog 2>&1
-   check2=`root -q -b $macrospath/writesequencefile.C+\($sequence\) | tee $writesequencefilelogpath/writesequencefile-$no2.log | grep int | sed -e 's/(int)//'`
+   check2=`root -q -b $macrospath/writesequencefile.C+\($sequence\,"\"$sequpath\""\) | tee $writesequencefilelogpath/writesequencefile-$no2.log | grep int | sed -e 's/(int)//'`
    case $check2 in
       1)   echo "check2=$check2 -> everthing ok " >> $scriptlog 2>&1