Escape special characters for latex (Diego)

[u/mrichter/AliRoot.git] / PWGPP / AliTaskCDBconnect.cxx

diff --git a/PWGPP/AliTaskCDBconnect.cxx b/PWGPP/AliTaskCDBconnect.cxx
index 03ef97ad8b715ffabfe72a5a0610c8ef925e2aac..30f63d66fb6907d34b084f63c9bc148ab3695d4b 100644 (file)
--- a/PWGPP/AliTaskCDBconnect.cxx
+++ b/PWGPP/AliTaskCDBconnect.cxx
@@ -48,7 +48,6 @@ AliTaskCDBconnect::AliTaskCDBconnect(const char* name, const char *storage, Int_
 // Default constructor
   AliCDBManager *cdb = AliCDBManager::Instance();
   cdb->SetDefaultStorage(storage);
-  cdb->SetRun(run);
   DefineInput (0, TChain::Class());
   if (run>0) InitGRP();
 }
@@ -63,7 +62,10 @@ AliTaskCDBconnect::~AliTaskCDBconnect()
 //______________________________________________________________________________
 void AliTaskCDBconnect::InitGRP()
 {
-// Initialize geometry and mag. field
+  // Initialize geometry and mag. field
+  AliCDBManager *cdb = AliCDBManager::Instance();
+  if (!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("raw://");
+  cdb->SetRun(fRun);
   if (!fGRPManager) fGRPManager = new AliGRPManager();
   AliInfo("AliCDBconnect: #### Loading GRP to init B-field...");
   if(!fGRPManager->ReadGRPEntry()) AliFatal("Cannot get GRP entry"); 
@@ -73,7 +75,7 @@ void AliTaskCDBconnect::InitGRP()
   if (!gGeoManager) {
     AliInfo("AliCDBconnect: #### Loading geometry...");
     AliGeomManager::LoadGeometry("geometry.root");
-    if(!AliGeomManager::ApplyAlignObjsFromCDB("GRP ITS TPC TRD")) AliFatal("Problem with align objects"); 
+    if(!AliGeomManager::ApplyAlignObjsFromCDB("GRP ITS TPC TRD")) AliWarning("Problem with align objects"); 
   }  
 }
 
@@ -85,8 +87,8 @@ void AliTaskCDBconnect::CreateOutputObjects()
   //  try to init before the analysis set
   AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
   if (!mgr) AliFatal("No analysis manager");
-  if ( fRun>0 && mgr->IsProofMode() ) { 
-    // in the proof mode the initialization done in the constructor is not available
+  if ( fRun>0 && !fGRPManager) {
+    // in the proof or plugin mode the initialization done in the constructor is not available
     InitGRP();
   }
   else {
@@ -111,8 +113,13 @@ void AliTaskCDBconnect::Exec(Option_t* /*option*/)
   // Intercept when the run number changed
   if (fRun != run) {
     fRun = run;
-    AliCDBManager *cdb = AliCDBManager::Instance();
-    cdb->SetRun(run);
     InitGRP();
   }
 }
+
+//______________________________________________________________________________
+void AliTaskCDBconnect::SetSpecificStorage(const char* calibType, const char* dbString)
+{
+    AliCDBManager *cdb = AliCDBManager::Instance();
+    cdb->SetSpecificStorage(calibType,dbString);
+ }