]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - SHUTTLE/AliShuttle.cxx
Fixed some pedantic errors
[u/mrichter/AliRoot.git] / SHUTTLE / AliShuttle.cxx
index 73c3379baa326ef3c5a63371943b7d23744850b4..e252310363e2b5123eaec1ddb787c09c75f49a3f 100644 (file)
 
 /*
 $Log$
+Revision 1.55  2007/08/06 12:26:40  acolla
+Function Bool_t GetHLTStatus added to preprocessor. It returns the status of HLT
+read from the run logbook.
+
+Revision 1.54  2007/07/12 09:51:25  jgrosseo
+removed duplicated log message in GetFile
+
+Revision 1.53  2007/07/12 09:26:28  jgrosseo
+updating hlt fxs base path
+
+Revision 1.52  2007/07/12 08:06:45  jgrosseo
+adding log messages in getfile... functions
+adding not implemented copy constructor in alishuttleconfigholder
+
+Revision 1.51  2007/07/03 17:24:52  acolla
+root moved to v5-16-00. TFileMerger->Cp moved to TFile::Cp.
+
+Revision 1.50  2007/07/02 17:19:32  acolla
+preprocessor is run in a temp directory that is removed when process is finished.
+
+Revision 1.49  2007/06/29 10:45:06  acolla
+Number of columns in MySql Shuttle logbook increased by one (HLT added)
+
+Revision 1.48  2007/06/21 13:06:19  acolla
+GetFileSources returns dummy list with 1 source if system=DCS (better than
+returning error as it was)
+
+Revision 1.47  2007/06/19 17:28:56  acolla
+HLT updated; missing map bug removed.
+
+Revision 1.46  2007/06/09 13:01:09  jgrosseo
+Switching to retrieval of several DCS DPs at a time (multiDPrequest)
+
+Revision 1.45  2007/05/30 06:35:20  jgrosseo
+Adding functionality to the Shuttle/TestShuttle:
+o) Function to retrieve list of sources from a given system (GetFileSources with id=0)
+o) Function to retrieve list of IDs for a given source      (GetFileIDs)
+These functions are needed for dealing with the tag files that are saved for the GRP preprocessor
+Example code has been added to the TestProcessor in TestShuttle
+
+Revision 1.44  2007/05/11 16:09:32  acolla
+Reference files for ITS, MUON and PHOS are now stored in OfflineDetName/OnlineDetName/run_...
+example: ITS/SPD/100_filename.root
+
+Revision 1.43  2007/05/10 09:59:51  acolla
+Various bug fixes in StoreRefFilesToGrid; Cleaning of reference storage before processing detector (CleanReferenceStorage)
+
+Revision 1.42  2007/05/03 08:01:39  jgrosseo
+typo in last commit :-(
+
+Revision 1.41  2007/05/03 08:00:48  jgrosseo
+fixing log message when pp want to skip dcs value retrieval
+
+Revision 1.40  2007/04/27 07:06:48  jgrosseo
+GetFileSources returns empty list in case of no files, but successful query
+No mails sent in testmode
+
+Revision 1.39  2007/04/17 12:43:57  acolla
+Correction in StoreOCDB; change of text in mail to detector expert
+
+Revision 1.38  2007/04/12 08:26:18  jgrosseo
+updated comment
+
+Revision 1.37  2007/04/10 16:53:14  jgrosseo
+redirecting sub detector stdout, stderr to sub detector log file
+
 Revision 1.35  2007/04/04 16:26:38  acolla
 1. Re-organization of function calls in TestPreprocessor to make it more meaningful.
 2. Added missing dependency in test preprocessors.
@@ -207,6 +273,7 @@ some docs added
 #include <TMutex.h>
 #include <TSystemDirectory.h>
 #include <TSystemFile.h>
+#include <TFile.h>
 #include <TFileMerger.h>
 #include <TGrid.h>
 #include <TGridResult.h>
@@ -234,7 +301,8 @@ fLastActionTime(0),
 fLastAction(),
 fMonaLisa(0),
 fTestMode(kNone),
-fReadTestMode(kFALSE)
+fReadTestMode(kFALSE),
+fOutputRedirected(kFALSE)
 {
        //
        // config: AliShuttleConfig used
@@ -409,13 +477,13 @@ Bool_t AliShuttle::StoreOCDB()
                return kFALSE;
        }
        
-       AliInfo("Storing OCDB data ...");
+       Log("SHUTTLE","Storing OCDB data ...");
        Bool_t resultCDB = StoreOCDB(fgkMainCDB);
 
-       AliInfo("Storing reference data ...");
+       Log("SHUTTLE","Storing reference data ...");
        Bool_t resultRef = StoreOCDB(fgkMainRefStorage);
        
-       AliInfo("Storing reference files ...");
+       Log("SHUTTLE","Storing reference files ...");
        Bool_t resultRefFiles = StoreRefFilesToGrid();
        
        return resultCDB && resultRef && resultRefFiles;
@@ -514,6 +582,9 @@ Bool_t AliShuttle::StoreOCDB(const TString& gridURI)
                                Log("SHUTTLE",
                                        Form("StoreOCDB - Object <%s> successfully put into %s storage",
                                                aLocId.ToString().Data(), type));
+                               Log(fCurrentDetector.Data(),
+                                       Form("StoreOCDB - Object <%s> successfully put into %s storage",
+                                               aLocId.ToString().Data(), type));
                        }
 
                        // removing local filename...
@@ -526,6 +597,9 @@ Bool_t AliShuttle::StoreOCDB(const TString& gridURI)
                        Log("SHUTTLE",
                                Form("StoreOCDB - Grid %s storage of object <%s> failed",
                                        type, aLocId.ToString().Data()));
+                       Log(fCurrentDetector.Data(),
+                               Form("StoreOCDB - Grid %s storage of object <%s> failed",
+                                       type, aLocId.ToString().Data()));
                        result = kFALSE;
                }
        }
@@ -534,13 +608,111 @@ Bool_t AliShuttle::StoreOCDB(const TString& gridURI)
        return result;
 }
 
+//______________________________________________________________________________________________
+Bool_t AliShuttle::CleanReferenceStorage(const char* detector)
+{
+       // clears the directory used to store reference files of a given subdetector
+  
+       AliCDBManager* man = AliCDBManager::Instance();
+       AliCDBStorage* sto = man->GetStorage(fgkLocalRefStorage);
+       TString localBaseFolder = sto->GetBaseFolder();
+
+       TString targetDir = GetRefFilePrefix(localBaseFolder.Data(), detector);
+       
+       Log("SHUTTLE", Form("Cleaning %s", targetDir.Data()));
+
+       TString begin;
+       begin.Form("%d_", GetCurrentRun());
+       
+       TSystemDirectory* baseDir = new TSystemDirectory("/", targetDir);
+       if (!baseDir)
+               return kTRUE;
+               
+       TList* dirList = baseDir->GetListOfFiles();
+       delete baseDir;
+       
+       if (!dirList) return kTRUE;
+                       
+       if (dirList->GetEntries() < 3) 
+       {
+               delete dirList;
+               return kTRUE;
+       }
+                               
+       Int_t nDirs = 0, nDel = 0;
+       TIter dirIter(dirList);
+       TSystemFile* entry = 0;
+
+       Bool_t success = kTRUE;
+       
+       while ((entry = dynamic_cast<TSystemFile*> (dirIter.Next())))
+       {                                       
+               if (entry->IsDirectory())
+                       continue;
+               
+               TString fileName(entry->GetName());
+               if (!fileName.BeginsWith(begin))
+                       continue;
+                       
+               nDirs++;
+                                               
+               // delete file
+               Int_t result = gSystem->Unlink(fileName.Data());
+               
+               if (result)
+               {
+                       Log("SHUTTLE", Form("Could not delete file %s!", fileName.Data()));
+                       success = kFALSE;
+               } else {
+                       nDel++;
+               }
+       }
+
+       if(nDirs > 0)
+               Log("SHUTTLE", Form("CleanReferenceStorage - %d (over %d) reference files in folder %s were deleted.", 
+                       nDel, nDirs, targetDir.Data()));
+
+               
+       delete dirList;
+       return success;
+
+
+
+
+
+
+  Int_t result = gSystem->GetPathInfo(targetDir, 0, (Long64_t*) 0, 0, 0);
+  if (result == 0)
+  {
+    // delete directory
+    result = gSystem->Exec(Form("rm -r %s", targetDir.Data()));
+    if (result != 0)
+    {  
+      Log("SHUTTLE", Form("StoreReferenceFile - Could not clear directory %s", targetDir.Data()));
+      return kFALSE;
+    }
+  }
+
+  result = gSystem->mkdir(targetDir, kTRUE);
+  if (result != 0)
+  {
+    Log("SHUTTLE", Form("StoreReferenceFile - Error creating base directory %s", targetDir.Data()));
+    return kFALSE;
+  }
+       
+  return kTRUE;
+}
+
 //______________________________________________________________________________________________
 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.
+       // Stores reference file directly (without opening it). This function stores the file locally.
        //
+       // The file is stored under the following location: 
+       // <base folder of local reference storage>/<DET>/<RUN#>_<gridFileName>
+       // where <gridFileName> is the second parameter given to the function
+       // 
        
        if (fTestMode & kErrorStorage)
        {
@@ -553,33 +725,41 @@ Bool_t AliShuttle::StoreReferenceFile(const char* detector, const char* localFil
        
        TString localBaseFolder = sto->GetBaseFolder();
        
-       TString targetDir;
-       targetDir.Form("%s/%s", localBaseFolder.Data(), detector);
+       TString targetDir = GetRefFilePrefix(localBaseFolder.Data(), detector); 
        
+       //try to open folder, if does not exist
+       void* dir = gSystem->OpenDirectory(targetDir.Data());
+       if (dir == NULL) {
+               if (gSystem->mkdir(targetDir.Data(), kTRUE)) {
+                       Log("SHUTTLE", Form("Can't open directory <%s>", targetDir.Data()));
+                       return kFALSE;
+               }
+
+       } else {
+               gSystem->FreeDirectory(dir);
+       }
+
        TString target;
        target.Form("%s/%d_%s", targetDir.Data(), GetCurrentRun(), gridFileName);
        
-       Int_t result = gSystem->GetPathInfo(targetDir, 0, (Long64_t*) 0, 0, 0);
+       Int_t result = gSystem->GetPathInfo(localFile, 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;
-               }
+               Log("SHUTTLE", Form("StoreReferenceFile - %s does not exist", localFile));
+               return kFALSE;
        }
-               
+
        result = gSystem->CopyFile(localFile, target);
 
        if (result == 0)
        {
-               Log("SHUTTLE", Form("StoreReferenceFile - Stored file %s locally to %s", localFile, target.Data()));
+               Log("SHUTTLE", Form("StoreReferenceFile - File %s stored locally to %s", localFile, target.Data()));
                return kTRUE;
        }
        else
        {
-               Log("SHUTTLE", Form("StoreReferenceFile - Storing file %s locally to %s failed", localFile, target.Data()));
+               Log("SHUTTLE", Form("StoreReferenceFile - Could not store file %s to %s!. Error code = %d", 
+                               localFile, target.Data(), result));
                return kFALSE;
        }       
 }
@@ -589,8 +769,9 @@ Bool_t AliShuttle::StoreRefFilesToGrid()
 {
        //
        // Transfers the reference file to the Grid.
-       // The final full path of the file is:
-       // gridBaseReferenceFolder/DET/#runNumber_gridFileName
+       //
+       // The files are stored under the following location: 
+       // <base folder of reference storage>/<DET>/<RUN#>_<gridFileName>
        //
        
        AliCDBManager* man = AliCDBManager::Instance();
@@ -599,18 +780,15 @@ Bool_t AliShuttle::StoreRefFilesToGrid()
                return kFALSE;
        TString localBaseFolder = sto->GetBaseFolder();
                
-       TString dir;
-       dir.Form("%s/%s", localBaseFolder.Data(), GetOfflineDetName(fCurrentDetector));
-       
+       TString dir = GetRefFilePrefix(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(), GetOfflineDetName(fCurrentDetector));
        
-       if (!gGrid) 
-               return kFALSE;
+       TString gridBaseFolder = gridSto->GetBaseFolder();
+
+       TString alienDir = GetRefFilePrefix(gridBaseFolder.Data(), fCurrentDetector.Data());
        
        TString begin;
        begin.Form("%d_", GetCurrentRun());
@@ -619,24 +797,33 @@ Bool_t AliShuttle::StoreRefFilesToGrid()
        if (!baseDir)
                return kTRUE;
                
-       TList* dirList            = baseDir->GetListOfFiles();
-       if (!dirList)
+       TList* dirList = baseDir->GetListOfFiles();
+       delete baseDir;
+       
+       if (!dirList) return kTRUE;
+               
+       if (dirList->GetEntries() < 3) 
        {
-               delete baseDir;
+               delete dirList;
                return kTRUE;
        }
-               
-       Int_t nDirs               = dirList->GetEntries();
+                       
+       if (!gGrid)
+       { 
+               Log("SHUTTLE", "Connection to Grid failed: Cannot continue!");
+               delete dirList;
+               return kFALSE;
+       }
        
+       Int_t nDirs = 0, nTransfer = 0;
+       TIter dirIter(dirList);
+       TSystemFile* entry = 0;
+
        Bool_t success = kTRUE;
        Bool_t first = kTRUE;
        
-       for (Int_t iDir=0; iDir<nDirs; ++iDir)
-       {
-               TSystemFile* entry = dynamic_cast<TSystemFile*> (dirList->At(iDir));
-               if (!entry)
-                       continue;
-                       
+       while ((entry = dynamic_cast<TSystemFile*> (dirIter.Next())))
+       {                       
                if (entry->IsDirectory())
                        continue;
                        
@@ -644,6 +831,8 @@ Bool_t AliShuttle::StoreRefFilesToGrid()
                if (!fileName.BeginsWith(begin))
                        continue;
                        
+               nDirs++;
+                       
                if (first)
                {
                        first = kFALSE;
@@ -651,18 +840,25 @@ Bool_t AliShuttle::StoreRefFilesToGrid()
                        TGridResult* result = gGrid->Ls(alienDir.Data(), "a");
                        
                        if (!result)
+                       {
+                               delete dirList;
                                return kFALSE;
+                       }
                        
-                       if (!result->GetFileName(0)) 
+                       if (!result->GetFileName(1)) // TODO: It looks like element 0 is always 0!!
                        {
                                if (!gGrid->Mkdir(alienDir.Data(),"",0))
                                {
                                        Log("SHUTTLE", Form("StoreRefFilesToGrid - Cannot create directory %s",
                                                        alienDir.Data()));
-                                       delete baseDir;
+                                       delete dirList;
                                        return kFALSE;
+                               } else {
+                                       Log("SHUTTLE",Form("Folder %s created", alienDir.Data()));
                                }
                                
+                       } else {
+                                       Log("SHUTTLE",Form("Folder %s found", alienDir.Data()));
                        }
                }
                        
@@ -672,28 +868,49 @@ Bool_t AliShuttle::StoreRefFilesToGrid()
                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);
+               Bool_t result = TFile::Cp(fullLocalPath, fullGridPath);
                
                if (result)
                {
-                       Log("SHUTTLE", Form("StoreRefFilesToGrid - Copying local file %s to %s succeeded", fullLocalPath.Data(), fullGridPath.Data()));
+                       Log("SHUTTLE", Form("StoreRefFilesToGrid - Copying local file %s to %s succeeded!", fullLocalPath.Data(), fullGridPath.Data()));
                        RemoveFile(fullLocalPath);
+                       nTransfer++;
                }
                else
                {
-                       Log("SHUTTLE", Form("StoreRefFilesToGrid - Copying local file %s to %s failed", fullLocalPath.Data(), fullGridPath.Data()));
+                       Log("SHUTTLE", Form("StoreRefFilesToGrid - Copying local file %s to %s FAILED!", fullLocalPath.Data(), fullGridPath.Data()));
                        success = kFALSE;
                }
        }
-       
-       delete baseDir;
-       
+
+       Log("SHUTTLE", Form("StoreRefFilesToGrid - %d (over %d) reference files in folder %s copied to Grid.", nTransfer, nDirs, dir.Data()));
+
+               
+       delete dirList;
        return success;
 }
 
+//______________________________________________________________________________________________
+const char* AliShuttle::GetRefFilePrefix(const char* base, const char* detector)
+{
+       //
+       // Get folder name of reference files 
+       //
+
+       TString offDetStr(GetOfflineDetName(detector));
+       TString dir;
+       if (offDetStr == "ITS" || offDetStr == "MUON" || offDetStr == "PHOS")
+       {
+               dir.Form("%s/%s/%s", base, offDetStr.Data(), detector);
+       } else {
+               dir.Form("%s/%s", base, offDetStr.Data());
+       }
+       
+       return dir.Data();
+       
+
+}
 //______________________________________________________________________________________________
 void AliShuttle::CleanLocalStorage(const TString& uri)
 {
@@ -705,7 +922,7 @@ void AliShuttle::CleanLocalStorage(const TString& uri)
        if(uri == fgkLocalCDB) {
                type = "OCDB";
        } else if(uri == fgkLocalRefStorage) {
-               type = "reference";
+               type = "Reference";
        } else {
                AliError(Form("Invalid storage URI: %s", uri.Data()));
                return;
@@ -722,7 +939,7 @@ void AliShuttle::CleanLocalStorage(const TString& uri)
        }
 
        TString filename(Form("%s/%s/*/Run*_v%d_s*.root",
-               localSto->GetBaseFolder().Data(), fCurrentDetector.Data(), GetCurrentRun()));
+               localSto->GetBaseFolder().Data(), GetOfflineDetName(fCurrentDetector.Data()), GetCurrentRun()));
 
        AliInfo(Form("filename = %s", filename.Data()));
 
@@ -900,8 +1117,15 @@ Bool_t AliShuttle::ContinueProcessing()
        if (fConfig->StrictRunOrder(fCurrentDetector) &&
                !fFirstUnprocessed[GetDetPos(fCurrentDetector)])
        {
-               Log("SHUTTLE", Form("ContinueProcessing - %s requires strict run ordering but this is not the first unprocessed run!"));
-               return kFALSE;
+               if (fTestMode == kNone)
+               {
+                       Log("SHUTTLE", Form("ContinueProcessing - %s requires strict run ordering but this is not the first unprocessed run!"));
+                       return kFALSE;
+               }
+               else
+               {
+                       Log("SHUTTLE", Form("ContinueProcessing - In TESTMODE - Although %s requires strict run ordering and this is not the first unprocessed run, the SHUTTLE continues"));
+               }
        }
 
        AliShuttleStatus* status = ReadShuttleStatus();
@@ -1190,12 +1414,38 @@ Bool_t AliShuttle::Process(AliShuttleLogbookEntry* entry)
                        // client
                        AliInfo(Form("In client process of %d - %s", GetCurrentRun(), aDetector->GetName()));
 
+                       AliInfo("Redirecting output...");
+
+                       if ((freopen(GetLogFileName(fCurrentDetector), "a", stdout)) == 0)
+                       {
+                               Log("SHUTTLE", "Could not freopen stdout");
+                       }
+                       else
+                       {
+                               fOutputRedirected = kTRUE;
+                               if ((dup2(fileno(stdout), fileno(stderr))) < 0)
+                                       Log("SHUTTLE", "Could not redirect stderr");
+                               
+                       }
+                       
+                       TString wd = gSystem->WorkingDirectory();
+                       TString tmpDir = Form("%s/%s_process",GetShuttleTempDir(),fCurrentDetector.Data());
+                       
+                       gSystem->mkdir(tmpDir.Data());
+                       gSystem->ChangeDirectory(tmpDir.Data());
+                       
                        Bool_t success = ProcessCurrentDetector();
+                       
+                       gSystem->ChangeDirectory(wd.Data());
+                       
+                       gSystem->Exec(Form("rm -rf %s",tmpDir.Data()));
+                       
                        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!"));
+                                       Log("SHUTTLE", Form("Process - %s: Could not update FXS databases!", 
+                                                       fCurrentDetector.Data()));
 
                                // Transfer the data from local storage to main storage (Grid)
                                UpdateShuttleStatus(AliShuttleStatus::kStoreStarted);
@@ -1283,10 +1533,10 @@ Bool_t AliShuttle::ProcessCurrentDetector()
 
        AliInfo(Form("Retrieving values for %s, run %d", fCurrentDetector.Data(), GetCurrentRun()));
 
-       TMap dcsMap;
-       dcsMap.SetOwner(1);
+       if (!CleanReferenceStorage(fCurrentDetector.Data()))
+               return kFALSE;
 
-       Bool_t aDCSError = kFALSE;
+       TMap* dcsMap = 0;
 
        // call preprocessor
        AliPreprocessor* aPreprocessor =
@@ -1296,7 +1546,11 @@ Bool_t AliShuttle::ProcessCurrentDetector()
 
        Bool_t processDCS = aPreprocessor->ProcessDCS();
 
-       if (!processDCS || (fTestMode & kSkipDCS))
+       if (!processDCS)
+       {
+               Log(fCurrentDetector, "The preprocessor requested to skip the retrieval of DCS values");
+       }
+       else if (fTestMode & kSkipDCS)
        {
                Log(fCurrentDetector, "In TESTMODE - Skipping DCS processing!");
        } 
@@ -1313,72 +1567,62 @@ Bool_t AliShuttle::ProcessCurrentDetector()
                TString host(fConfig->GetDCSHost(fCurrentDetector));
                Int_t port = fConfig->GetDCSPort(fCurrentDetector);
 
-               // Retrieval of Aliases
-               TObjString* anAlias = 0;
-               Int_t iAlias = 1;
-               Int_t nTotAliases= ((TMap*)fConfig->GetDCSAliases(fCurrentDetector))->GetEntries();
-               TIter iterAliases(fConfig->GetDCSAliases(fCurrentDetector));
-               while ((anAlias = (TObjString*) iterAliases.Next()))
+               if (fConfig->GetDCSAliases(fCurrentDetector)->GetEntries() > 0)
                {
-                       TObjArray *valueSet = new TObjArray();
-                       valueSet->SetOwner(1);
-
-                       if (((iAlias-1) % 500) == 0 || iAlias == nTotAliases)
-                               AliInfo(Form("Querying DCS archive: alias %s (%d of %d)",
-                                               anAlias->GetName(), iAlias++, nTotAliases));
-                       aDCSError = (GetValueSet(host, port, anAlias->String(), valueSet, kAlias) == 0);
-
-                       if(!aDCSError)
+                       dcsMap = GetValueSet(host, port, fConfig->GetDCSAliases(fCurrentDetector), kAlias);
+                       if (!dcsMap)
                        {
-                               dcsMap.Add(anAlias->Clone(), valueSet);
-                       } else {
-                               Log(fCurrentDetector,
-                                       Form("ProcessCurrentDetector - Error while retrieving alias %s",
-                                               anAlias->GetName()));
+                               Log(fCurrentDetector, "ProcessCurrentDetector - Error while retrieving DCS aliases");
                                UpdateShuttleStatus(AliShuttleStatus::kDCSError);
-                               dcsMap.DeleteAll();
                                return kFALSE;
                        }
                }
-
-               // Retrieval of Data Points
-               TObjString* aDP = 0;
-               Int_t iDP = 0;
-               Int_t nTotDPs= ((TMap*)fConfig->GetDCSDataPoints(fCurrentDetector))->GetEntries();
-               TIter iterDP(fConfig->GetDCSDataPoints(fCurrentDetector));
-               while ((aDP = (TObjString*) iterDP.Next()))
+               
+               if (fConfig->GetDCSDataPoints(fCurrentDetector)->GetEntries() > 0)
                {
-                       TObjArray *valueSet = new TObjArray();
-                       valueSet->SetOwner(1);
-                       if (((iDP-1) % 500) == 0 || iDP == nTotDPs)
-                               AliInfo(Form("Querying DCS archive: DP %s (%d of %d)",
-                                               aDP->GetName(), iDP++, nTotDPs));
-                       aDCSError = (GetValueSet(host, port, aDP->String(), valueSet, kDP) == 0);
-
-                       if(!aDCSError)
+                       TMap* dcsMap2 = GetValueSet(host, port, fConfig->GetDCSDataPoints(fCurrentDetector), kDP);
+                       if (!dcsMap2)
                        {
-                               dcsMap.Add(aDP->Clone(), valueSet);
-                       } else {
-                               Log(fCurrentDetector,
-                                       Form("ProcessCurrentDetector - Error while retrieving data point %s",
-                                               aDP->GetName()));
+                               Log(fCurrentDetector, "ProcessCurrentDetector - Error while retrieving DCS data points");
                                UpdateShuttleStatus(AliShuttleStatus::kDCSError);
-                               dcsMap.DeleteAll();
+                               if (dcsMap)
+                                       delete dcsMap;
                                return kFALSE;
                        }
+                       
+                       if (!dcsMap)
+                       {
+                               dcsMap = dcsMap2;
+                       }
+                       else // merge
+                       {
+                               TIter iter(dcsMap2);
+                               TObjString* key = 0;
+                               while ((key = (TObjString*) iter.Next()))
+                                       dcsMap->Add(key, dcsMap2->GetValue(key->String()));
+                                       
+                               dcsMap2->SetOwner(kFALSE);
+                               delete dcsMap2;
+                       }
                }
+               
        }
 
+       // still no map?
+       if (!dcsMap)
+               dcsMap = new TMap;
+       
        // DCS Archive DB processing successful. Call Preprocessor!
        UpdateShuttleStatus(AliShuttleStatus::kPPStarted);
 
-       UInt_t returnValue = aPreprocessor->Process(&dcsMap);
+       UInt_t returnValue = aPreprocessor->Process(dcsMap);
 
        if (returnValue > 0) // Preprocessor error!
        {
                Log(fCurrentDetector, Form("Preprocessor failed. Process returned %d.", returnValue));
                UpdateShuttleStatus(AliShuttleStatus::kPPError);
-               dcsMap.DeleteAll();
+               dcsMap->DeleteAll();
+               delete dcsMap;
                return kFALSE;
        }
        
@@ -1387,7 +1631,8 @@ Bool_t AliShuttle::ProcessCurrentDetector()
        Log(fCurrentDetector, Form("ProcessCurrentDetector - %s preprocessor returned success",
                                fCurrentDetector.Data()));
 
-       dcsMap.DeleteAll();
+       dcsMap->DeleteAll();
+       delete dcsMap;
 
        return kTRUE;
 }
@@ -1423,7 +1668,7 @@ Bool_t AliShuttle::QueryShuttleLogbook(const char* whereClause,
        }
 
        // TODO Check field count!
-       const UInt_t nCols = 22;
+       const UInt_t nCols = 23;
        if (aResult->GetFieldCount() != (Int_t) nCols) {
                AliError("Invalid SQL result field number!");
                delete aResult;
@@ -1561,6 +1806,41 @@ Bool_t AliShuttle::GetValueSet(const char* host, Int_t port, const char* entry,
        return kTRUE;
 }
 
+//______________________________________________________________________________________________
+TMap* AliShuttle::GetValueSet(const char* host, Int_t port, const TSeqCollection* entries,
+                             DCSType type)
+{
+       // Retrieve all "entry" data points from the DCS server
+       // host, port: TSocket connection parameters
+       // entries: list of name of the alias or data point
+       // type: kAlias or kDP
+       // returns TMap of values, 0 when failure
+
+       AliDCSClient client(host, port, fTimeout, fRetries);
+
+       TMap* result = 0;
+       if (type == kAlias)
+       {
+               result = client.GetAliasValues(entries, GetCurrentStartTime(), 
+                       GetCurrentEndTime());
+       } 
+       else if (type == kDP)
+       {
+               result = client.GetDPValues(entries, GetCurrentStartTime(), 
+                       GetCurrentEndTime());
+       }
+
+       if (result == 0)
+       {
+               Log(fCurrentDetector.Data(), Form("GetValueSet - Can't get entries! Reason: %s",
+                       client.GetServerError().Data()));
+
+               return 0;
+       }
+               
+       return result;
+}
+
 //______________________________________________________________________________________________
 const char* AliShuttle::GetFile(Int_t system, const char* detector,
                const char* id, const char* source)
@@ -1685,11 +1965,7 @@ const char* AliShuttle::GetFile(Int_t system, const char* detector,
                        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)
                {
@@ -1718,12 +1994,11 @@ const char* AliShuttle::GetFile(Int_t system, const char* detector,
        fFXSlist[system].Add(fileParams);
 
        static TString fullLocalFileName;
-       fullLocalFileName = TString::Format("%s/%s", GetShuttleTempDir(), localFileName.Data());
+       fullLocalFileName.Form("%s/%s", GetShuttleTempDir(), localFileName.Data());
 
-       AliInfo(Form("fullLocalFileName = %s", fullLocalFileName.Data()));
+       Log(fCurrentDetector, Form("GetFile - Retrieved file with id %s and source %s from %s to %s", id, source, GetSystemName(system), fullLocalFileName.Data()));
 
        return fullLocalFileName.Data();
-
 }
 
 //______________________________________________________________________________________________
@@ -1759,7 +2034,7 @@ Bool_t AliShuttle::RetrieveFile(UInt_t system, const char* fxsFileName, const ch
        }
        else if (system == kHLT)
        {
-               baseFXSFolder = "~/";
+               baseFXSFolder = "/opt/FXS/";
        }
 
 
@@ -1784,7 +2059,10 @@ TList* AliShuttle::GetFileSources(Int_t system, const char* detector, const char
 {
        //
        // Get sources producing the condition file Id from file exchange servers
+       // if id is NULL all sources are returned (distinct)
        //
+
+       Log(detector, Form("GetFileSources - Retrieving sources with id %s from %s", id, GetSystemName(system)));
        
        // check if test mode should simulate a FXS error
        if (fTestMode & kErrorFXSSources)
@@ -1793,17 +2071,19 @@ TList* AliShuttle::GetFileSources(Int_t system, const char* detector, const char
                return 0;
        }
 
-
        if (system == kDCS)
        {
-               AliError("DCS system has only one source of data!");
-               return NULL;
+               AliWarning("DCS system has only one source of data!");
+               TList *list = new TList();
+               list->SetOwner(1);
+               list->Add(new TObjString(" "));
+               return list;
        }
 
        // check connection, in case connect
        if (!Connect(system))
        {
-               Log(detector, Form("GetFile - Couldn't connect to %s FXS database", GetSystemName(system)));
+               Log(detector, Form("GetFileSources - Couldn't connect to %s FXS database", GetSystemName(system)));
                return NULL;
        }
 
@@ -1816,9 +2096,11 @@ TList* AliShuttle::GetFileSources(Int_t system, const char* detector, const char
                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 sqlQueryStart = Form("select distinct %s from %s where", sourceName.Data(), fConfig->GetFXSdbTable(system));
+       TString whereClause = Form("run=%d and detector=\"%s\"",
+                               GetCurrentRun(), detector);
+       if (id)
+               whereClause += Form(" and fileId=\"%s\"", id);
        TString sqlQuery = Form("%s %s", sqlQueryStart.Data(), whereClause.Data());
 
        AliDebug(2, Form("SQL query: \n%s",sqlQuery.Data()));
@@ -1832,18 +2114,20 @@ TList* AliShuttle::GetFileSources(Int_t system, const char* detector, const char
                return 0;
        }
 
+       TList *list = new TList();
+       list->SetOwner(1);
+       
        if (aResult->GetRowCount() == 0)
        {
                Log(detector,
                        Form("GetFileSources - No entry in %s FXS table for id: %s", GetSystemName(system), id));
                delete aResult;
-               return 0;
+               return list;
        }
 
-       TSQLRow* aRow;
-       TList *list = new TList();
-       list->SetOwner(1);
+       Log(detector, Form("GetFileSources - Found %d sources", aResult->GetRowCount()));
 
+       TSQLRow* aRow;
        while ((aRow = aResult->Next()))
        {
 
@@ -1858,6 +2142,85 @@ TList* AliShuttle::GetFileSources(Int_t system, const char* detector, const char
        return list;
 }
 
+//______________________________________________________________________________________________
+TList* AliShuttle::GetFileIDs(Int_t system, const char* detector, const char* source)
+{
+       //
+       // Get all ids of condition files produced by a given source from file exchange servers
+       //
+       
+        Log(detector, Form("GetFileIDs - Retrieving ids with source %s with %s", source, GetSystemName(system)));
+
+       // check if test mode should simulate a FXS error
+       if (fTestMode & kErrorFXSSources)
+       {
+               Log(detector, Form("GetFileIDs - In TESTMODE - Simulating error while connecting to %s FXS", GetSystemName(system)));
+               return 0;
+       }
+
+       // check connection, in case connect
+       if (!Connect(system))
+       {
+               Log(detector, Form("GetFileIDs - Couldn't connect to %s FXS database", GetSystemName(system)));
+               return NULL;
+       }
+
+       TString sourceName = 0;
+       if (system == kDAQ)
+       {
+               sourceName = "DAQsource";
+       } else if (system == kHLT)
+       {
+               sourceName = "DDLnumbers";
+       }
+
+       TString sqlQueryStart = Form("select fileId from %s where", fConfig->GetFXSdbTable(system));
+       TString whereClause = Form("run=%d and detector=\"%s\"",
+                               GetCurrentRun(), detector);
+       if (sourceName.Length() > 0 && source)
+               whereClause += Form(" and %s=\"%s\"", sourceName.Data(), source);
+       TString sqlQuery = Form("%s %s", sqlQueryStart.Data(), whereClause.Data());
+
+       AliDebug(2, Form("SQL query: \n%s",sqlQuery.Data()));
+
+       // Query execution
+       TSQLResult* aResult;
+       aResult = fServer[system]->Query(sqlQuery);
+       if (!aResult) {
+               Log(detector, Form("GetFileIDs - Can't execute SQL query to %s database for source: %s",
+                               GetSystemName(system), source));
+               return 0;
+       }
+
+       TList *list = new TList();
+       list->SetOwner(1);
+       
+       if (aResult->GetRowCount() == 0)
+       {
+               Log(detector,
+                       Form("GetFileIDs - No entry in %s FXS table for source: %s", GetSystemName(system), source));
+               delete aResult;
+               return list;
+       }
+
+        Log(detector, Form("GetFileIDs - Found %d ids", aResult->GetRowCount()));
+
+       TSQLRow* aRow;
+
+       while ((aRow = aResult->Next()))
+       {
+
+               TString id(aRow->GetField(0), aRow->GetFieldLength(0));
+               AliDebug(2, Form("fileId = %s", id.Data()));
+               list->Add(new TObjString(id));
+               delete aRow;
+       }
+
+       delete aResult;
+
+       return list;
+}
+
 //______________________________________________________________________________________________
 Bool_t AliShuttle::Connect(Int_t system)
 {
@@ -2162,12 +2525,12 @@ void AliShuttle::Log(const char* detector, const char* message)
        toLog += Form("%s", message);
 
        AliInfo(toLog.Data());
+       
+       // if we redirect the log output already to the file, leave here
+       if (fOutputRedirected && strcmp(detector, "SHUTTLE") != 0)
+               return;
 
-       TString fileName;
-       if (GetCurrentRun() >= 0) 
-               fileName.Form("%s/%s_%d.log", GetShuttleLogDir(), detector, GetCurrentRun());
-       else
-               fileName.Form("%s/%s.log", GetShuttleLogDir(), detector);
+       TString fileName = GetLogFileName(detector);
        
        gSystem->ExpandPathName(fileName);
 
@@ -2184,6 +2547,23 @@ void AliShuttle::Log(const char* detector, const char* message)
        logFile.close();
 }
 
+//______________________________________________________________________________________________
+TString AliShuttle::GetLogFileName(const char* detector) const
+{
+       // 
+       // returns the name of the log file for a given sub detector
+       //
+       
+       TString fileName;
+       
+       if (GetCurrentRun() >= 0) 
+               fileName.Form("%s/%s_%d.log", GetShuttleLogDir(), detector, GetCurrentRun());
+       else
+               fileName.Form("%s/%s.log", GetShuttleLogDir(), detector);
+
+       return fileName;
+}
+
 //______________________________________________________________________________________________
 Bool_t AliShuttle::Collect(Int_t run)
 {
@@ -2425,22 +2805,25 @@ Bool_t AliShuttle::SendMail()
        to.Remove(to.Length()-1);
        AliDebug(2, Form("to: %s",to.Data()));
 
-       // TODO this will be removed...
-       if (to.Contains("not_yet_set")) {
+       if (to.IsNull()) {
                AliInfo("List of detector responsibles not yet set!");
                return kFALSE;
        }
 
        TString cc="alberto.colla@cern.ch";
 
-       TString subject = Form("%s Shuttle preprocessor error in run %d !",
+       TString subject = Form("%s Shuttle preprocessor FAILED in run %d !",
                                fCurrentDetector.Data(), GetCurrentRun());
        AliDebug(2, Form("subject: %s", subject.Data()));
 
        TString body = Form("Dear %s expert(s), \n\n", fCurrentDetector.Data());
        body += Form("SHUTTLE just detected that your preprocessor "
-                       "exited with ERROR state in run %d!!\n\n", GetCurrentRun());
-       body += Form("Please check %s status on the web page asap!\n\n", fCurrentDetector.Data());
+                       "failed processing run %d!!\n\n", GetCurrentRun());
+       body += Form("Please check %s status on the SHUTTLE monitoring page: \n\n", fCurrentDetector.Data());
+       body += Form("\thttp://pcalimonitor.cern.ch:8889/shuttle.jsp?time=168 \n\n");
+       body += Form("Find the %s log for the current run on \n\n"
+               "\thttp://pcalishuttle01.cern.ch:8880/logs/%s_%d.log \n\n", 
+               fCurrentDetector.Data(), fCurrentDetector.Data(), GetCurrentRun());
        body += Form("The last 10 lines of %s log file are following:\n\n");
 
        AliDebug(2, Form("Body begin: %s", body.Data()));
@@ -2459,7 +2842,7 @@ Bool_t AliShuttle::SendMail()
        TString endBody = Form("------------------------------------------------------\n\n");
        endBody += Form("In case of problems please contact the SHUTTLE core team.\n\n");
        endBody += "Please do not answer this message directly, it is automatically generated.\n\n";
-       endBody += "Sincerely yours,\n\n \t\t\tthe SHUTTLE\n";
+       endBody += "Greetings,\n\n \t\t\tthe SHUTTLE\n";
 
        AliDebug(2, Form("Body end: %s", endBody.Data()));
 
@@ -2495,6 +2878,24 @@ const char* AliShuttle::GetRunType()
        return fLogbookEntry->GetRunType();
 }
 
+//______________________________________________________________________________________________
+Bool_t AliShuttle::GetHLTStatus()
+{
+       // Return HLT status (ON=1 OFF=0)
+       // Converts the HLT status from the status string read in the run logbook (not just a bool)
+
+       if(!fLogbookEntry) {
+               AliError("No logbook entry!");
+               return 0;
+       }
+
+       // TODO implement when HLTStatus is inserted in run logbook
+       //TString hltStatus = fLogbookEntry->GetRunParameter("HLTStatus");
+       //if(hltStatus == "OFF") {return kFALSE};
+
+       return kTRUE;
+}
+
 //______________________________________________________________________________________________
 void AliShuttle::SetShuttleTempDir(const char* tmpDir)
 {