fixes for alignment matrices

diff --git a/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterizeFast.cxx b/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterizeFast.cxx
index ad6911dcf1e0ce646140b746afb4123dde0239c9..649954fb3cad679766b15225ce2ce249625bb49a 100644 (file)
--- a/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterizeFast.cxx
+++ b/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterizeFast.cxx
@@ -434,7 +434,7 @@ void AliAnalysisTaskEMCALClusterizeFast::Init()
     } else { // get matrix from file (work around bug in aliroot)
       for(Int_t mod=0; mod < geometry->GetEMCGeometry()->GetNumberOfSuperModules(); ++mod) {
         const TGeoHMatrix *gm = 0;
-        AliESDEvent *esdevent = dynamic_cast<AliESDEvent*>(event->GetHeader());
+        AliESDEvent *esdevent = dynamic_cast<AliESDEvent*>(event);
         if (esdevent) {
           gm = esdevent->GetEMCALMatrix(mod);
         } else {
@@ -482,7 +482,6 @@ void AliAnalysisTaskEMCALClusterizeFast::Init()
     if (fRun!=cdb->GetRun())
       cdb->SetRun(fRun);
   }
-
   if (!fCalibData&&fLoadCalib) {
     AliCDBEntry *entry = static_cast<AliCDBEntry*>(AliCDBManager::Instance()->Get("EMCAL/Calib/Data"));
     if (entry) 
@@ -498,10 +497,10 @@ void AliAnalysisTaskEMCALClusterizeFast::Init()
   if (fCalibData) {
     fClusterizer->SetInputCalibrated(kFALSE);   
     fClusterizer->SetCalibrationParameters(fCalibData);
-    fClusterizer->SetCaloCalibPedestal(fPedestalData);
   } else {
     fClusterizer->SetInputCalibrated(kTRUE);   
   }
+  fClusterizer->SetCaloCalibPedestal(fPedestalData);
   fClusterizer->SetJustClusters(kTRUE);
   fClusterizer->SetDigitsArr(fDigitsArr);
   fClusterizer->SetOutput(0);