going from local to alien OCDB

diff --git a/STEER/AliQA.cxx b/STEER/AliQA.cxx
index f38d1d5307d80b68f696c11623095a33ac6129e1..8003da131a7b2722662865b10aa1ec3cac2dd7f8 100644 (file)
--- a/STEER/AliQA.cxx
+++ b/STEER/AliQA.cxx
@@ -62,7 +62,7 @@ const TString AliQA::fkgLabAliEnOCDB     = "alien://" ;
 const TString AliQA::fkgRefFileName      = "QA.root" ; 
 const TString AliQA::fkgQAOCDBDirName    = "QA"  ; 
 const TString AliQA::fkgRefOCDBDirName   = "Ref"  ; 
-const TString AliQA::fkgQARefOCDBDefault = "local://$ALICE_ROOT"  ; 
+const TString AliQA::fkgQARefOCDBDefault = "alien://folder=/alice/"  ; 
 //____________________________________________________________________________
 AliQA::AliQA() : 
   TNamed("", ""), 
@@ -431,19 +431,22 @@ void AliQA::Set(QABIT bit)
 //_____________________________________________________________________________
 void AliQA::SetQARefStorage(const char * name)
 {
-  // Set the root directory where the QA reference data are stored
+       // Set the root directory where the QA reference data are stored
+
+       fgQARefDirName = name ; 
+       if ( fgQARefDirName.Contains(fkgLabLocalFile) )
+               fgQARefFileName =  fkgRefFileName ; 
+       else if ( fgQARefDirName.Contains(fkgLabLocalOCDB) )
+               fgQARefFileName =  fkgQAOCDBDirName ; 
+       else if ( fgQARefDirName.Contains(fkgLabAliEnOCDB) )
+               fgQARefFileName =  fkgQAOCDBDirName ; 
 
-  fgQARefDirName = name ; 
-  if ( fgQARefDirName.Contains(fkgLabLocalFile) )
-        fgQARefFileName =  fkgRefFileName ; 
-  else if (    fgQARefDirName.Contains(fkgLabLocalOCDB) )
-         fgQARefFileName =  fkgQAOCDBDirName ; 
   else {
          printf("ERROR: %s is an invalid storage definition\n", name) ; 
          fgQARefDirName  = "" ; 
          fgQARefFileName = "" ; 
   }    
-       TString tmp(fgQARefDirName + fgQARefFileName) ;
+       TString tmp(fgQARefDirName) ; // + fgQARefFileName) ;
        printf("AliQA::SetQARefDir: QA references are in  %s\n", tmp.Data() ) ;
 }
 

diff --git a/test/cosmic/rawqa.C b/test/cosmic/rawqa.C
index 2d636aada3582919410242148b9567b25f74e2b1..11607eac81960560f5f26181996f882882b9eefa 100644 (file)
--- a/test/cosmic/rawqa.C
+++ b/test/cosmic/rawqa.C
@@ -63,9 +63,9 @@ void rawqa(const Int_t runNumber, const UInt_t kMaxFiles = 10, const char* year
                in.open("tempo.txt", ifstream::in) ; 
 
        AliCDBManager* man = AliCDBManager::Instance();
-       man->SetDefaultStorage("alien://folder=/alice/data/2008/LHC08a/OCDB/"); // AliQA::GetQARefDefaultStorage()
-       AliQA::SetQARefStorage("local://../TestCDB") ; 
-       man->SetSpecificStorage(Form("%s/*", AliQA::GetQAOCDBDirName()), AliQA::GetQARefStorage());
+       man->SetDefaultStorage(AliQA::GetQARefDefaultStorage()) ; 
+       AliQA::SetQARefStorage("alien://folder=/alice/QA/2008") ; 
+       man->SetSpecificStorage(Form("%s/20%s/*", AliQA::GetQAOCDBDirName(), year),AliQA::GetQARefStorage());
        AliQADataMakerSteer qas ; 
        TString detectors  = ""; 
        TString detectorsW = "";