]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - SHUTTLE/AliShuttle.cxx
1) Storing of files to the Grid is now done _after_ your preprocessors succeeded...
[u/mrichter/AliRoot.git] / SHUTTLE / AliShuttle.cxx
index bcea5a661e098530ba4050f94bed5d628dd62679..3b2b4b7dcdc647f1881e46fcd9cdf1f696e8fb45 100644 (file)
 
 /*
 $Log$
+Revision 1.33  2007/04/03 13:56:01  acolla
+Grid Storage at the end of preprocessing. Added virtual method to disable DCS query according to the
+run type.
+
+Revision 1.32  2007/02/28 10:41:56  acolla
+Run type field added in SHUTTLE framework. Run type is read from "run type" logbook and retrieved by
+AliPreprocessor::GetRunType() function.
+Added some ldap definition files.
+
+Revision 1.30  2007/02/13 11:23:21  acolla
+Moved getters and setters of Shuttle's main OCDB/Reference, local
+OCDB/Reference, temp and log folders to AliShuttleInterface
+
+Revision 1.27  2007/01/30 17:52:42  jgrosseo
+adding monalisa monitoring
+
+Revision 1.26  2007/01/23 19:20:03  acolla
+Removed old ldif files, added TOF, MCH ldif files. Added some options in
+AliShuttleConfig::Print. Added in Ali Shuttle: SetShuttleTempDir and
+SetShuttleLogDir
+
 Revision 1.25  2007/01/15 19:13:52  acolla
 Moved some AliInfo to AliDebug in SendMail function
 
@@ -164,6 +185,13 @@ some docs added
 #include <TSQLResult.h>
 #include <TSQLRow.h>
 #include <TMutex.h>
+#include <TSystemDirectory.h>
+#include <TSystemFile.h>
+#include <TFileMerger.h>
+#include <TGrid.h>
+#include <TGridResult.h>
+
+#include <TMonaLisaWriter.h>
 
 #include <fstream>
 
@@ -172,16 +200,6 @@ some docs added
 
 ClassImp(AliShuttle)
 
-TString AliShuttle::fgkMainCDB("alien://folder=ShuttleCDB");
-TString AliShuttle::fgkLocalCDB("local://LocalShuttleCDB");
-TString AliShuttle::fgkMainRefStorage("alien://folder=ShuttleReference");
-TString AliShuttle::fgkLocalRefStorage("local://LocalReferenceStorage");
-
-Bool_t AliShuttle::fgkProcessDCS(kTRUE); 
-
-TString AliShuttle::fgkShuttleTempDir = gSystem->ExpandPathName("$ALICE_ROOT/SHUTTLE/temp");
-TString AliShuttle::fgkShuttleLogDir = gSystem->ExpandPathName("$ALICE_ROOT/SHUTTLE/log");
-
 //______________________________________________________________________________________________
 AliShuttle::AliShuttle(const AliShuttleConfig* config,
                UInt_t timeout, Int_t retries):
@@ -191,10 +209,12 @@ fPreprocessorMap(),
 fLogbookEntry(0),
 fCurrentDetector(),
 fStatusEntry(0),
-fGridError(kFALSE),
 fMonitoringMutex(0),
 fLastActionTime(0),
-fLastAction()
+fLastAction(),
+fMonaLisa(0),
+fTestMode(kNone),
+fReadTestMode(kFALSE)
 {
        //
        // config: AliShuttleConfig used
@@ -219,7 +239,9 @@ fLastAction()
 //______________________________________________________________________________________________
 AliShuttle::~AliShuttle()
 {
-// destructor
+       //
+       // destructor
+       //
 
        fPreprocessorMap.DeleteAll();
        for(int iSys=0;iSys<4;iSys++)
@@ -263,56 +285,59 @@ void AliShuttle::RegisterPreprocessor(AliPreprocessor* preprocessor)
        fPreprocessorMap.Add(new TObjString(detName), preprocessor);
 }
 //______________________________________________________________________________________________
-UInt_t AliShuttle::Store(const AliCDBPath& path, TObject* object,
+Bool_t AliShuttle::Store(const AliCDBPath& path, TObject* object,
                AliCDBMetaData* metaData, Int_t validityStart, Bool_t validityInfinite)
 {
-  // Stores a CDB object in the storage for offline reconstruction. Objects that are not needed for
-  // offline reconstruction, but should be stored anyway (e.g. for debugging) should NOT be stored
-  // using this function. Use StoreReferenceData instead!
-  // It calls WriteToCDB function which perform actual storage
-
-       return WriteToCDB(fgkMainCDB, fgkLocalCDB, path, object,
-                               metaData, validityStart, validityInfinite);
+       // Stores a CDB object in the storage for offline reconstruction. Objects that are not needed for
+       // offline reconstruction, but should be stored anyway (e.g. for debugging) should NOT be stored
+       // using this function. Use StoreReferenceData instead!
+       // It calls StoreLocally function which temporarily stores the data locally; when the preprocessor
+       // finishes the data are transferred to the main storage (Grid).
 
+       return StoreLocally(fgkLocalCDB, path, object, metaData, validityStart, validityInfinite);
 }
 
 //______________________________________________________________________________________________
-UInt_t AliShuttle::StoreReferenceData(const AliCDBPath& path, TObject* object, AliCDBMetaData* metaData)
+Bool_t AliShuttle::StoreReferenceData(const AliCDBPath& path, TObject* object, AliCDBMetaData* metaData)
 {
-  // Stores a CDB object in the storage for reference data. This objects will not be available during
-  // offline reconstrunction. Use this function for reference data only!
-  // It calls WriteToCDB function which perform actual storage
-
-       return WriteToCDB(fgkMainRefStorage, fgkLocalRefStorage, path, object, metaData);
+       // Stores a CDB object in the storage for reference data. This objects will not be available during
+       // offline reconstrunction. Use this function for reference data only!
+       // It calls StoreLocally function which temporarily stores the data locally; when the preprocessor
+       // finishes the data are transferred to the main storage (Grid).
 
+       return StoreLocally(fgkLocalRefStorage, path, object, metaData);
 }
 
 //______________________________________________________________________________________________
-UInt_t AliShuttle::WriteToCDB(const char* mainUri, const char* localUri,
+Bool_t AliShuttle::StoreLocally(const TString& localUri,
                        const AliCDBPath& path, TObject* object, AliCDBMetaData* metaData,
                        Int_t validityStart, Bool_t validityInfinite)
 {
-  // write object into the CDB. Parameters are passed by Store and StoreReferenceData functions.
-  // The parameters are:
-  //   1) Uri of the main storage (Grid)
-  //   2) Uri of the backup storage (Local)
-  //   3) the object's path.
-  //   4) the object to be stored
-  //   5) the metaData to be associated with the object
-  //   6) the validity start run number w.r.t. the current run,
-  //      if the data is valid only for this run leave the default 0
-  //   7) specifies if the calibration data is valid for infinity (this means until updated),
-  //      typical for calibration runs, the default is kFALSE
-  //
-  // returns 0 if fail
-  //        1 if stored in main (Grid) storage
-  //        2 if stored in backup (Local) storage
-
-       const char* cdbType = (mainUri == fgkMainCDB) ? "CDB" : "Reference";
+       // Store object temporarily in local storage. Parameters are passed by Store and StoreReferenceData functions.
+       // when the preprocessor finishes the data are transferred to the main storage (Grid).
+       // The parameters are:
+       //   1) Uri of the backup storage (Local)
+       //   2) the object's path.
+       //   3) the object to be stored
+       //   4) the metaData to be associated with the object
+       //   5) the validity start run number w.r.t. the current run,
+       //      if the data is valid only for this run leave the default 0
+       //   6) specifies if the calibration data is valid for infinity (this means until updated),
+       //      typical for calibration runs, the default is kFALSE
+       //
+       // returns 0 if fail, 1 otherwise
+
+       if (fTestMode & kErrorStorage)
+       {
+               Log(fCurrentDetector, "StoreLocally - In TESTMODE - Simulating error while storing locally");
+               return kFALSE;
+       }
+       
+       const char* cdbType = (localUri == fgkLocalCDB) ? "CDB" : "Reference";
 
        Int_t firstRun = GetCurrentRun() - validityStart;
        if(firstRun < 0) {
-               AliError("First valid run happens to be less than 0! Setting it to 0.");
+               AliWarning("First valid run happens to be less than 0! Setting it to 0.");
                firstRun=0;
        }
 
@@ -323,57 +348,387 @@ UInt_t AliShuttle::WriteToCDB(const char* mainUri, const char* localUri,
                lastRun = GetCurrentRun();
        }
 
-       AliCDBId id(path, firstRun, lastRun, -1, -1);
+       // Version is set to current run, it will be used later to transfer data to Grid
+       AliCDBId id(path, firstRun, lastRun, GetCurrentRun(), -1);
 
        if(! dynamic_cast<TObjString*> (metaData->GetProperty("RunUsed(TObjString)"))){
                TObjString runUsed = Form("%d", GetCurrentRun());
                metaData->SetProperty("RunUsed(TObjString)", runUsed.Clone());
        }
 
-       UInt_t result = 0;
+       Bool_t result = kFALSE;
 
-       if (!(AliCDBManager::Instance()->GetStorage(mainUri))) {
-               AliError(Form("WriteToCDB - Cannot activate main %s storage", cdbType));
+       if (!(AliCDBManager::Instance()->GetStorage(localUri))) {
+               Log("SHUTTLE", Form("StoreLocally - Cannot activate local %s storage", cdbType));
        } else {
-               result = (UInt_t) AliCDBManager::Instance()->GetStorage(mainUri)
+               result = AliCDBManager::Instance()->GetStorage(localUri)
                                        ->Put(object, id, metaData);
        }
 
        if(!result) {
 
-               Log(fCurrentDetector,
-                       Form("WriteToCDB - Problem with main %s storage. Putting <%s> into backup storage",
-                               cdbType, path.GetPath().Data()));
+               Log(fCurrentDetector, Form("StoreLocally - Can't store object <%s>!", id.ToString().Data()));
+       }
 
-               // Set Grid version to current run number, to ease retrieval later
-               id.SetVersion(GetCurrentRun());
+       return result;
+}
 
-               result = AliCDBManager::Instance()->GetStorage(localUri)
-                                       ->Put(object, id, metaData);
+//______________________________________________________________________________________________
+Bool_t AliShuttle::StoreOCDB()
+{
+       //
+       // Called when preprocessor ends successfully or when previous storage attempt failed (kStoreError status)
+       // Calls underlying StoreOCDB(const char*) function twice, for OCDB and Reference storage.
+       // Then calls StoreRefFilesToGrid to store reference files. 
+       //
+       
+       if (fTestMode & kErrorGrid)
+       {
+               Log("SHUTTLE", "StoreOCDB - In TESTMODE - Simulating error while storing in the Grid");
+               Log(fCurrentDetector, "StoreOCDB - In TESTMODE - Simulating error while storing in the Grid");
+               return kFALSE;
+       }
+       
+       AliInfo("Storing OCDB data ...");
+       Bool_t resultCDB = StoreOCDB(fgkMainCDB);
+
+       AliInfo("Storing reference data ...");
+       Bool_t resultRef = StoreOCDB(fgkMainRefStorage);
+       
+       AliInfo("Storing reference files ...");
+       Bool_t resultRefFiles = StoreRefFilesToGrid();
+       
+       return resultCDB && resultRef && resultRefFiles;
+}
+
+//______________________________________________________________________________________________
+Bool_t AliShuttle::StoreOCDB(const TString& gridURI)
+{
+       //
+       // Called by StoreOCDB(), performs actual storage to the main OCDB and reference storages (Grid)
+       //
+
+       TObjArray* gridIds=0;
+
+       Bool_t result = kTRUE;
+
+       const char* type = 0;
+       TString localURI;
+       if(gridURI == fgkMainCDB) {
+               type = "OCDB";
+               localURI = fgkLocalCDB;
+       } else if(gridURI == fgkMainRefStorage) {
+               type = "reference";
+               localURI = fgkLocalRefStorage;
+       } else {
+               AliError(Form("Invalid storage URI: %s", gridURI.Data()));
+               return kFALSE;
+       }
+
+       AliCDBManager* man = AliCDBManager::Instance();
+
+       AliCDBStorage *gridSto = man->GetStorage(gridURI);
+       if(!gridSto) {
+               Log("SHUTTLE",
+                       Form("StoreOCDB - cannot activate main %s storage", type));
+               return kFALSE;
+       }
+
+       gridIds = gridSto->GetQueryCDBList();
+
+       // get objects previously stored in local CDB
+       AliCDBStorage *localSto = man->GetStorage(localURI);
+       if(!localSto) {
+               Log("SHUTTLE",
+                       Form("StoreOCDB - cannot activate local %s storage", type));
+               return kFALSE;
+       }
+       AliCDBPath aPath(GetOfflineDetName(fCurrentDetector.Data()),"*","*");
+       // Local objects were stored with current run as Grid version!
+       TList* localEntries = localSto->GetAll(aPath.GetPath(), GetCurrentRun(), GetCurrentRun());
+       localEntries->SetOwner(1);
+
+       // loop on local stored objects
+       TIter localIter(localEntries);
+       AliCDBEntry *aLocEntry = 0;
+       while((aLocEntry = dynamic_cast<AliCDBEntry*> (localIter.Next()))){
+               aLocEntry->SetOwner(1);
+               AliCDBId aLocId = aLocEntry->GetId();
+               aLocEntry->SetVersion(-1);
+               aLocEntry->SetSubVersion(-1);
+
+               // If local object is valid up to infinity we store it only if it is
+               // the first unprocessed run!
+               if (aLocId.GetLastRun() == AliCDBRunRange::Infinity() &&
+                       !fFirstUnprocessed[GetDetPos(fCurrentDetector)])
+               {
+                       Log("SHUTTLE", Form("StoreOCDB - %s: object %s has validity infinite but "
+                                               "there are previous unprocessed runs!",
+                                               fCurrentDetector.Data(), aLocId.GetPath().Data()));
+                       continue;
+               }
+
+               // loop on Grid valid Id's
+               Bool_t store = kTRUE;
+               TIter gridIter(gridIds);
+               AliCDBId* aGridId = 0;
+               while((aGridId = dynamic_cast<AliCDBId*> (gridIter.Next()))){
+                       if(aGridId->GetPath() != aLocId.GetPath()) continue;
+                       // skip all objects valid up to infinity
+                       if(aGridId->GetLastRun() == AliCDBRunRange::Infinity()) continue;
+                       // if we get here, it means there's already some more recent object stored on Grid!
+                       store = kFALSE;
+                       break;
+               }
+
+               // If we get here, the file can be stored!
+               Bool_t storeOk = gridSto->Put(aLocEntry);
+               if(!store || storeOk){
 
-               if(result) {
-                       result = 2;
-                       fGridError = kTRUE;
-               }else{
-                       Log(fCurrentDetector, "WriteToCDB - Can't store data!");
+                       if (!store)
+                       {
+                               Log(fCurrentDetector.Data(),
+                                       Form("StoreOCDB - A more recent object already exists in %s storage: <%s>",
+                                               type, aGridId->ToString().Data()));
+                       } else {
+                               Log("SHUTTLE",
+                                       Form("StoreOCDB - Object <%s> successfully put into %s storage",
+                                               aLocId.ToString().Data(), type));
+                       }
+
+                       // removing local filename...
+                       TString filename;
+                       localSto->IdToFilename(aLocId, filename);
+                       AliInfo(Form("Removing local file %s", filename.Data()));
+                       RemoveFile(filename.Data());
+                       continue;
+               } else  {
+                       Log("SHUTTLE",
+                               Form("StoreOCDB - Grid %s storage of object <%s> failed",
+                                       type, aLocId.ToString().Data()));
+                       result = kFALSE;
                }
        }
+       localEntries->Clear();
 
        return result;
+}
+
+//______________________________________________________________________________________________
+Bool_t AliShuttle::StoreReferenceFile(const char* detector, const char* localFile, const char* gridFileName)
+{
+       //
+       // Stores reference file directly (without opening it). This function stores the file locally
+       // renaming it to #runNumber_gridFileName.
+       //
+       
+       if (fTestMode & kErrorStorage)
+       {
+               Log(fCurrentDetector, "StoreReferenceFile - In TESTMODE - Simulating error while storing locally");
+               return kFALSE;
+       }
+       
+       AliCDBManager* man = AliCDBManager::Instance();
+       AliCDBStorage* sto = man->GetStorage(fgkLocalRefStorage);
+       
+       TString localBaseFolder = sto->GetBaseFolder();
+       
+       TString targetDir;
+       targetDir.Form("%s/%s", localBaseFolder.Data(), detector);
+       
+       TString target;
+       target.Form("%s/%d_%s", targetDir.Data(), GetCurrentRun(), gridFileName);
+       
+       Int_t result = gSystem->GetPathInfo(targetDir, 0, (Long64_t*) 0, 0, 0);
+       if (result)
+       {
+               result = gSystem->mkdir(targetDir, kTRUE);
+               if (result != 0)
+               {
+                       Log("SHUTTLE", Form("StoreReferenceFile - Error creating base directory %s", targetDir.Data()));
+                       return kFALSE;
+               }
+       }
+               
+       result = gSystem->CopyFile(localFile, target);
+
+       if (result == 0)
+       {
+               Log("SHUTTLE", Form("StoreReferenceFile - Stored file %s locally to %s", localFile, target.Data()));
+               return kTRUE;
+       }
+       else
+       {
+               Log("SHUTTLE", Form("StoreReferenceFile - Storing file %s locally to %s failed", localFile, target.Data()));
+               return kFALSE;
+       }       
+}
+
+//______________________________________________________________________________________________
+Bool_t AliShuttle::StoreRefFilesToGrid()
+{
+       //
+       // Transfers the reference file to the Grid.
+       // The final full path of the file is:
+       // gridBaseReferenceFolder/DET/#runNumber_gridFileName
+       //
+       
+       AliCDBManager* man = AliCDBManager::Instance();
+       AliCDBStorage* sto = man->GetStorage(fgkLocalRefStorage);
+       if (!sto)
+               return kFALSE;
+       TString localBaseFolder = sto->GetBaseFolder();
+               
+       TString dir;
+       dir.Form("%s/%s", localBaseFolder.Data(), fCurrentDetector.Data());
+       
+       AliCDBStorage* gridSto = man->GetStorage(fgkMainRefStorage);
+       if (!gridSto)
+               return kFALSE;
+       TString gridBaseFolder = gridSto->GetBaseFolder();
+       TString alienDir;
+       alienDir.Form("%s%s", gridBaseFolder.Data(), fCurrentDetector.Data());
+       
+       if(!gGrid) 
+               return kFALSE;
+       
+       // check that DET folder exists, otherwise create it
+       TGridResult* result = gGrid->Ls(alienDir.Data());
+       
+       if(!result)
+               return kFALSE;
+       
+       if(!result->GetFileName(0)) {
+               if(!gGrid->Mkdir(alienDir.Data(),"",0)){
+                       Log("SHUTTLE", Form("StoreRefFilesToGrid - Cannot create directory %s",
+                                       alienDir.Data()));
+                       return kFALSE;
+               }
+               
+       }
+
+       TString begin;
+       begin.Form("%d_", GetCurrentRun());
+       
+       TSystemDirectory* baseDir = new TSystemDirectory("/", dir);
+       TList* dirList            = baseDir->GetListOfFiles();
+       if (!dirList)
+               return kTRUE;
+               
+       Int_t nDirs               = dirList->GetEntries();
+       
+       Bool_t success = kTRUE;
+       
+       for (Int_t iDir=0; iDir<nDirs; ++iDir)
+       {
+               TSystemFile* entry = dynamic_cast<TSystemFile*> (dirList->At(iDir));
+               if (!entry)
+                       continue;
+                       
+               if (entry->IsDirectory())
+                       continue;
+                       
+               TString fileName(entry->GetName());
+               if (!fileName.BeginsWith(begin))
+                       continue;
+                       
+               TString fullLocalPath;
+               fullLocalPath.Form("%s/%s", dir.Data(), fileName.Data());
+               
+               TString fullGridPath;
+               fullGridPath.Form("alien://%s/%s", alienDir.Data(), fileName.Data());
+
+               Log("SHUTTLE", Form("StoreRefFilesToGrid - Copying local file %s to %s", fullLocalPath.Data(), fullGridPath.Data()));
+               
+               TFileMerger fileMerger;
+               Bool_t result = fileMerger.Cp(fullLocalPath, fullGridPath);
+               
+               if (result)
+               {
+                       Log("SHUTTLE", Form("StoreRefFilesToGrid - Copying local file %s to %s succeeded", fullLocalPath.Data(), fullGridPath.Data()));
+                       RemoveFile(fullLocalPath);
+               }
+               else
+               {
+                       Log("SHUTTLE", Form("StoreRefFilesToGrid - Copying local file %s to %s failed", fullLocalPath.Data(), fullGridPath.Data()));
+                       success = kFALSE;
+               }
+       }
+       
+       delete baseDir;
+       
+       return success;
+}
+
+//______________________________________________________________________________________________
+void AliShuttle::CleanLocalStorage(const TString& uri)
+{
+       //
+       // Called in case the preprocessor is declared failed. Remove remaining objects from the local storages.
+       //
+
+       const char* type = 0;
+       if(uri == fgkLocalCDB) {
+               type = "OCDB";
+       } else if(uri == fgkLocalRefStorage) {
+               type = "reference";
+       } else {
+               AliError(Form("Invalid storage URI: %s", uri.Data()));
+               return;
+       }
+
+       AliCDBManager* man = AliCDBManager::Instance();
+
+       // open local storage
+       AliCDBStorage *localSto = man->GetStorage(uri);
+       if(!localSto) {
+               Log("SHUTTLE",
+                       Form("CleanLocalStorage - cannot activate local %s storage", type));
+               return;
+       }
+
+       TString filename(Form("%s/%s/*/Run*_v%d_s*.root",
+               localSto->GetBaseFolder().Data(), fCurrentDetector.Data(), GetCurrentRun()));
+
+       AliInfo(Form("filename = %s", filename.Data()));
+
+       AliInfo(Form("Removing remaining local files from run %d and detector %s ...",
+               GetCurrentRun(), fCurrentDetector.Data()));
+
+       RemoveFile(filename.Data());
+
+}
+
+//______________________________________________________________________________________________
+void AliShuttle::RemoveFile(const char* filename)
+{
+       //
+       // removes local file
+       //
 
+       TString command(Form("rm -f %s", filename));
+
+       Int_t result = gSystem->Exec(command.Data());
+       if(result != 0)
+       {
+               Log("SHUTTLE", Form("RemoveFile - %s: Cannot remove file %s!",
+                       fCurrentDetector.Data(), filename));
+       }
 }
 
 //______________________________________________________________________________________________
 AliShuttleStatus* AliShuttle::ReadShuttleStatus()
 {
-// Reads the AliShuttleStatus from the CDB
+       //
+       // Reads the AliShuttleStatus from the CDB
+       //
 
        if (fStatusEntry){
                delete fStatusEntry;
                fStatusEntry = 0;
        }
 
-       fStatusEntry = AliCDBManager::Instance()->GetStorage(AliShuttle::GetLocalCDB())
+       fStatusEntry = AliCDBManager::Instance()->GetStorage(GetLocalCDB())
                ->Get(Form("/SHUTTLE/STATUS/%s", fCurrentDetector.Data()), GetCurrentRun());
 
        if (!fStatusEntry) return 0;
@@ -391,7 +746,9 @@ AliShuttleStatus* AliShuttle::ReadShuttleStatus()
 //______________________________________________________________________________________________
 Bool_t AliShuttle::WriteShuttleStatus(AliShuttleStatus* status)
 {
-// writes the status for one subdetector
+       //
+       // writes the status for one subdetector
+       //
 
        if (fStatusEntry){
                delete fStatusEntry;
@@ -408,9 +765,12 @@ Bool_t AliShuttle::WriteShuttleStatus(AliShuttleStatus* status)
        UInt_t result = AliCDBManager::Instance()->GetStorage(fgkLocalCDB)->Put(fStatusEntry);
 
        if (!result) {
-               AliError(Form("WriteShuttleStatus for %s, run %d failed", fCurrentDetector.Data(), run));
+               Log("SHUTTLE", Form("WriteShuttleStatus - Failed for %s, run %d",
+                                               fCurrentDetector.Data(), run));
                return kFALSE;
        }
+       
+       SendMLInfo();
 
        return kTRUE;
 }
@@ -418,7 +778,9 @@ Bool_t AliShuttle::WriteShuttleStatus(AliShuttleStatus* status)
 //______________________________________________________________________________________________
 void AliShuttle::UpdateShuttleStatus(AliShuttleStatus::Status newStatus, Bool_t increaseCount)
 {
-  // changes the AliShuttleStatus for the given detector and run to the given status
+       //
+       // changes the AliShuttleStatus for the given detector and run to the given status
+       //
 
        if (!fStatusEntry){
                AliError("UNEXPECTED: fStatusEntry empty");
@@ -428,7 +790,7 @@ void AliShuttle::UpdateShuttleStatus(AliShuttleStatus::Status newStatus, Bool_t
        AliShuttleStatus* status = dynamic_cast<AliShuttleStatus*> (fStatusEntry->GetObject());
 
        if (!status){
-               AliError("UNEXPECTED: status could not be read from current CDB entry");
+               Log("SHUTTLE", "UNEXPECTED: status could not be read from current CDB entry");
                return;
        }
 
@@ -443,13 +805,40 @@ void AliShuttle::UpdateShuttleStatus(AliShuttleStatus::Status newStatus, Bool_t
        if (increaseCount) status->IncreaseCount();
 
        AliCDBManager::Instance()->GetStorage(fgkLocalCDB)->Put(fStatusEntry);
+
+       SendMLInfo();
+}
+
+//______________________________________________________________________________________________
+void AliShuttle::SendMLInfo()
+{
+       //
+       // sends ML information about the current status of the current detector being processed
+       //
+       
+       AliShuttleStatus* status = dynamic_cast<AliShuttleStatus*> (fStatusEntry->GetObject());
+       
+       if (!status){
+               Log("SHUTTLE", "SendMLInfo - UNEXPECTED: status could not be read from current CDB entry");
+               return;
+       }
+       
+       TMonaLisaText  mlStatus(Form("%s_status", fCurrentDetector.Data()), status->GetStatusName());
+       TMonaLisaValue mlRetryCount(Form("%s_count", fCurrentDetector.Data()), status->GetCount());
+
+       TList mlList;
+       mlList.Add(&mlStatus);
+       mlList.Add(&mlRetryCount);
+
+       fMonaLisa->SendParameters(&mlList);
 }
+
 //______________________________________________________________________________________________
 Bool_t AliShuttle::ContinueProcessing()
 {
-// this function reads the AliShuttleStatus information from CDB and
-// checks if the processing should be continued
-// if yes it returns kTRUE and updates the AliShuttleStatus with nextStatus
+       // this function reads the AliShuttleStatus information from CDB and
+       // checks if the processing should be continued
+       // if yes it returns kTRUE and updates the AliShuttleStatus with nextStatus
 
        if (!fConfig->HostProcessDetector(fCurrentDetector)) return kFALSE;
 
@@ -502,18 +891,21 @@ Bool_t AliShuttle::ContinueProcessing()
                return kFALSE;
        }
 
-       if (status->GetStatus() == AliShuttleStatus::kStoreFailed) {
+       if (status->GetStatus() == AliShuttleStatus::kStoreError) {
                Log("SHUTTLE",
                        Form("ContinueProcessing - %s: Grid storage of one or more objects failed. Trying again now",
                                fCurrentDetector.Data()));
-               if(TryToStoreAgain()){
-                       Log(fCurrentDetector.Data(), "ContinueProcessing - All objects successfully stored into OCDB");
+               UpdateShuttleStatus(AliShuttleStatus::kStoreStarted);
+               if (StoreOCDB()){
+                       Log("SHUTTLE", Form("ContinueProcessing - %s: all objects successfully stored into main storage",
+                               fCurrentDetector.Data()));
                        UpdateShuttleStatus(AliShuttleStatus::kDone);
                        UpdateShuttleLogbook(fCurrentDetector.Data(), "DONE");
                } else {
                        Log("SHUTTLE",
                                Form("ContinueProcessing - %s: Grid storage failed again",
                                        fCurrentDetector.Data()));
+                       UpdateShuttleStatus(AliShuttleStatus::kStoreError);
                }
                return kFALSE;
        }
@@ -527,20 +919,33 @@ Bool_t AliShuttle::ContinueProcessing()
                                "Updating Shuttle Logbook", fCurrentDetector.Data(),
                                status->GetCount(), status->GetStatusName()));
                UpdateShuttleLogbook(fCurrentDetector.Data(), "FAILED");
+               UpdateShuttleStatus(AliShuttleStatus::kFailed);
+
+               // there may still be objects in local OCDB and reference storage
+               // and FXS databases may be not updated: do it now!
+               
+               // TODO Currently disabled, we want to keep files in case of failure!
+               // CleanLocalStorage(fgkLocalCDB);
+               // CleanLocalStorage(fgkLocalRefStorage);
+               // UpdateTableFailCase();
+               
+               // Send mail to detector expert!
+               AliInfo(Form("Sending mail to %s expert...", fCurrentDetector.Data()));
+               if (!SendMail())
+                       Log("SHUTTLE", Form("ContinueProcessing - Could not send mail to %s expert",
+                                       fCurrentDetector.Data()));
+
        } else {
                Log("SHUTTLE", Form("ContinueProcessing - %s: restarting. "
                                "Aborted before with %s. Retry number %d.", fCurrentDetector.Data(),
                                status->GetStatusName(), status->GetCount()));
-               UpdateShuttleStatus(AliShuttleStatus::kStarted, kTRUE);
+               Bool_t increaseCount = kTRUE;
+               if (status->GetStatus() == AliShuttleStatus::kDCSError || status->GetStatus() == AliShuttleStatus::kDCSStarted)
+                       increaseCount = kFALSE;
+               UpdateShuttleStatus(AliShuttleStatus::kStarted, increaseCount);
                cont = kTRUE;
        }
 
-       // Send mail to detector expert!
-       AliInfo(Form("Sending mail to %s expert...", fCurrentDetector.Data()));
-       if (!SendMail())
-               Log("SHUTTLE", Form("ContinueProcessing - Could not send mail to %s expert",
-                               fCurrentDetector.Data()));
-
        return cont;
 }
 
@@ -554,26 +959,72 @@ Bool_t AliShuttle::Process(AliShuttleLogbookEntry* entry)
        // Returns kFALSE in case of error occured and kTRUE otherwise
        //
 
-       if(!entry) return kFALSE;
+       if (!entry) return kFALSE;
 
        fLogbookEntry = entry;
 
-       if(fLogbookEntry->IsDone()){
+       AliInfo(Form("\n\n \t\t\t^*^*^*^*^*^*^*^*^*^*^*^* run %d: START ^*^*^*^*^*^*^*^*^*^*^*^* \n",
+                                       GetCurrentRun()));
+
+       // create ML instance that monitors this run
+       fMonaLisa = new TMonaLisaWriter(Form("%d", GetCurrentRun()), "SHUTTLE", "aliendb1.cern.ch");
+       // disable monitoring of other parameters that come e.g. from TFile
+       gMonitoringWriter = 0;
+
+       // Send the information to ML
+       TMonaLisaText  mlStatus("SHUTTLE_status", "Processing");
+       TMonaLisaText  mlRunType("SHUTTLE_runtype", Form("%s (%s)", entry->GetRunType(), entry->GetRunParameter("log")));
+
+       TList mlList;
+       mlList.Add(&mlStatus);
+       mlList.Add(&mlRunType);
+
+       fMonaLisa->SendParameters(&mlList);
+
+       if (fLogbookEntry->IsDone())
+       {
                Log("SHUTTLE","Process - Shuttle is already DONE. Updating logbook");
                UpdateShuttleLogbook("shuttle_done");
                fLogbookEntry = 0;
                return kTRUE;
        }
 
-
-       AliInfo(Form("\n\n \t\t\t^*^*^*^*^*^*^*^*^*^*^*^* run %d: START ^*^*^*^*^*^*^*^*^*^*^*^* \n",
-                                       GetCurrentRun()));
-
+       // read test mode if flag is set
+       if (fReadTestMode)
+       {
+               TString logEntry(entry->GetRunParameter("log"));
+               //printf("log entry = %s\n", logEntry.Data());
+               TString searchStr("Testmode: ");
+               Int_t pos = logEntry.Index(searchStr.Data());
+               //printf("%d\n", pos);
+               if (pos >= 0)
+               {
+                       TSubString subStr = logEntry(pos + searchStr.Length(), logEntry.Length());
+                       //printf("%s\n", subStr.String().Data());
+                       TString newStr(subStr.Data());
+                       TObjArray* token = newStr.Tokenize(' ');
+                       if (token)
+                       {
+                               //token->Print();
+                               TObjString* tmpStr = dynamic_cast<TObjString*> (token->First());
+                               if (tmpStr)
+                               {
+                                       Int_t testMode = tmpStr->String().Atoi();
+                                       if (testMode > 0)
+                                       {
+                                               Log("SHUTTLE", Form("Enabling test mode %d", testMode));
+                                               SetTestMode((TestMode) testMode);
+                                       }
+                               }
+                               delete token;          
+                       }
+               }
+       }
+       
        fLogbookEntry->Print("all");
 
        // Initialization
        Bool_t hasError = kFALSE;
-       for(Int_t iSys=0;iSys<3;iSys++) fFXSCalled[iSys]=kFALSE;
 
        AliCDBStorage *mainCDBSto = AliCDBManager::Instance()->GetStorage(fgkMainCDB);
        if(mainCDBSto) mainCDBSto->QueryCDB(GetCurrentRun());
@@ -593,6 +1044,9 @@ Bool_t AliShuttle::Process(AliShuttleLogbookEntry* entry)
                AliInfo(Form("\n\n \t\t\t****** run %d - %s: START  ******",
                                                GetCurrentRun(), aDetector->GetName()));
 
+               for(Int_t iSys=0;iSys<3;iSys++) fFXSCalled[iSys]=kFALSE;
+
+               Log(fCurrentDetector.Data(), "Starting processing");
 
                Int_t pid = fork();
 
@@ -615,11 +1069,15 @@ Bool_t AliShuttle::Process(AliShuttleLogbookEntry* entry)
 
                                if (expiredTime > fConfig->GetPPTimeOut())
                                {
-                                       Log("SHUTTLE", Form("Process time out. Run time: %d seconds. Killing...",
-                                                               expiredTime));
+                                       TString tmp;
+                                       tmp.Form("Process of %s time out. Run time: %d seconds. Killing...",
+                                                               fCurrentDetector.Data(), expiredTime);
+                                       Log("SHUTTLE", tmp);
+                                       Log(fCurrentDetector, tmp);
 
                                        kill(pid, 9);
 
+                                       UpdateShuttleStatus(AliShuttleStatus::kPPTimeOut);
                                        hasError = kTRUE;
 
                                        gSystem->Sleep(1000);
@@ -627,9 +1085,55 @@ Bool_t AliShuttle::Process(AliShuttleLogbookEntry* entry)
                                else
                                {
                                        if (expiredTime % 60 == 0)
-                                       Log("SHUTTLE", Form("Checked process. Run time: %d seconds.",
+                                               Log("SHUTTLE", Form("Checked process. Run time: %d seconds.",
                                                                expiredTime));
                                        gSystem->Sleep(1000);
+                                       
+                                       TString checkStr;
+                                       checkStr.Form("ps -o vsize --pid %d | tail -n 1", pid);
+                                       FILE* pipe = gSystem->OpenPipe(checkStr, "r");
+                                       if (!pipe)
+                                       {
+                                               Log("SHUTTLE", Form("Error: Could not open pipe to %s", checkStr.Data()));
+                                               continue;
+                                       }
+                                               
+                                       char buffer[100];
+                                       if (!fgets(buffer, 100, pipe))
+                                       {
+                                               Log("SHUTTLE", "Error: ps did not return anything");
+                                               gSystem->ClosePipe(pipe);
+                                               continue;
+                                       }
+                                       gSystem->ClosePipe(pipe);
+                                       
+                                       //Log("SHUTTLE", Form("ps returned %s", buffer));
+                                       
+                                       Int_t mem = 0;
+                                       if ((sscanf(buffer, "%d\n", &mem) != 1) || !mem)
+                                       {
+                                               Log("SHUTTLE", "Error: Could not parse output of ps");
+                                               continue;
+                                       }
+                                       
+                                       if (expiredTime % 60 == 0)
+                                               Log("SHUTTLE", Form("The process consumes %d KB of memory.", mem));
+                                       
+                                       if (mem > fConfig->GetPPMaxMem())
+                                       {
+                                               TString tmp;
+                                               tmp.Form("Process exceeds maximum allowed memory (%d KB > %d KB). Killing...",
+                                                       mem, fConfig->GetPPMaxMem());
+                                               Log("SHUTTLE", tmp);
+                                               Log(fCurrentDetector, tmp);
+       
+                                               kill(pid, 9);
+       
+                                               UpdateShuttleStatus(AliShuttleStatus::kPPOutOfMemory);
+                                               hasError = kTRUE;
+       
+                                               gSystem->Sleep(1000);
+                                       }
                                }
                        }
 
@@ -640,10 +1144,10 @@ Bool_t AliShuttle::Process(AliShuttleLogbookEntry* entry)
                        {
                                Int_t returnCode = WEXITSTATUS(status);
 
-                               Log("SHUTTLE", Form("The return code is %d", returnCode));
+                               Log("SHUTTLE", Form("%s: the return code is %d", fCurrentDetector.Data(),
+                                                                               returnCode));
 
-                               if (returnCode != 0)
-                               hasError = kTRUE;
+                               if (returnCode == 0) hasError = kTRUE;
                        }
                }
                else if (pid == 0)
@@ -651,53 +1155,39 @@ Bool_t AliShuttle::Process(AliShuttleLogbookEntry* entry)
                        // client
                        AliInfo(Form("In client process of %d - %s", GetCurrentRun(), aDetector->GetName()));
 
-                       UInt_t result = ProcessCurrentDetector();
-
-                       Int_t returnCode = 0; // will be set to 1 in case of an error
+                       Bool_t success = ProcessCurrentDetector();
+                       if (success) // Preprocessor finished successfully!
+                       { 
+                               // Update time_processed field in FXS DB
+                               if (UpdateTable() == kFALSE)
+                                       Log("SHUTTLE", Form("Process - %s: Could not update FXS databases!"));
 
-                       if (!result)
-                       {
-                               returnCode = 1;
-                               AliInfo(Form("\n \t\t\t****** run %d - %s: PREPROCESSOR ERROR ****** \n\n",
-                                                       GetCurrentRun(), aDetector->GetName()));
-                       }
-                       else if (result == 2)
-                       {
-                               AliInfo(Form("\n \t\t\t****** run %d - %s: STORAGE ERROR ****** \n\n",
+                               // Transfer the data from local storage to main storage (Grid)
+                               UpdateShuttleStatus(AliShuttleStatus::kStoreStarted);
+                               if (StoreOCDB() == kFALSE)
+                               {
+                                       AliInfo(Form("\n \t\t\t****** run %d - %s: STORAGE ERROR ****** \n\n",
                                                        GetCurrentRun(), aDetector->GetName()));
-                       } else
-                       {
-                               AliInfo(Form("\n \t\t\t****** run %d - %s: DONE ****** \n\n",
+                                       UpdateShuttleStatus(AliShuttleStatus::kStoreError);
+                                       success = kFALSE;
+                               } else {
+                                       AliInfo(Form("\n \t\t\t****** run %d - %s: DONE ****** \n\n",
                                                        GetCurrentRun(), aDetector->GetName()));
+                                       UpdateShuttleStatus(AliShuttleStatus::kDone);
+                                       UpdateShuttleLogbook(fCurrentDetector, "DONE");
+                               }
                        }
 
-                       if (result > 0)
+                       for (UInt_t iSys=0; iSys<3; iSys++)
                        {
-                               // Process successful: Update time_processed field in FXS logbooks!
-                               if (fFXSCalled[kDAQ])
-                               {
-                                       if (UpdateDAQTable() == kFALSE)
-                                       returnCode = 1;
-                                       fFXSlist[kDAQ].Clear();
-                               }
-                               //if(fFXSCalled[kDCS]) {
-                               //  if (UpdateDCSTable(aDetector->GetName()) == kFALSE)
-                               //    returnCode = 1;
-                               //  fFXSlist[kDCS].Clear();
-                               //}
-                               if (fFXSCalled[kHLT])
-                               {
-                                       if (UpdateHLTTable() == kFALSE)
-                                       returnCode = 1;
-                                       fFXSlist[kHLT].Clear();
-                               }
+                               if (fFXSCalled[iSys]) fFXSlist[iSys].Clear();
                        }
 
                        AliInfo(Form("Client process of %d - %s is exiting now with %d.",
-                                                       GetCurrentRun(), aDetector->GetName(), returnCode));
+                                                       GetCurrentRun(), aDetector->GetName(), success));
 
                        // the client exits here
-                       gSystem->Exit(returnCode);
+                       gSystem->Exit(success);
 
                        AliError("We should never get here!!!");
                }
@@ -740,13 +1230,17 @@ Bool_t AliShuttle::Process(AliShuttleLogbookEntry* entry)
                }
        }
 
+       // remove ML instance
+       delete fMonaLisa;
+       fMonaLisa = 0;
+
        fLogbookEntry = 0;
 
        return hasError == kFALSE;
 }
 
 //______________________________________________________________________________________________
-UInt_t AliShuttle::ProcessCurrentDetector()
+Bool_t AliShuttle::ProcessCurrentDetector()
 {
        //
         // Makes data retrieval just for a specific detector (fCurrentDetector).
@@ -754,21 +1248,32 @@ UInt_t AliShuttle::ProcessCurrentDetector()
 
        AliInfo(Form("Retrieving values for %s, run %d", fCurrentDetector.Data(), GetCurrentRun()));
 
-       UpdateShuttleStatus(AliShuttleStatus::kDCSStarted);
-
        TMap dcsMap;
        dcsMap.SetOwner(1);
 
        Bool_t aDCSError = kFALSE;
-       fGridError = kFALSE;
 
-       // TODO Test only... I've added a flag that allows to
-       // exclude DCS archive DB query
-       if (!fgkProcessDCS)
+       // call preprocessor
+       AliPreprocessor* aPreprocessor =
+               dynamic_cast<AliPreprocessor*> (fPreprocessorMap.GetValue(fCurrentDetector));
+
+       aPreprocessor->Initialize(GetCurrentRun(), GetCurrentStartTime(), GetCurrentEndTime());
+
+       Bool_t processDCS = aPreprocessor->ProcessDCS();
+
+       if (!processDCS || fTestMode & kSkipDCS)
+       {
+               AliInfo("In TESTMODE - Skipping DCS processing!");
+       } 
+       else if (fTestMode & kErrorDCS)
        {
-               AliInfo("Skipping DCS processing!");
-               aDCSError = kFALSE;
+               AliInfo("In TESTMODE - Simulating DCS error");
+               UpdateShuttleStatus(AliShuttleStatus::kDCSError);
+               return kFALSE;
        } else {
+
+               UpdateShuttleStatus(AliShuttleStatus::kDCSStarted);
+
                TString host(fConfig->GetDCSHost(fCurrentDetector));
                Int_t port = fConfig->GetDCSPort(fCurrentDetector);
 
@@ -796,7 +1301,7 @@ UInt_t AliShuttle::ProcessCurrentDetector()
                                                anAlias->GetName()));
                                UpdateShuttleStatus(AliShuttleStatus::kDCSError);
                                dcsMap.DeleteAll();
-                               return 0;
+                               return kFALSE;
                        }
                }
 
@@ -823,7 +1328,7 @@ UInt_t AliShuttle::ProcessCurrentDetector()
                                                aDP->GetName()));
                                UpdateShuttleStatus(AliShuttleStatus::kDCSError);
                                dcsMap.DeleteAll();
-                               return 0;
+                               return kFALSE;
                        }
                }
        }
@@ -831,38 +1336,33 @@ UInt_t AliShuttle::ProcessCurrentDetector()
        // DCS Archive DB processing successful. Call Preprocessor!
        UpdateShuttleStatus(AliShuttleStatus::kPPStarted);
 
-       AliPreprocessor* aPreprocessor =
-               dynamic_cast<AliPreprocessor*> (fPreprocessorMap.GetValue(fCurrentDetector));
+       UInt_t returnValue = aPreprocessor->Process(&dcsMap);
 
-       aPreprocessor->Initialize(GetCurrentRun(), GetCurrentStartTime(), GetCurrentEndTime());
-       UInt_t aPPResult = aPreprocessor->Process(&dcsMap);
-
-       UInt_t returnValue = 0;
-       if (aPPResult == 0) { // Preprocessor error
+       if (returnValue > 0) // Preprocessor error!
+       {
+               Log(fCurrentDetector, Form("Preprocessor failed. Process returned %d.", returnValue));
                UpdateShuttleStatus(AliShuttleStatus::kPPError);
-               returnValue = 0;
-       } else if (fGridError == kFALSE) { // process and Grid storage ok!
-               UpdateShuttleStatus(AliShuttleStatus::kDone);
-               UpdateShuttleLogbook(fCurrentDetector, "DONE");
-               Log(fCurrentDetector.Data(),
-                       "ProcessCurrentDetector - Preprocessor and Grid storage ended successfully");
-               returnValue = 1;
-        } else { // Grid storage error (process ok, but object put in local storage)
-               UpdateShuttleStatus(AliShuttleStatus::kStoreFailed);
-               returnValue = 2;
+               dcsMap.DeleteAll();
+               return kFALSE;
        }
+       
+       // preprocessor ok!
+       UpdateShuttleStatus(AliShuttleStatus::kPPDone);
+       Log(fCurrentDetector, Form("ProcessCurrentDetector - %s preprocessor returned success",
+                               fCurrentDetector.Data()));
 
        dcsMap.DeleteAll();
 
-       return returnValue;
+       return kTRUE;
 }
 
 //______________________________________________________________________________________________
 Bool_t AliShuttle::QueryShuttleLogbook(const char* whereClause,
                TObjArray& entries)
 {
-// Query DAQ's Shuttle logbook and fills detector status object.
-// Call QueryRunParameters to query DAQ logbook for run parameters.
+       // Query DAQ's Shuttle logbook and fills detector status object.
+       // Call QueryRunParameters to query DAQ logbook for run parameters.
+       //
 
        entries.SetOwner(1);
 
@@ -870,7 +1370,7 @@ Bool_t AliShuttle::QueryShuttleLogbook(const char* whereClause,
        if(!Connect(3)) return kFALSE;
 
        TString sqlQuery;
-       sqlQuery = Form("select * from logbook_shuttle %s order by run", whereClause);
+       sqlQuery = Form("select * from %s %s order by run", fConfig->GetShuttlelbTable(), whereClause);
 
        TSQLResult* aResult = fServer[3]->Query(sqlQuery);
        if (!aResult) {
@@ -881,15 +1381,9 @@ Bool_t AliShuttle::QueryShuttleLogbook(const char* whereClause,
        AliDebug(2,Form("Query = %s", sqlQuery.Data()));
 
        if(aResult->GetRowCount() == 0) {
-//             if(sqlQuery.EndsWith("where shuttle_done=0 order by run")){
-//                     Log("SHUTTLE", "QueryShuttleLogbook - All runs in Shuttle Logbook are already DONE");
-//                     delete aResult;
-//                     return kTRUE;
-//             } else {
-                       AliInfo("No entries in Shuttle Logbook match request");
-                       delete aResult;
-                       return kTRUE;
-//             }
+               AliInfo("No entries in Shuttle Logbook match request");
+               delete aResult;
+               return kTRUE;
        }
 
        // TODO Check field count!
@@ -917,9 +1411,6 @@ Bool_t AliShuttle::QueryShuttleLogbook(const char* whereClause,
                delete aRow;
        }
 
-//     if(sqlQuery.EndsWith("where shuttle_done=0 order by run"))
-//             Log("SHUTTLE", Form("QueryShuttleLogbook - Found %d unprocessed runs in Shuttle Logbook",
-//                                                     entries.GetEntriesFast()));
        delete aResult;
        return kTRUE;
 }
@@ -988,145 +1479,15 @@ AliShuttleLogbookEntry* AliShuttle::QueryRunParameters(Int_t run)
        return entry;
 }
 
-//______________________________________________________________________________________________
-Bool_t AliShuttle::TryToStoreAgain()
-{
-  // Called in case the detector failed to store the object in Grid OCDB
-  // It tries to store the object again, if it does not find more recent and overlapping objects
-  // Calls underlying TryToStoreAgain(const char*) function twice, for OCDB and Reference storage.
-
-       AliInfo("Trying to store OCDB data again...");
-       Bool_t resultCDB = TryToStoreAgain(fgkMainCDB);
-
-       AliInfo("Trying to store reference data again...");
-       Bool_t resultRef = TryToStoreAgain(fgkMainRefStorage);
-
-       return resultCDB && resultRef;
-}
-
-//______________________________________________________________________________________________
-Bool_t AliShuttle::TryToStoreAgain(TString& gridURI)
-{
-  // Called by TryToStoreAgain(), performs actual storage retry
-
-       TObjArray* gridIds=0;
-
-       Bool_t result = kTRUE;
-
-       const char* type = 0;
-       TString backupURI;
-       if(gridURI == fgkMainCDB) {
-               type = "OCDB";
-               backupURI = fgkLocalCDB;
-       } else if(gridURI == fgkMainRefStorage) {
-               type = "reference";
-               backupURI = fgkLocalRefStorage;
-       } else {
-               AliError(Form("Invalid storage URI: %s", gridURI.Data()));
-               return kFALSE;
-       }
-
-       AliCDBManager* man = AliCDBManager::Instance();
-
-       AliCDBStorage *gridSto = man->GetStorage(gridURI);
-       if(!gridSto) {
-               Log(fCurrentDetector.Data(),
-                       Form("TryToStoreAgain - cannot activate main %s storage", type));
-               return kFALSE;
-       }
-
-       gridIds = gridSto->GetQueryCDBList();
-
-       // get objects previously stored in local CDB
-       AliCDBStorage *backupSto = man->GetStorage(backupURI);
-       AliCDBPath aPath(GetOfflineDetName(fCurrentDetector.Data()),"*","*");
-       // Local objects were stored with current run as Grid version!
-       TList* localEntries = backupSto->GetAll(aPath.GetPath(), GetCurrentRun(), GetCurrentRun());
-       localEntries->SetOwner(1);
-
-       // loop on local stored objects
-       TIter localIter(localEntries);
-       AliCDBEntry *aLocEntry = 0;
-       while((aLocEntry = dynamic_cast<AliCDBEntry*> (localIter.Next()))){
-               aLocEntry->SetOwner(1);
-               AliCDBId aLocId = aLocEntry->GetId();
-               aLocEntry->SetVersion(-1);
-               aLocEntry->SetSubVersion(-1);
-
-               // loop on Grid valid Id's
-               Bool_t store = kTRUE;
-               TIter gridIter(gridIds);
-               AliCDBId* aGridId = 0;
-               while((aGridId = dynamic_cast<AliCDBId*> (gridIter.Next()))){
-                       // If local object is valid up to infinity we store it only if it is
-                       // the first unprocessed run!
-                       if (aLocId.GetLastRun() == AliCDBRunRange::Infinity())
-                       {
-                               if (!fFirstUnprocessed[GetDetPos(fCurrentDetector)])
-                               {
-                                       Log(fCurrentDetector.Data(),
-                                               ("TryToStoreAgain - This object has validity infinite but "
-                                                "there are previous unprocessed runs!"));
-                                       continue;
-                               } else {
-                                       break;
-                               }
-                       }
-                       if(aGridId->GetPath() != aLocId.GetPath()) continue;
-                       // skip all objects valid up to infinity
-                       if(aGridId->GetLastRun() == AliCDBRunRange::Infinity()) continue;
-                       // if we get here, it means there's already some more recent object stored on Grid!
-                       store = kFALSE;
-                       break;
-               }
-
-               if(!store){
-                       Log(fCurrentDetector.Data(),
-                               Form("TryToStoreAgain - A more recent object already exists in %s storage: <%s>",
-                                       type, aGridId->ToString().Data()));
-                       // removing local filename...
-                       // TODO maybe it's better not to remove it, it was not copied to the Grid!
-                       TString filename;
-                       backupSto->IdToFilename(aLocId, filename);
-                       AliInfo(Form("Removing local file %s", filename.Data()));
-                       gSystem->Exec(Form("rm %s",filename.Data()));
-                       continue;
-               }
-
-               // If we get here, the file can be stored!
-               Bool_t storeOk = gridSto->Put(aLocEntry);
-               if(storeOk){
-                       Log(fCurrentDetector.Data(),
-                               Form("TryToStoreAgain - Object <%s> successfully put into %s storage",
-                                       aLocId.ToString().Data(), type));
-
-                       // removing local filename...
-                       TString filename;
-                       backupSto->IdToFilename(aLocId, filename);
-                       AliInfo(Form("Removing local file %s", filename.Data()));
-                       gSystem->Exec(Form("rm %s", filename.Data()));
-                       continue;
-               } else  {
-                       Log(fCurrentDetector.Data(),
-                               Form("TryToStoreAgain - Grid %s storage of object <%s> failed again",
-                                       type, aLocId.ToString().Data()));
-                       result = kFALSE;
-               }
-       }
-       localEntries->Clear();
-
-       return result;
-}
-
 //______________________________________________________________________________________________
 Bool_t AliShuttle::GetValueSet(const char* host, Int_t port, const char* entry,
                                TObjArray* valueSet, DCSType type)
 {
-// Retrieve all "entry" data points from the DCS server
-// host, port: TSocket connection parameters
-// entry: name of the alias or data point
-// valueSet: array of retrieved AliDCSValue's
-// type: kAlias or kDP
+       // Retrieve all "entry" data points from the DCS server
+       // host, port: TSocket connection parameters
+       // entry: name of the alias or data point
+       // valueSet: array of retrieved AliDCSValue's
+       // type: kAlias or kDP
 
        AliDCSClient client(host, port, fTimeout, fRetries);
        if (!client.IsConnected())
@@ -1168,372 +1529,84 @@ Bool_t AliShuttle::GetValueSet(const char* host, Int_t port, const char* entry,
 const char* AliShuttle::GetFile(Int_t system, const char* detector,
                const char* id, const char* source)
 {
-// Get calibration file from file exchange servers
-// calls specific getter according to system index (kDAQ, kDCS, kHLT)
-
-       switch(system){
-               case kDAQ:
-                       return GetDAQFileName(detector, id, source);
-                       break;
-               case kDCS:
-                       return GetDCSFileName(detector, id, source);
-                       break;
-               case kHLT:
-                       return GetHLTFileName(detector, id, source);
-                       break;
-               default:
-                       AliError(Form("No valid system index: %d",system));
-       }
-
-       return 0;
-}
-
-//______________________________________________________________________________________________
-TList* AliShuttle::GetFileSources(Int_t system, const char* detector, const char* id)
-{
-// Get sources producing the condition file Id from file exchange servers
-// calls specific getter according to system index (kDAQ, kDCS, kHLT)
-
-       switch(system){
-               case kDAQ:
-                       return GetDAQFileSources(detector, id);
-                       break;
-               case kDCS:
-                       return GetDCSFileSources(detector, id);
-                       break;
-               case kHLT:
-                       return GetHLTFileSources(detector, id);
-                       break;
-               default:
-                       AliError(Form("No valid system index: %d",system));
-       }
-
-       return NULL;
-}
-
-//______________________________________________________________________________________________
-Bool_t AliShuttle::Connect(Int_t system)
-{
-// Connect to MySQL Server of the system's FXS MySQL databases
-// DAQ Logbook, Shuttle Logbook and DAQ FXS db are on the same host
-
-       // check connection: if already connected return
-       if(fServer[system] && fServer[system]->IsConnected()) return kTRUE;
-
-       TString dbHost, dbUser, dbPass, dbName;
-
-       if (system < 3) // FXS db servers
-       {
-               dbHost = Form("mysql://%s:%d", fConfig->GetFXSdbHost(system), fConfig->GetFXSdbPort(system));
-               dbUser = fConfig->GetFXSdbUser(system);
-               dbPass = fConfig->GetFXSdbPass(system);
-               dbName =   fConfig->GetFXSdbName(system);
-       } else { // Run & Shuttle logbook servers
-       // TODO Will the Shuttle logbook server be the same as the Run logbook server ???
-               dbHost = Form("mysql://%s:%d", fConfig->GetDAQlbHost(), fConfig->GetDAQlbPort());
-               dbUser = fConfig->GetDAQlbUser();
-               dbPass = fConfig->GetDAQlbPass();
-               dbName =   fConfig->GetDAQlbDB();
-       }
-
-       fServer[system] = TSQLServer::Connect(dbHost.Data(), dbUser.Data(), dbPass.Data());
-       if (!fServer[system] || !fServer[system]->IsConnected()) {
-               if(system < 3)
-               {
-               AliError(Form("Can't establish connection to FXS database for %s",
-                                       AliShuttleInterface::GetSystemName(system)));
-               } else {
-               AliError("Can't establish connection to Run logbook.");
-               }
-               if(fServer[system]) delete fServer[system];
-               return kFALSE;
-       }
-
-       // Get tables
-       // TODO in the configuration should the table name be there too?
-       TSQLResult* aResult=0;
-       switch(system){
-               case kDAQ:
-                       aResult = fServer[kDAQ]->GetTables(dbName.Data());
-                       break;
-               case kDCS:
-                       //aResult = fServer[kDCS]->GetTables(dbName.Data());
-                       break;
-               case kHLT:
-                       aResult = fServer[kHLT]->GetTables(dbName.Data());
-                       break;
-               default:
-                       aResult = fServer[3]->GetTables(dbName.Data());
-                       break;
-       }
-
-       delete aResult;
-       return kTRUE;
-}
-
-//______________________________________________________________________________________________
-const char* AliShuttle::GetDAQFileName(const char* detector, const char* id, const char* source)
-{
-// Retrieves a file from the DAQ FXS.
-// First queris the DAQ FXS database for the DAQ file name, using the run, detector, id and source info
-// then calls RetrieveDAQFile(DAQfilename) for actual copy to local disk
-// run: current run being processed (given by Logbook entry fLogbookEntry)
-// detector: the Preprocessor name
-// id: provided as a parameter by the Preprocessor
-// source: provided by the Preprocessor through GetFileSources function
-
-       // check connection, in case connect
-       if (!Connect(kDAQ))
-       {
-               Log(detector, "GetDAQFileName - Couldn't connect to DAQ FXS database");
-               return 0;
-       }
-
-       // Query preparation
-       TString sqlQueryStart = Form("select filePath from %s where", fConfig->GetFXSdbTable(kDAQ));
-       TString whereClause = Form("run=%d and detector=\"%s\" and fileId=\"%s\" and DAQsource=\"%s\"",
-                               GetCurrentRun(), detector, id, source);
-       TString sqlQuery = Form("%s %s", sqlQueryStart.Data(), whereClause.Data());
-
-       AliDebug(2, Form("SQL query: \n%s",sqlQuery.Data()));
-
-       // Query execution
-       TSQLResult* aResult = 0;
-       aResult = dynamic_cast<TSQLResult*> (fServer[kDAQ]->Query(sqlQuery));
-       if (!aResult) {
-               Log(detector, Form("GetDAQFileName - Can't execute SQL query for: id = %s, source = %s",
-                               id, source));
-               return 0;
-       }
-
-       if(aResult->GetRowCount() == 0)
-       {
-               Log(detector,
-                       Form("GetDAQFileName - No entry in FXS table for: id = %s, source = %s",
-                               id, source));
-               delete aResult;
-               return 0;
-       }
-
-       if (aResult->GetRowCount() > 1) {
-               Log(detector,
-                       Form("GetDAQFileName - More than one entry in FXS table for: id = %s, source = %s",
-                               id, source));
-               delete aResult;
-               return 0;
-       }
-
-       TSQLRow* aRow = dynamic_cast<TSQLRow*> (aResult->Next());
-
-       if (!aRow){
-               Log(detector, Form("GetDAQFileName - Empty set result from query: id = %s, source = %s",
-                               id, source));
-               delete aResult;
-               return 0;
-       }
-
-       TString filePath(aRow->GetField(0), aRow->GetFieldLength(0));
-
-       delete aResult;
-       delete aRow;
-
-       AliDebug(2, Form("filePath = %s",filePath.Data()));
-
-       // retrieved file is renamed to make it unique
-       TString localFileName = Form("DAQ_%s_%d_%s_%s.shuttle",
-                                       detector, GetCurrentRun(), id, source);
-
-       // file retrieval from DAQ FXS
-       Bool_t result = RetrieveDAQFile(filePath.Data(), localFileName.Data());
-       if(!result) {
-               Log(detector, Form("GetDAQFileName - Copy of file %s from DAQ FXS failed", filePath.Data()));
-               return 0;
-       } else {
-               AliInfo(Form("File %s copied from DAQ FXS into %s/%s",
-                       filePath.Data(), GetShuttleTempDir(), localFileName.Data()));
-       }
-
-       fFXSCalled[kDAQ]=kTRUE;
-       TObjString *fileParams = new TObjString(Form("%s#!?!#%s", id, source));
-       fFXSlist[kDAQ].Add(fileParams);
-
-       static TString fullLocalFileName;
-       fullLocalFileName = TString::Format("%s/%s", GetShuttleTempDir(), localFileName.Data());
-
-       AliInfo(Form("fullLocalFileName = %s", fullLocalFileName.Data()));
-
-       return fullLocalFileName.Data();
-
-}
-
-//______________________________________________________________________________________________
-Bool_t AliShuttle::RetrieveDAQFile(const char* daqFileName, const char* localFileName)
-{
-// Copies file from DAQ FXS to local Shuttle machine
-
-       // check temp directory: trying to cd to temp; if it does not exist, create it
-       AliDebug(2, Form("Copy file %s from DAQ FXS into %s/%s",
-                       daqFileName, GetShuttleTempDir(), localFileName));
-
-       void* dir = gSystem->OpenDirectory(GetShuttleTempDir());
-       if (dir == NULL) {
-               if (gSystem->mkdir(GetShuttleTempDir(), kTRUE)) {
-                       AliError(Form("Can't open directory <%s>", GetShuttleTempDir()));
-                       return kFALSE;
-               }
-
-       } else {
-               gSystem->FreeDirectory(dir);
-       }
-
-       TString baseDAQFXSFolder = "FES";
-       TString command = Form("scp -oPort=%d -2 %s@%s:%s/%s %s/%s",
-               fConfig->GetFXSPort(kDAQ),
-               fConfig->GetFXSUser(kDAQ),
-               fConfig->GetFXSHost(kDAQ),
-               baseDAQFXSFolder.Data(),
-               daqFileName,
-               GetShuttleTempDir(),
-               localFileName);
-
-       AliDebug(2, Form("%s",command.Data()));
-
-       UInt_t nRetries = 0;
-       UInt_t maxRetries = 3;
-
-       // copy!! if successful TSystem::Exec returns 0
-       while(nRetries++ < maxRetries) {
-               AliDebug(2, Form("Trying to copy file. Retry # %d", nRetries));
-               if(gSystem->Exec(command.Data()) == 0) return kTRUE;
-       }
-
-       return kFALSE;
-
-}
-
-//______________________________________________________________________________________________
-TList* AliShuttle::GetDAQFileSources(const char* detector, const char* id)
-{
-// Retrieves list of DAQ sources of file Id
-
-       // check connection, in case connect
-       if(!Connect(kDAQ)){
-               Log(detector, "GetDAQFileSources - Couldn't connect to DAQ FXS database");
-               return 0;
-       }
-
-       // Query preparation
-       TString sqlQueryStart = Form("select DAQsource from %s where", fConfig->GetFXSdbTable(kDAQ));
-       TString whereClause = Form("run=%d and detector=\"%s\" and fileId=\"%s\"",
-                               GetCurrentRun(), detector, id);
-       TString sqlQuery = Form("%s %s", sqlQueryStart.Data(), whereClause.Data());
-
-       AliDebug(2, Form("SQL query: \n%s",sqlQuery.Data()));
-
-       // Query execution
-       TSQLResult* aResult;
-       aResult = fServer[kDAQ]->Query(sqlQuery);
-       if (!aResult) {
-               Log(detector, Form("GetDAQFileSources - Can't execute SQL query for id: %s", id));
-               return 0;
-       }
-
-       if (aResult->GetRowCount() == 0) {
-               Log(detector,
-                       Form("GetDAQFileSources - No entry in FXS table for id: %s", id));
-               delete aResult;
-               return 0;
-       }
-
-       TSQLRow* aRow;
-       TList *list = new TList();
-       list->SetOwner(1);
-
-       while((aRow = aResult->Next())){
-
-               TString daqSource(aRow->GetField(0), aRow->GetFieldLength(0));
-               AliDebug(2, Form("daqSource = %s", daqSource.Data()));
-               list->Add(new TObjString(daqSource));
-               delete aRow;
-       }
-       delete aResult;
-
-       return list;
-
-}
-
-//______________________________________________________________________________________________
-const char* AliShuttle::GetDCSFileName(const char* /*detector*/, const char* /*id*/, const char* /*source*/){
-// Retrieves a file from the DCS FXS.
-
-return "You're in DCS";
-
-}
-
-//______________________________________________________________________________________________
-TList* AliShuttle::GetDCSFileSources(const char* /*detector*/, const char* /*id*/){
-// Retrieves file sources from the DCS FXS.
-
-return NULL;
-
-}
-
-//______________________________________________________________________________________________
-const char* AliShuttle::GetHLTFileName(const char* detector, const char* id, const char* source){
-// Retrieves a file from the HLT FXS.
-// First queris the HLT FXS database for the HLT file name, using the run, detector, id and source info
-// then calls RetrieveDAQFile(DAQfilename) for actual copy to local disk
-// run: current run being processed (given by Logbook entry fLogbookEntry)
-// detector: the Preprocessor name
-// id: provided as a parameter by the Preprocessor
-// source: provided by the Preprocessor through GetFileSources function
-
+       // Get calibration file from file exchange servers
+       // First queris the FXS database for the file name, using the run, detector, id and source info
+       // then calls RetrieveFile(filename) for actual copy to local disk
+       // run: current run being processed (given by Logbook entry fLogbookEntry)
+       // detector: the Preprocessor name
+       // id: provided as a parameter by the Preprocessor
+       // source: provided by the Preprocessor through GetFileSources function
+
+       // check if test mode should simulate a FXS error
+       if (fTestMode & kErrorFXSFiles)
+       {
+               Log(detector, Form("GetFile - In TESTMODE - Simulating error while connecting to %s FXS", GetSystemName(system)));
+               return 0;
+       }
+       
        // check connection, in case connect
-       if (!Connect(kHLT))
+       if (!Connect(system))
        {
-               Log(detector, "GetHLTFileName - Couldn't connect to HLT FXS database");
+               Log(detector, Form("GetFile - Couldn't connect to %s FXS database", GetSystemName(system)));
                return 0;
        }
 
        // Query preparation
-       TString sqlQueryStart = Form("select filePath,fileSize,fileChecksum from %s where",
-                                                                               fConfig->GetFXSdbTable(kHLT));
-       TString whereClause = Form("run=%d and detector=\"%s\" and fileId=\"%s\" and DDLnumbers=\"%s\"",
-                               GetCurrentRun(), detector, id, source);
+       TString sourceName(source);
+       Int_t nFields = 3;
+       TString sqlQueryStart = Form("select filePath,size,fileChecksum from %s where",
+                                                               fConfig->GetFXSdbTable(system));
+       TString whereClause = Form("run=%d and detector=\"%s\" and fileId=\"%s\"",
+                                                               GetCurrentRun(), detector, id);
+
+       if (system == kDAQ)
+       {
+               whereClause += Form(" and DAQsource=\"%s\"", source);
+       }
+       else if (system == kDCS)
+       {
+               sourceName="none";
+       }
+       else if (system == kHLT)
+       {
+               whereClause += Form(" and DDLnumbers=\"%s\"", source);
+               nFields = 3;
+       }
+
        TString sqlQuery = Form("%s %s", sqlQueryStart.Data(), whereClause.Data());
 
        AliDebug(2, Form("SQL query: \n%s",sqlQuery.Data()));
 
        // Query execution
        TSQLResult* aResult = 0;
-       aResult = dynamic_cast<TSQLResult*> (fServer[kHLT]->Query(sqlQuery));
+       aResult = dynamic_cast<TSQLResult*> (fServer[system]->Query(sqlQuery));
        if (!aResult) {
-               Log(detector, Form("GetHLTFileName - Can't execute SQL query for: id = %s, source = %s",
-                               id, source));
+               Log(detector, Form("GetFileName - Can't execute SQL query to %s database for: id = %s, source = %s",
+                               GetSystemName(system), id, sourceName.Data()));
                return 0;
        }
 
        if(aResult->GetRowCount() == 0)
        {
                Log(detector,
-                       Form("GetHLTFileName - No entry in FXS table for: id = %s, source = %s",
-                               id, source));
+                       Form("GetFileName - No entry in %s FXS db for: id = %s, source = %s",
+                               GetSystemName(system), id, sourceName.Data()));
                delete aResult;
                return 0;
        }
 
        if (aResult->GetRowCount() > 1) {
                Log(detector,
-                       Form("GetHLTFileName - More than one entry in FXS table for: id = %s, source = %s",
-                               id, source));
+                       Form("GetFileName - More than one entry in %s FXS db for: id = %s, source = %s",
+                               GetSystemName(system), id, sourceName.Data()));
                delete aResult;
                return 0;
        }
 
-       if (aResult->GetFieldCount() != 3) {
+       if (aResult->GetFieldCount() != nFields) {
                Log(detector,
-                       Form("GetHLTFileName - Wrong field count in FXS table for: id = %s, source = %s",
-                               id, source));
+                       Form("GetFileName - Wrong field count in %s FXS db for: id = %s, source = %s",
+                               GetSystemName(system), id, sourceName.Data()));
                delete aResult;
                return 0;
        }
@@ -1541,52 +1614,72 @@ const char* AliShuttle::GetHLTFileName(const char* detector, const char* id, con
        TSQLRow* aRow = dynamic_cast<TSQLRow*> (aResult->Next());
 
        if (!aRow){
-               Log(detector, Form("GetHLTFileName - Empty set result from query: id = %s, source = %s",
-                               id, source));
+               Log(detector, Form("GetFileName - Empty set result in %s FXS db from query: id = %s, source = %s",
+                               GetSystemName(system), id, sourceName.Data()));
                delete aResult;
                return 0;
        }
 
        TString filePath(aRow->GetField(0), aRow->GetFieldLength(0));
        TString fileSize(aRow->GetField(1), aRow->GetFieldLength(1));
-       TString fileMd5Sum(aRow->GetField(2), aRow->GetFieldLength(2));
+       TString fileChecksum(aRow->GetField(2), aRow->GetFieldLength(2));
 
        delete aResult;
        delete aRow;
 
-       AliDebug(2, Form("filePath = %s",filePath.Data()));
-
-       // The full file path in HLT FXS is runNb/DET/DDLnumber/filePath
-//     TString fullFilePath = Form("%d/%s/%s/%s", GetCurrentRun(), detector, source, filePath.Data());
+       AliDebug(2, Form("filePath = %s; size = %s, fileChecksum = %s",
+                               filePath.Data(), fileSize.Data(), fileChecksum.Data()));
 
        // retrieved file is renamed to make it unique
-       TString localFileName = Form("HLT_%s_%d_%s_%s.shuttle",
-                                       detector, GetCurrentRun(), id, source);
+       TString localFileName = Form("%s_%s_%d_%s_%s.shuttle",
+                                       GetSystemName(system), detector, GetCurrentRun(), id, sourceName.Data());
 
-       // file retrieval from HLT FXS
-       Bool_t result = RetrieveHLTFile(filePath.Data(), localFileName.Data());
-       if(!result)
-       {
-               Log(detector, Form("GetHLTFileName - Copy of file %s from HLT FXS failed", filePath.Data()));
-               return 0;
-       } else {
-               AliInfo(Form("File %s copied from HLT FXS into %s/%s",
-                       filePath.Data(), GetShuttleTempDir(), localFileName.Data()));
-       }
 
-       // compare md5sum of local file with the one stored in the HLT DB
-       Int_t md5Comp = gSystem->Exec(Form("md5sum %s/%s |grep %s 2>&1 > /dev/null",
-                                               GetShuttleTempDir(), localFileName.Data(), fileMd5Sum.Data()));
+       // file retrieval from FXS
+       UInt_t nRetries = 0;
+       UInt_t maxRetries = 3;
+       Bool_t result = kFALSE;
 
-       if (md5Comp != 0)
-       {
-               Log(detector, Form("GetHLTFileName - md5sum of file %s does not match with local copy!", filePath.Data()));
-               return 0;
+       // copy!! if successful TSystem::Exec returns 0
+       while(nRetries++ < maxRetries) {
+               AliDebug(2, Form("Trying to copy file. Retry # %d", nRetries));
+               result = RetrieveFile(system, filePath.Data(), localFileName.Data());
+               if(!result)
+               {
+                       Log(detector, Form("GetFileName - Copy of file %s from %s FXS failed",
+                                       filePath.Data(), GetSystemName(system)));
+                       continue;
+               } else {
+                       AliInfo(Form("File %s copied from %s FXS into %s/%s",
+                                               filePath.Data(), GetSystemName(system),
+                                               GetShuttleTempDir(), localFileName.Data()));
+               }
+
+               if (fileChecksum.Length()>0)
+               {
+                       // compare md5sum of local file with the one stored in the FXS DB
+                       Int_t md5Comp = gSystem->Exec(Form("md5sum %s/%s |grep %s 2>&1 > /dev/null",
+                                               GetShuttleTempDir(), localFileName.Data(), fileChecksum.Data()));
+
+                       if (md5Comp != 0)
+                       {
+                               Log(detector, Form("GetFileName - md5sum of file %s does not match with local copy!",
+                                                       filePath.Data()));
+                               result = kFALSE;
+                               continue;
+                       }
+               } else {
+                       Log(fCurrentDetector, Form("GetFile - md5sum of file %s not set in %s database, skipping comparison",
+                                                       filePath.Data(), GetSystemName(system)));
+               }
+               if (result) break;
        }
 
-       fFXSCalled[kHLT]=kTRUE;
-       TObjString *fileParams = new TObjString(Form("%s#!?!#%s", id, source));
-       fFXSlist[kHLT].Add(fileParams);
+       if(!result) return 0;
+
+       fFXSCalled[system]=kTRUE;
+       TObjString *fileParams = new TObjString(Form("%s#!?!#%s", id, sourceName.Data()));
+       fFXSlist[system].Add(fileParams);
 
        static TString fullLocalFileName;
        fullLocalFileName = TString::Format("%s/%s", GetShuttleTempDir(), localFileName.Data());
@@ -1598,13 +1691,15 @@ const char* AliShuttle::GetHLTFileName(const char* detector, const char* id, con
 }
 
 //______________________________________________________________________________________________
-Bool_t AliShuttle::RetrieveHLTFile(const char* hltFileName, const char* localFileName)
+Bool_t AliShuttle::RetrieveFile(UInt_t system, const char* fxsFileName, const char* localFileName)
 {
-// Copies file from HLT FXS to local Shuttle machine
+       //
+       // Copies file from FXS to local Shuttle machine
+       //
 
        // check temp directory: trying to cd to temp; if it does not exist, create it
-       AliDebug(2, Form("Copy file %s from HLT FXS into %s/%s",
-                       hltFileName, GetShuttleTempDir(), localFileName));
+       AliDebug(2, Form("Copy file %s from %s FXS into %s/%s",
+                       GetSystemName(system), fxsFileName, GetShuttleTempDir(), localFileName));
 
        void* dir = gSystem->OpenDirectory(GetShuttleTempDir());
        if (dir == NULL) {
@@ -1617,43 +1712,75 @@ Bool_t AliShuttle::RetrieveHLTFile(const char* hltFileName, const char* localFil
                gSystem->FreeDirectory(dir);
        }
 
-       TString baseHLTFXSFolder = "~";
-       TString command = Form("scp -oPort=%d %s@%s:%s/%s %s/%s",
-               fConfig->GetFXSPort(kHLT),
-               fConfig->GetFXSUser(kHLT),
-               fConfig->GetFXSHost(kHLT),
-               baseHLTFXSFolder.Data(),
-               hltFileName,
+       TString baseFXSFolder;
+       if (system == kDAQ)
+       {
+               baseFXSFolder = "FES/";
+       }
+       else if (system == kDCS)
+       {
+               baseFXSFolder = "";
+       }
+       else if (system == kHLT)
+       {
+               baseFXSFolder = "~/";
+       }
+
+
+       TString command = Form("scp -oPort=%d -2 %s@%s:%s%s %s/%s",
+               fConfig->GetFXSPort(system),
+               fConfig->GetFXSUser(system),
+               fConfig->GetFXSHost(system),
+               baseFXSFolder.Data(),
+               fxsFileName,
                GetShuttleTempDir(),
                localFileName);
 
        AliDebug(2, Form("%s",command.Data()));
 
-       UInt_t nRetries = 0;
-       UInt_t maxRetries = 3;
-
-       // copy!! if successful TSystem::Exec returns 0
-       while(nRetries++ < maxRetries) {
-               AliDebug(2, Form("Trying to copy file. Retry # %d", nRetries));
-               if(gSystem->Exec(command.Data()) == 0) return kTRUE;
-       }
-
-       return kFALSE;
+       Bool_t result = (gSystem->Exec(command.Data()) == 0);
 
+       return result;
 }
 
 //______________________________________________________________________________________________
-TList* AliShuttle::GetHLTFileSources(const char* detector, const char* id){
-// Retrieves list of HLT sources (DDLnumbers) of file Id
+TList* AliShuttle::GetFileSources(Int_t system, const char* detector, const char* id)
+{
+       //
+       // Get sources producing the condition file Id from file exchange servers
+       //
+       
+       // check if test mode should simulate a FXS error
+       if (fTestMode & kErrorFXSSources)
+       {
+               Log(detector, Form("GetFileSources - In TESTMODE - Simulating error while connecting to %s FXS", GetSystemName(system)));
+               return 0;
+       }
+
+
+       if (system == kDCS)
+       {
+               AliError("DCS system has only one source of data!");
+               return NULL;
+       }
 
        // check connection, in case connect
-       if(!Connect(kHLT)){
-               Log(detector, "GetHLTFileSources - Couldn't connect to HLT FXS database");
-               return 0;
+       if (!Connect(system))
+       {
+               Log(detector, Form("GetFile - Couldn't connect to %s FXS database", GetSystemName(system)));
+               return NULL;
        }
 
-       // Query preparation
-       TString sqlQueryStart = Form("select DDLnumbers from %s where", fConfig->GetFXSdbTable(kHLT));
+       TString sourceName = 0;
+       if (system == kDAQ)
+       {
+               sourceName = "DAQsource";
+       } else if (system == kHLT)
+       {
+               sourceName = "DDLnumbers";
+       }
+
+       TString sqlQueryStart = Form("select %s from %s where", sourceName.Data(), fConfig->GetFXSdbTable(system));
        TString whereClause = Form("run=%d and detector=\"%s\" and fileId=\"%s\"",
                                GetCurrentRun(), detector, id);
        TString sqlQuery = Form("%s %s", sqlQueryStart.Data(), whereClause.Data());
@@ -1662,15 +1789,17 @@ TList* AliShuttle::GetHLTFileSources(const char* detector, const char* id){
 
        // Query execution
        TSQLResult* aResult;
-       aResult = fServer[kHLT]->Query(sqlQuery);
+       aResult = fServer[system]->Query(sqlQuery);
        if (!aResult) {
-               Log(detector, Form("GetHLTFileSources - Can't execute SQL query for id: %s", id));
+               Log(detector, Form("GetFileSources - Can't execute SQL query to %s database for id: %s",
+                               GetSystemName(system), id));
                return 0;
        }
 
-       if (aResult->GetRowCount() == 0) {
+       if (aResult->GetRowCount() == 0)
+       {
                Log(detector,
-                       Form("GetHLTFileSources - No entry in FXS table for id: %s", id));
+                       Form("GetFileSources - No entry in %s FXS table for id: %s", GetSystemName(system), id));
                delete aResult;
                return 0;
        }
@@ -1679,124 +1808,218 @@ TList* AliShuttle::GetHLTFileSources(const char* detector, const char* id){
        TList *list = new TList();
        list->SetOwner(1);
 
-       while((aRow = aResult->Next())){
+       while ((aRow = aResult->Next()))
+       {
 
-               TString ddlNumbers(aRow->GetField(0), aRow->GetFieldLength(0));
-               AliDebug(2, Form("DDLnumbers = %s", ddlNumbers.Data()));
-               list->Add(new TObjString(ddlNumbers));
+               TString source(aRow->GetField(0), aRow->GetFieldLength(0));
+               AliDebug(2, Form("%s = %s", sourceName.Data(), source.Data()));
+               list->Add(new TObjString(source));
                delete aRow;
        }
+
        delete aResult;
 
        return list;
-
 }
 
 //______________________________________________________________________________________________
-Bool_t AliShuttle::UpdateDAQTable()
+Bool_t AliShuttle::Connect(Int_t system)
 {
-// Update DAQ table filling time_processed field in all rows corresponding to current run and detector
+       // Connect to MySQL Server of the system's FXS MySQL databases
+       // DAQ Logbook, Shuttle Logbook and DAQ FXS db are on the same host
+       //
 
-       // check connection, in case connect
-       if(!Connect(kDAQ)){
-               Log(fCurrentDetector, "UpdateDAQTable - Couldn't connect to DAQ FXS database");
+       // check connection: if already connected return
+       if(fServer[system] && fServer[system]->IsConnected()) return kTRUE;
+
+       TString dbHost, dbUser, dbPass, dbName;
+
+       if (system < 3) // FXS db servers
+       {
+               dbHost = Form("mysql://%s:%d", fConfig->GetFXSdbHost(system), fConfig->GetFXSdbPort(system));
+               dbUser = fConfig->GetFXSdbUser(system);
+               dbPass = fConfig->GetFXSdbPass(system);
+               dbName =   fConfig->GetFXSdbName(system);
+       } else { // Run & Shuttle logbook servers
+       // TODO Will the Shuttle logbook server be the same as the Run logbook server ???
+               dbHost = Form("mysql://%s:%d", fConfig->GetDAQlbHost(), fConfig->GetDAQlbPort());
+               dbUser = fConfig->GetDAQlbUser();
+               dbPass = fConfig->GetDAQlbPass();
+               dbName =   fConfig->GetDAQlbDB();
+       }
+
+       fServer[system] = TSQLServer::Connect(dbHost.Data(), dbUser.Data(), dbPass.Data());
+       if (!fServer[system] || !fServer[system]->IsConnected()) {
+               if(system < 3)
+               {
+               AliError(Form("Can't establish connection to FXS database for %s",
+                                       AliShuttleInterface::GetSystemName(system)));
+               } else {
+               AliError("Can't establish connection to Run logbook.");
+               }
+               if(fServer[system]) delete fServer[system];
                return kFALSE;
        }
 
-       TTimeStamp now; // now
+       // Get tables
+       TSQLResult* aResult=0;
+       switch(system){
+               case kDAQ:
+                       aResult = fServer[kDAQ]->GetTables(dbName.Data());
+                       break;
+               case kDCS:
+                       aResult = fServer[kDCS]->GetTables(dbName.Data());
+                       break;
+               case kHLT:
+                       aResult = fServer[kHLT]->GetTables(dbName.Data());
+                       break;
+               default:
+                       aResult = fServer[3]->GetTables(dbName.Data());
+                       break;
+       }
+
+       delete aResult;
+       return kTRUE;
+}
 
-       // Loop on FXS list entries
-       TIter iter(&fFXSlist[kDAQ]);
-       TObjString *aFXSentry=0;
-       while((aFXSentry = dynamic_cast<TObjString*> (iter.Next()))){
-               TString aFXSentrystr = aFXSentry->String();
-               TObjArray *aFXSarray = aFXSentrystr.Tokenize("#!?!#");
-               if(!aFXSarray || aFXSarray->GetEntries() != 2 ) {
-                       Log(fCurrentDetector, Form("UpdateDAQTable - error updating FXS entry. Check string: <%s>",
-                               aFXSentrystr.Data()));
-                       if(aFXSarray) delete aFXSarray;
-                       return kFALSE;
+//______________________________________________________________________________________________
+Bool_t AliShuttle::UpdateTable()
+{
+       //
+       // Update FXS table filling time_processed field in all rows corresponding to current run and detector
+       //
+
+       Bool_t result = kTRUE;
+
+       for (UInt_t system=0; system<3; system++)
+       {
+               if(!fFXSCalled[system]) continue;
+
+               // check connection, in case connect
+               if (!Connect(system))
+               {
+                       Log(fCurrentDetector, Form("UpdateTable - Couldn't connect to %s FXS database", GetSystemName(system)));
+                       result = kFALSE;
+                       continue;
                }
-               const char* fileId = ((TObjString*) aFXSarray->At(0))->GetName();
-               const char* daqSource = ((TObjString*) aFXSarray->At(1))->GetName();
-               TString whereClause = Form("where run=%d and detector=\"%s\" and fileId=\"%s\" and DAQsource=\"%s\";",
-                       GetCurrentRun(), fCurrentDetector.Data(), fileId, daqSource);
 
-               delete aFXSarray;
+               TTimeStamp now; // now
 
-               TString sqlQuery = Form("update %s set time_processed=%d %s", fConfig->GetFXSdbTable(kDAQ),
-                                                       now.GetSec(), whereClause.Data());
+               // Loop on FXS list entries
+               TIter iter(&fFXSlist[system]);
+               TObjString *aFXSentry=0;
+               while ((aFXSentry = dynamic_cast<TObjString*> (iter.Next())))
+               {
+                       TString aFXSentrystr = aFXSentry->String();
+                       TObjArray *aFXSarray = aFXSentrystr.Tokenize("#!?!#");
+                       if (!aFXSarray || aFXSarray->GetEntries() != 2 )
+                       {
+                               Log(fCurrentDetector, Form("UpdateTable - error updating %s FXS entry. Check string: <%s>",
+                                       GetSystemName(system), aFXSentrystr.Data()));
+                               if(aFXSarray) delete aFXSarray;
+                               result = kFALSE;
+                               continue;
+                       }
+                       const char* fileId = ((TObjString*) aFXSarray->At(0))->GetName();
+                       const char* source = ((TObjString*) aFXSarray->At(1))->GetName();
 
-               AliDebug(2, Form("SQL query: \n%s",sqlQuery.Data()));
+                       TString whereClause;
+                       if (system == kDAQ)
+                       {
+                               whereClause = Form("where run=%d and detector=\"%s\" and fileId=\"%s\" and DAQsource=\"%s\";",
+                                                       GetCurrentRun(), fCurrentDetector.Data(), fileId, source);
+                       }
+                       else if (system == kDCS)
+                       {
+                               whereClause = Form("where run=%d and detector=\"%s\" and fileId=\"%s\";",
+                                                       GetCurrentRun(), fCurrentDetector.Data(), fileId);
+                       }
+                       else if (system == kHLT)
+                       {
+                               whereClause = Form("where run=%d and detector=\"%s\" and fileId=\"%s\" and DDLnumbers=\"%s\";",
+                                                       GetCurrentRun(), fCurrentDetector.Data(), fileId, source);
+                       }
 
-               // Query execution
-               TSQLResult* aResult;
-               aResult = dynamic_cast<TSQLResult*> (fServer[kDAQ]->Query(sqlQuery));
-               if (!aResult) {
-                       Log(fCurrentDetector, Form("UpdateDAQTable - Can't execute SQL query <%s>", sqlQuery.Data()));
-                       return kFALSE;
+                       delete aFXSarray;
+
+                       TString sqlQuery = Form("update %s set time_processed=%d %s", fConfig->GetFXSdbTable(system),
+                                                               now.GetSec(), whereClause.Data());
+
+                       AliDebug(2, Form("SQL query: \n%s",sqlQuery.Data()));
+
+                       // Query execution
+                       TSQLResult* aResult;
+                       aResult = dynamic_cast<TSQLResult*> (fServer[system]->Query(sqlQuery));
+                       if (!aResult)
+                       {
+                               Log(fCurrentDetector, Form("UpdateTable - %s db: can't execute SQL query <%s>",
+                                                               GetSystemName(system), sqlQuery.Data()));
+                               result = kFALSE;
+                               continue;
+                       }
+                       delete aResult;
                }
-               delete aResult;
        }
 
-       return kTRUE;
+       return result;
 }
 
 //______________________________________________________________________________________________
-Bool_t AliShuttle::UpdateHLTTable()
+Bool_t AliShuttle::UpdateTableFailCase()
 {
-// Update HLT table filling time_processed field in all rows corresponding to current run and detector
+       // Update FXS table filling time_processed field in all rows corresponding to current run and detector
+       // this is called in case the preprocessor is declared failed for the current run, because
+       // the fields are updated only in case of success
 
-       // check connection, in case connect
-       if(!Connect(kHLT)){
-               Log(fCurrentDetector, "UpdateHLTTable - Couldn't connect to HLT FXS database");
-               return kFALSE;
-       }
-
-       TTimeStamp now; // now
+       Bool_t result = kTRUE;
 
-       // Loop on FXS list entries
-       TIter iter(&fFXSlist[kHLT]);
-       TObjString *aFXSentry=0;
-       while((aFXSentry = dynamic_cast<TObjString*> (iter.Next()))){
-               TString aFXSentrystr = aFXSentry->String();
-               TObjArray *aFXSarray = aFXSentrystr.Tokenize("#!?!#");
-               if(!aFXSarray || aFXSarray->GetEntries() != 2 ) {
-                       Log(fCurrentDetector, Form("UpdateHLTTable - error updating FXS entry. Check string: <%s>",
-                               aFXSentrystr.Data()));
-                       if(aFXSarray) delete aFXSarray;
-                       return kFALSE;
+       for (UInt_t system=0; system<3; system++)
+       {
+               // check connection, in case connect
+               if (!Connect(system))
+               {
+                       Log(fCurrentDetector, Form("UpdateTableFailCase - Couldn't connect to %s FXS database",
+                                                       GetSystemName(system)));
+                       result = kFALSE;
+                       continue;
                }
-               const char* fileId = ((TObjString*) aFXSarray->At(0))->GetName();
-               const char* hltSource = ((TObjString*) aFXSarray->At(1))->GetName();
-               TString whereClause = Form("where run=%d and detector=\"%s\" and fileId=\"%s\" and DDLnumbers=\"%s\";",
-                       GetCurrentRun(), fCurrentDetector.Data(), fileId, hltSource);
 
-               delete aFXSarray;
+               TTimeStamp now; // now
+
+               // Loop on FXS list entries
+
+               TString whereClause = Form("where run=%d and detector=\"%s\";",
+                                               GetCurrentRun(), fCurrentDetector.Data());
 
-               TString sqlQuery = Form("update %s set time_processed=%d %s", fConfig->GetFXSdbTable(kHLT),
+
+               TString sqlQuery = Form("update %s set time_processed=%d %s", fConfig->GetFXSdbTable(system),
                                                        now.GetSec(), whereClause.Data());
 
                AliDebug(2, Form("SQL query: \n%s",sqlQuery.Data()));
 
                // Query execution
                TSQLResult* aResult;
-               aResult = dynamic_cast<TSQLResult*> (fServer[kHLT]->Query(sqlQuery));
-               if (!aResult) {
-                       Log(fCurrentDetector, Form("UpdateHLTTable - Can't execute SQL query <%s>", sqlQuery.Data()));
-                       return kFALSE;
+               aResult = dynamic_cast<TSQLResult*> (fServer[system]->Query(sqlQuery));
+               if (!aResult)
+               {
+                       Log(fCurrentDetector, Form("UpdateTableFailCase - %s db: can't execute SQL query <%s>",
+                                                       GetSystemName(system), sqlQuery.Data()));
+                       result = kFALSE;
+                       continue;
                }
                delete aResult;
        }
 
-       return kTRUE;
+       return result;
 }
 
 //______________________________________________________________________________________________
 Bool_t AliShuttle::UpdateShuttleLogbook(const char* detector, const char* status)
 {
-// Update Shuttle logbook filling detector or shuttle_done column
-// ex. of usage: UpdateShuttleLogbook("PHOS", "DONE") or UpdateShuttleLogbook("shuttle_done")
+       //
+       // Update Shuttle logbook filling detector or shuttle_done column
+       // ex. of usage: UpdateShuttleLogbook("PHOS", "DONE") or UpdateShuttleLogbook("shuttle_done")
+       //
 
        // check connection, in case connect
        if(!Connect(3)){
@@ -1806,8 +2029,17 @@ Bool_t AliShuttle::UpdateShuttleLogbook(const char* detector, const char* status
 
        TString detName(detector);
        TString setClause;
-       if(detName == "shuttle_done") {
+       if(detName == "shuttle_done")
+       {
                setClause = "set shuttle_done=1";
+
+               // Send the information to ML
+               TMonaLisaText  mlStatus("SHUTTLE_status", "Done");
+
+               TList mlList;
+               mlList.Add(&mlStatus);
+
+               fMonaLisa->SendParameters(&mlList);
        } else {
                TString statusStr(status);
                if(statusStr.Contains("done", TString::kIgnoreCase) ||
@@ -1823,8 +2055,8 @@ Bool_t AliShuttle::UpdateShuttleLogbook(const char* detector, const char* status
 
        TString whereClause = Form("where run=%d", GetCurrentRun());
 
-       TString sqlQuery = Form("update logbook_shuttle %s %s",
-                                       setClause.Data(), whereClause.Data());
+       TString sqlQuery = Form("update %s %s %s",
+                                       fConfig->GetShuttlelbTable(), setClause.Data(), whereClause.Data());
 
        AliDebug(2, Form("SQL query: \n%s",sqlQuery.Data()));
 
@@ -1843,7 +2075,9 @@ Bool_t AliShuttle::UpdateShuttleLogbook(const char* detector, const char* status
 //______________________________________________________________________________________________
 Int_t AliShuttle::GetCurrentRun() const
 {
-// Get current run from logbook entry
+       //
+       // Get current run from logbook entry
+       //
 
        return fLogbookEntry ? fLogbookEntry->GetRun() : -1;
 }
@@ -1851,7 +2085,9 @@ Int_t AliShuttle::GetCurrentRun() const
 //______________________________________________________________________________________________
 UInt_t AliShuttle::GetCurrentStartTime() const
 {
-// get current start time
+       //
+       // get current start time
+       //
 
        return fLogbookEntry ? fLogbookEntry->GetStartTime() : 0;
 }
@@ -1859,7 +2095,9 @@ UInt_t AliShuttle::GetCurrentStartTime() const
 //______________________________________________________________________________________________
 UInt_t AliShuttle::GetCurrentEndTime() const
 {
-// get current end time from logbook entry
+       //
+       // get current end time from logbook entry
+       //
 
        return fLogbookEntry ? fLogbookEntry->GetEndTime() : 0;
 }
@@ -1867,7 +2105,9 @@ UInt_t AliShuttle::GetCurrentEndTime() const
 //______________________________________________________________________________________________
 void AliShuttle::Log(const char* detector, const char* message)
 {
-// Fill log string with a message
+       //
+       // Fill log string with a message
+       //
 
        void* dir = gSystem->OpenDirectory(GetShuttleLogDir());
        if (dir == NULL) {
@@ -1881,13 +2121,18 @@ void AliShuttle::Log(const char* detector, const char* message)
        }
 
        TString toLog = Form("%s (%d): %s - ", TTimeStamp(time(0)).AsString("s"), getpid(), detector);
-       if(GetCurrentRun()>=0 ) toLog += Form("run %d - ", GetCurrentRun());
+       if (GetCurrentRun() >= 0) 
+               toLog += Form("run %d - ", GetCurrentRun());
        toLog += Form("%s", message);
 
        AliInfo(toLog.Data());
 
        TString fileName;
-       fileName.Form("%s/%s.log", GetShuttleLogDir(), detector);
+       if (GetCurrentRun() >= 0) 
+               fileName.Form("%s/%s_%d.log", GetShuttleLogDir(), detector, GetCurrentRun());
+       else
+               fileName.Form("%s/%s.log", GetShuttleLogDir(), detector);
+       
        gSystem->ExpandPathName(fileName);
 
        ofstream logFile;
@@ -1906,12 +2151,12 @@ void AliShuttle::Log(const char* detector, const char* message)
 //______________________________________________________________________________________________
 Bool_t AliShuttle::Collect(Int_t run)
 {
-//
-// Collects conditions data for all UNPROCESSED run written to DAQ LogBook in case of run = -1 (default)
-// If a dedicated run is given this run is processed
-//
-// In operational mode, this is the Shuttle function triggered by the EOR signal.
-//
+       //
+       // Collects conditions data for all UNPROCESSED run written to DAQ LogBook in case of run = -1 (default)
+       // If a dedicated run is given this run is processed
+       //
+       // In operational mode, this is the Shuttle function triggered by the EOR signal.
+       //
 
        if (run == -1)
                Log("SHUTTLE","Collect - Shuttle called. Collecting conditions data for unprocessed runs");
@@ -1987,7 +2232,9 @@ Bool_t AliShuttle::Collect(Int_t run)
 //______________________________________________________________________________________________
 Bool_t AliShuttle::RetrieveConditionsData(const TObjArray& dateEntries)
 {
-// Retrieve conditions data for all runs that aren't processed yet
+       //
+       // Retrieve conditions data for all runs that aren't processed yet
+       //
 
        Bool_t hasError = kFALSE;
 
@@ -1998,6 +2245,10 @@ Bool_t AliShuttle::RetrieveConditionsData(const TObjArray& dateEntries)
                if (!Process(anEntry)){
                        hasError = kTRUE;
                }
+
+               // clean SHUTTLE temp directory
+               TString filename = Form("%s/*.shuttle", GetShuttleTempDir());
+               RemoveFile(filename.Data());
        }
 
        return hasError == kFALSE;
@@ -2006,6 +2257,10 @@ Bool_t AliShuttle::RetrieveConditionsData(const TObjArray& dateEntries)
 //______________________________________________________________________________________________
 ULong_t AliShuttle::GetTimeOfLastAction() const
 {
+       //
+       // Gets time of last action
+       //
+
        ULong_t tmp;
 
        fMonitoringMutex->Lock();
@@ -2020,7 +2275,9 @@ ULong_t AliShuttle::GetTimeOfLastAction() const
 //______________________________________________________________________________________________
 const TString AliShuttle::GetLastAction() const
 {
+       //
        // returns a string description of the last action
+       //
 
        TString tmp;
 
@@ -2036,7 +2293,9 @@ const TString AliShuttle::GetLastAction() const
 //______________________________________________________________________________________________
 void AliShuttle::SetLastAction(const char* action)
 {
+       //
        // updates the monitoring variables
+       //
 
        fMonitoringMutex->Lock();
 
@@ -2049,7 +2308,9 @@ void AliShuttle::SetLastAction(const char* action)
 //______________________________________________________________________________________________
 const char* AliShuttle::GetRunParameter(const char* param)
 {
-// returns run parameter read from DAQ logbook
+       //
+       // returns run parameter read from DAQ logbook
+       //
 
        if(!fLogbookEntry) {
                AliError("No logbook entry!");
@@ -2059,10 +2320,38 @@ const char* AliShuttle::GetRunParameter(const char* param)
        return fLogbookEntry->GetRunParameter(param);
 }
 
+//______________________________________________________________________________________________
+AliCDBEntry* AliShuttle::GetFromOCDB(const char* detector, const AliCDBPath& path)
+{
+       //
+       // returns object from OCDB valid for current run
+       //
+
+       if (fTestMode & kErrorOCDB)
+       {
+               Log(detector, "GetFromOCDB - In TESTMODE - Simulating error with OCDB");
+               return 0;
+       }
+       
+       AliCDBStorage *sto = AliCDBManager::Instance()->GetStorage(fgkMainCDB);
+       if (!sto)
+       {
+               Log(detector, "GetFromOCDB - Cannot activate main OCDB for query!");
+               return 0;
+       }
+
+       return dynamic_cast<AliCDBEntry*> (sto->Get(path, GetCurrentRun()));
+}
+
 //______________________________________________________________________________________________
 Bool_t AliShuttle::SendMail()
 {
-// sends a mail to the subdetector expert in case of preprocessor error
+       //
+       // sends a mail to the subdetector expert in case of preprocessor error
+       //
+       
+       if (fTestMode != kNone)
+               return kTRUE;
 
        void* dir = gSystem->OpenDirectory(GetShuttleLogDir());
        if (dir == NULL)
@@ -2124,7 +2413,7 @@ Bool_t AliShuttle::SendMail()
        mailBody.close();
        mailBody.open(bodyFileName, ofstream::out | ofstream::app);
 
-       TString logFileName = Form("%s/%s.log", GetShuttleLogDir(), fCurrentDetector.Data());
+       TString logFileName = Form("%s/%s_%d.log", GetShuttleLogDir(), fCurrentDetector.Data(), GetCurrentRun());
        TString tailCommand = Form("tail -n 10 %s >> %s", logFileName.Data(), bodyFileName.Data());
        if (gSystem->Exec(tailCommand.Data()))
        {
@@ -2155,10 +2444,27 @@ Bool_t AliShuttle::SendMail()
        return result == 0;
 }
 
+//______________________________________________________________________________________________
+const char* AliShuttle::GetRunType()
+{
+       //
+       // returns run type read from "run type" logbook
+       //
+
+       if(!fLogbookEntry) {
+               AliError("No logbook entry!");
+               return 0;
+       }
+
+       return fLogbookEntry->GetRunType();
+}
+
 //______________________________________________________________________________________________
 void AliShuttle::SetShuttleTempDir(const char* tmpDir)
 {
-// sets Shuttle temp directory
+       //
+       // sets Shuttle temp directory
+       //
 
        fgkShuttleTempDir = gSystem->ExpandPathName(tmpDir);
 }
@@ -2166,7 +2472,9 @@ void AliShuttle::SetShuttleTempDir(const char* tmpDir)
 //______________________________________________________________________________________________
 void AliShuttle::SetShuttleLogDir(const char* logDir)
 {
-// sets Shuttle log directory
+       //
+       // sets Shuttle log directory
+       //
 
        fgkShuttleLogDir = gSystem->ExpandPathName(logDir);
 }