Merge branch 'master' into TPCdev

[u/mrichter/AliRoot.git] / ITS / AliITSPlaneEff.cxx

diff --git a/ITS/AliITSPlaneEff.cxx b/ITS/AliITSPlaneEff.cxx
index d47e8a2627cbdbd5c49d93c1deda19c8ae1976c4..4a74d83c46387cb4afa1266cd258a9b6528377e7 100644 (file)
--- a/ITS/AliITSPlaneEff.cxx
+++ b/ITS/AliITSPlaneEff.cxx
@@ -47,7 +47,7 @@ fHis(kFALSE)
     //    none.
     // Return:
     //    a default constructed AliITSPlaneEff class
- InitCDB();
+ //InitCDB();
 }
 //______________________________________________________________________
 AliITSPlaneEff::AliITSPlaneEff(const AliITSPlaneEff &s) : AliPlaneEff(s),
@@ -148,8 +148,8 @@ Double_t AliITSPlaneEff::ErrPlaneEff(Int_t nf,Int_t nt) const{
 if(nf<0 || nt<=0 || nt<nf) {
    AliInfo(Form("AliITSPlaneEff::ErrPlaneEff: nfound= %i, ntried= %i",nf,nt)); 
    return -1.;}
- Double_t err=TMath::Sqrt(nf*(1.-nf/nt));
- return err/=nt;
+ Double_t err=TMath::Sqrt((Double_t)nf*(1.-(Double_t)nf/(Double_t)nt));
+ return err/=(Double_t)nt;
 }
 //______________________________________________________________________
 Int_t AliITSPlaneEff::GetNTracksForGivenEff(Double_t eff, Double_t RelErr) const {
@@ -173,7 +173,7 @@ void AliITSPlaneEff::InitCDB()
 // First check if we have any CDB storage set, because it is used
 // to retrieve the calibration and alignment constants
 
-  if (fInitCDBCalled) return;
+  //if (fInitCDBCalled) return;
   fInitCDBCalled = kTRUE;
 
   AliCDBManager* man = AliCDBManager::Instance();
@@ -192,7 +192,7 @@ void AliITSPlaneEff::InitCDB()
         AliDebug(2, Form("Default CDB storage is set to: %s", fCDBUri.Data()));
         AliDebug(2, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
     } else {
-        fCDBUri="local://$ALICE_ROOT";
+        fCDBUri="local://$ALICE_ROOT/OCDB";
         AliWarning("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
         AliWarning("Default CDB storage not yet set !!!!");
         AliWarning(Form("Setting it now to: %s", fCDBUri.Data()));
@@ -200,7 +200,9 @@ void AliITSPlaneEff::InitCDB()
 
     }
     man->SetDefaultStorage(fCDBUri);
+    man->SetRun(fRunNumber);
   }
+  return;
 }
 //_____________________________________________________________________________
 void AliITSPlaneEff::SetDefaultStorage(const char* uri) {