Move pad planes from AliTRDCommomParam to AliTRDgeometry

[u/mrichter/AliRoot.git] / PMD / AliPMDClusterFinder.cxx

diff --git a/PMD/AliPMDClusterFinder.cxx b/PMD/AliPMDClusterFinder.cxx
index 3f30b50037efcb13984ed3b5cb30edf05d288dff..cc5ed7d57ecae870a62481ec99510dd69701ea0c 100644 (file)
--- a/PMD/AliPMDClusterFinder.cxx
+++ b/PMD/AliPMDClusterFinder.cxx
@@ -279,30 +279,12 @@ void AliPMDClusterFinder::Digits2RecPoints(TTree *digitsTree,
 
   pmdclust->SetEdepCut(fEcut);
 
-/*
-  fRunLoader->GetEvent(ievt);
-  fTreeD = fPMDLoader->TreeD();
-  if (fTreeD == 0x0)
-    {
-      AliFatal("AliPMDClusterFinder: Can not get TreeD");
-    }
-*/
-
   AliPMDdigit  *pmddigit;
   TBranch *branch = digitsTree->GetBranch("PMDDigit");
   branch->SetAddress(&fDigits);
 
   ResetRecpoint();
 
-/*
-  fTreeR = fPMDLoader->TreeR();
-  if (fTreeR == 0x0)
-    {
-      fPMDLoader->MakeTree("R");
-      fTreeR = fPMDLoader->TreeR();
-    }
-*/
-
   Int_t bufsize = 16000;
   TBranch * branch1 = clustersTree->Branch("PMDRecpoint", &fRecpoints, bufsize); 
   TBranch * branch2 = clustersTree->Branch("PMDRechit", &fRechits, bufsize); 
@@ -374,8 +356,6 @@ void AliPMDClusterFinder::Digits2RecPoints(TTree *digitsTree,
     } // modules
 
   ResetCellADC();
-  fPMDLoader = fRunLoader->GetLoader("PMDLoader");  
-  fPMDLoader->WriteRecPoints("OVERWRITE");
 
   //   delete the pointers
   delete pmdclust;
@@ -937,23 +917,12 @@ AliPMDCalibData* AliPMDClusterFinder::GetCalibData() const
   // Added by ZA
   AliCDBEntry  *entry = AliCDBManager::Instance()->Get("PMD/Calib/Data");
   
-  if(!entry){
-    AliWarning("Calibration object retrieval failed! Dummy calibration will be used.");
-    
-    // this just remembers the actual default storage. No problem if it is null.
-    AliCDBStorage *origStorage = AliCDBManager::Instance()->GetDefaultStorage();
-    AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
-    
-    entry = AliCDBManager::Instance()->Get("PMD/Calib/Data");
-    
-    // now reset the original default storage to AliCDBManager...
-    AliCDBManager::Instance()->SetDefaultStorage(origStorage);  
-  }
+  if(!entry)  AliFatal("Calibration object retrieval failed! ");
   
   AliPMDCalibData *calibdata=0;
   if (entry) calibdata = (AliPMDCalibData*) entry->GetObject();
   
-  if (!calibdata)  AliError("No calibration data from calibration database !");
+  if (!calibdata)  AliFatal("No calibration data from calibration database !");
   
   return calibdata;
 }