Implemented interface to NxM clusterizer

 - 5x5 can be activated using AliEMCALRecParam::SetClusterizerFlag(AliEMCALRecParam::kClusterizerNxN+1);
   - It would be better to create the corresponding enums in AliEMCALRecParam which I did not dare to do
   - Can be done once we know which version should be run in reco
 - Fixed access to OCDB. Previous versions would always load OCDB objects for run number 0 for the first file
 - Fixed memory lead due to copyously instantiated clusterizer
 - Only set path to OCDB if desired ("raw://" still is default)

diff --git a/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterize.cxx b/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterize.cxx
index 968a53400c2a85c1742fd486553075924aeba280..0618e489190fe4eb9e39e48298b28d1c5e441a3b 100644 (file)
--- a/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterize.cxx
+++ b/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterize.cxx
@@ -66,6 +66,7 @@ AliAnalysisTaskEMCALClusterize::AliAnalysisTaskEMCALClusterize(const char *name)
   , fDigitsArr(0),       fClusterArr(0),       fCaloClusterArr(0)
   , fRecParam(0),        fClusterizer(0),      fUnfolder(0),           fJustUnfold(kFALSE) 
   , fOutputAODBranch(0), fOutputAODBranchName("newEMCALClusters"),     fFillAODFile(kTRUE)
+  , fRun(-1)
   
   {
   //ctor
@@ -74,7 +75,7 @@ AliAnalysisTaskEMCALClusterize::AliAnalysisTaskEMCALClusterize(const char *name)
   fClusterArr      = new TObjArray(100);
   fCaloClusterArr  = new TObjArray(100);
   fRecParam        = new AliEMCALRecParam;
-  fBranchNames="ESD:EMCALCells.";
+  fBranchNames="ESD:AliESDHeader.,EMCALCells.";
 }
 
 //________________________________________________________________________
@@ -85,6 +86,7 @@ AliAnalysisTaskEMCALClusterize::AliAnalysisTaskEMCALClusterize()
   , fDigitsArr(0),       fClusterArr(0),       fCaloClusterArr(0)
   , fRecParam(0),        fClusterizer(0),      fUnfolder(0),           fJustUnfold(kFALSE)
   , fOutputAODBranch(0), fOutputAODBranchName("newEMCALClusters"),     fFillAODFile(kFALSE)
+  , fRun(-1)
 {
   // Constructor
   for(Int_t i = 0; i < 10; i++) fGeomMatrix[i] = 0 ;
@@ -92,7 +94,7 @@ AliAnalysisTaskEMCALClusterize::AliAnalysisTaskEMCALClusterize()
   fClusterArr      = new TObjArray(100);
   fCaloClusterArr  = new TObjArray(100);
   fRecParam        = new AliEMCALRecParam;
-  fBranchNames="ESD:EMCALCells.";
+  fBranchNames="ESD:AliESDHeader.,EMCALCells.";
 }
 
 //________________________________________________________________________
@@ -116,9 +118,7 @@ AliAnalysisTaskEMCALClusterize::~AliAnalysisTaskEMCALClusterize()
   }
 
   if(fClusterizer) {delete fClusterizer;}
-  if(fGeom)        {delete fGeom;       }
   if(fUnfolder)    {delete fUnfolder;   }
-
 }
 
 //-------------------------------------------------------------------
@@ -152,6 +152,8 @@ void AliAnalysisTaskEMCALClusterize::UserExec(Option_t *)
   //Magic line to write events to AOD file
   AliAnalysisManager::GetAnalysisManager()->GetOutputEventHandler()->SetFillAOD(fFillAODFile);
   LoadBranches();
+  
+  AccessOCDB();
 
   //-------------------------------------------------------------------------------------
   //Set the geometry matrix, for the first event, skip the rest
@@ -320,58 +322,62 @@ void AliAnalysisTaskEMCALClusterize::UserExec(Option_t *)
 }      
 
 //_____________________________________________________________________
-Bool_t AliAnalysisTaskEMCALClusterize::UserNotify()
+Bool_t AliAnalysisTaskEMCALClusterize::AccessOCDB()
 {
   //Access to OCDB stuff
-  if(DebugLevel() > 1 )
-    Info("UserNotify()"," Begin");
+
   AliVEvent * event = InputEvent();
-  if (event)
+  if (!event)
   {
-    fGeom = AliEMCALGeometry::GetInstance(fGeomName);
-    AliCDBManager *cdb = AliCDBManager::Instance();
+    Warning("AccessODCD","Event not available!!!");
+    return kFALSE;
+  }
+
+  if (event->GetRunNumber()==fRun)
+    return kTRUE;
+  fRun = event->GetRunNumber();
+
+  if(DebugLevel() > 1 )
+    Info("AccessODCD()"," Begin");
+
+  fGeom = AliEMCALGeometry::GetInstance(fGeomName);
+  AliCDBManager *cdb = AliCDBManager::Instance();
+  if (fOCDBpath.Length())
     cdb->SetDefaultStorage(fOCDBpath.Data());
-    cdb->SetRun(event->GetRunNumber());
-    //
-    // EMCAL from RAW OCDB
-    if (fOCDBpath.Contains("alien:"))
-    {
-      cdb->SetSpecificStorage("EMCAL/Calib/Data","alien://Folder=/alice/data/2010/OCDB");
-      cdb->SetSpecificStorage("EMCAL/Calib/Pedestals","alien://Folder=/alice/data/2010/OCDB");
-    }
-    TString path = cdb->GetDefaultStorage()->GetBaseFolder();
-    
-    // init parameters:
-    //Get calibration parameters       
-    if(!fCalibData)
-    {
-      AliCDBEntry *entry = (AliCDBEntry*) 
-           AliCDBManager::Instance()->Get("EMCAL/Calib/Data");
-      if (entry) fCalibData =  (AliEMCALCalibData*) entry->GetObject();
-    }
-    
-    if(!fCalibData)
-      AliFatal("Calibration parameters not found in CDB!");
-    
-    //Get calibration parameters       
-    if(!fPedestalData)
-    {
-      AliCDBEntry *entry = (AliCDBEntry*) 
-           AliCDBManager::Instance()->Get("EMCAL/Calib/Pedestals");
-      if (entry) fPedestalData =  (AliCaloCalibPedestal*) entry->GetObject();
-    }
-    
-    if(!fPedestalData)
-      AliFatal("Dead map not found in CDB!");
+  cdb->SetRun(event->GetRunNumber());
+  //
+  // EMCAL from RAW OCDB
+  if (fOCDBpath.Contains("alien:"))
+  {
+    cdb->SetSpecificStorage("EMCAL/Calib/Data","alien://Folder=/alice/data/2010/OCDB");
+    cdb->SetSpecificStorage("EMCAL/Calib/Pedestals","alien://Folder=/alice/data/2010/OCDB");
+  }
+  TString path = cdb->GetDefaultStorage()->GetBaseFolder();
     
-    //      cout << "[i] Change of run number: " << fAOD->GetRunNumber() << endl;
-    InitClusterization();
+  // init parameters:
+  //Get calibration parameters 
+  if(!fCalibData)
+  {
+    AliCDBEntry *entry = (AliCDBEntry*) 
+      AliCDBManager::Instance()->Get("EMCAL/Calib/Data");
+    if (entry) fCalibData =  (AliEMCALCalibData*) entry->GetObject();
   }
-  else
+  
+  if(!fCalibData)
+    AliFatal("Calibration parameters not found in CDB!");
+    
+  //Get calibration parameters 
+  if(!fPedestalData)
   {
-    Warning("UserNotify","Event not available!!!");
+    AliCDBEntry *entry = (AliCDBEntry*) 
+      AliCDBManager::Instance()->Get("EMCAL/Calib/Pedestals");
+    if (entry) fPedestalData =  (AliCaloCalibPedestal*) entry->GetObject();
   }
+    
+  if(!fPedestalData)
+    AliFatal("Dead map not found in CDB!");
 
+  InitClusterization();
   return kTRUE;
 }
 
@@ -380,48 +386,52 @@ void AliAnalysisTaskEMCALClusterize::InitClusterization()
 {
   //Select clusterization/unfolding algorithm and set all the needed parameters
   
-  if(!fJustUnfold){
-    
-    //First init the clusterizer
-    if     (fRecParam->GetClusterizerFlag() == AliEMCALRecParam::kClusterizerv1)
-      fClusterizer = new AliEMCALClusterizerv1 (fGeom, fCalibData, fPedestalData);
-    else if(fRecParam->GetClusterizerFlag() == AliEMCALRecParam::kClusterizerNxN)
-      fClusterizer = new AliEMCALClusterizerNxN(fGeom, fCalibData, fPedestalData);
-    else{
-      AliFatal(Form("Clusterizer < %d > not available", fRecParam->GetClusterizerFlag()));
-    }
+  if (fJustUnfold){
+    // init the unfolding afterburner 
+    delete fUnfolder;
+    fUnfolder =  new AliEMCALAfterBurnerUF(fRecParam->GetW0(),fRecParam->GetLocMaxCut());
+    return;
+ }
+
+  //First init the clusterizer
+  delete fClusterizer;
+  if     (fRecParam->GetClusterizerFlag() == AliEMCALRecParam::kClusterizerv1)
+    fClusterizer = new AliEMCALClusterizerv1 (fGeom, fCalibData, fPedestalData);
+  else if(fRecParam->GetClusterizerFlag() == AliEMCALRecParam::kClusterizerNxN) 
+    fClusterizer = new AliEMCALClusterizerNxN(fGeom, fCalibData, fPedestalData);
+  else if(fRecParam->GetClusterizerFlag() > AliEMCALRecParam::kClusterizerNxN) {
+   AliEMCALClusterizerNxN *clusterizer = new AliEMCALClusterizerNxN(fGeom, fCalibData, fPedestalData);
+   clusterizer->SetNRowDiff(2);
+   clusterizer->SetNColDiff(2);
+   fClusterizer = clusterizer;
+  } else{
+    AliFatal(Form("Clusterizer < %d > not available", fRecParam->GetClusterizerFlag()));
+  }
     
-    //Now set the parameters
-    fClusterizer->SetECAClusteringThreshold( fRecParam->GetClusteringThreshold() );
-    fClusterizer->SetECALogWeight          ( fRecParam->GetW0()                  );
-    fClusterizer->SetMinECut               ( fRecParam->GetMinECut()             );    
-    fClusterizer->SetUnfolding             ( fRecParam->GetUnfold()              );
-    fClusterizer->SetECALocalMaxCut        ( fRecParam->GetLocMaxCut()           );
-    fClusterizer->SetTimeCut               ( fRecParam->GetTimeCut()             );
-    fClusterizer->SetTimeMin               ( fRecParam->GetTimeMin()             );
-    fClusterizer->SetTimeMax               ( fRecParam->GetTimeMax()             );
-    fClusterizer->SetInputCalibrated       ( kTRUE                               );
+  //Now set the parameters
+  fClusterizer->SetECAClusteringThreshold( fRecParam->GetClusteringThreshold() );
+  fClusterizer->SetECALogWeight          ( fRecParam->GetW0()                  );
+  fClusterizer->SetMinECut               ( fRecParam->GetMinECut()             );    
+  fClusterizer->SetUnfolding             ( fRecParam->GetUnfold()              );
+  fClusterizer->SetECALocalMaxCut        ( fRecParam->GetLocMaxCut()           );
+  fClusterizer->SetTimeCut               ( fRecParam->GetTimeCut()             );
+  fClusterizer->SetTimeMin               ( fRecParam->GetTimeMin()             );
+  fClusterizer->SetTimeMax               ( fRecParam->GetTimeMax()             );
+  fClusterizer->SetInputCalibrated       ( kTRUE                               );
     
-    //In case of unfolding after clusterization is requested, set the corresponding parameters
-    if(fRecParam->GetUnfold()){
-      
-      Int_t i=0;
-      for (i = 0; i < 8; i++) {
-        fClusterizer->SetSSPars(i, fRecParam->GetSSPars(i));
-      }//end of loop over parameters
-      for (i = 0; i < 3; i++) {
-        fClusterizer->SetPar5  (i, fRecParam->GetPar5(i));
-        fClusterizer->SetPar6  (i, fRecParam->GetPar6(i));
-      }//end of loop over parameters
-      
-      fClusterizer->InitClusterUnfolding();
-            
-    }// to unfold
+  //In case of unfolding after clusterization is requested, set the corresponding parameters
+  if(fRecParam->GetUnfold()){
+    Int_t i=0;
+    for (i = 0; i < 8; i++) {
+      fClusterizer->SetSSPars(i, fRecParam->GetSSPars(i));
+    }//end of loop over parameters
+    for (i = 0; i < 3; i++) {
+      fClusterizer->SetPar5  (i, fRecParam->GetPar5(i));
+      fClusterizer->SetPar6  (i, fRecParam->GetPar6(i));
+    }//end of loop over parameters
     
-  }else{
-    //Now init the unfolding afterburner 
-    fUnfolder =  new AliEMCALAfterBurnerUF(fRecParam->GetW0(),fRecParam->GetLocMaxCut());
- }
+    fClusterizer->InitClusterUnfolding();
+  }// to unfold
 }
 
 //________________________________________________________________________________________
@@ -473,13 +483,13 @@ void AliAnalysisTaskEMCALClusterize::RecPoints2Clusters(TClonesArray *digitsArr,
     clus->SetCellsAmplitudeFraction(ratios);
     clus->SetDispersion(recPoint->GetDispersion());
     clus->SetChi2(-1); //not yet implemented
-    clus->SetTOF(recPoint->GetTime()) ; //time-of-fligh
+    clus->SetTOF(recPoint->GetTime()) ; //time-of-flight
     clus->SetNExMax(recPoint->GetNExMax()); //number of local maxima
     Float_t elipAxis[2];
     recPoint->GetElipsAxis(elipAxis);
     clus->SetM02(elipAxis[0]*elipAxis[0]) ;
     clus->SetM20(elipAxis[1]*elipAxis[1]) ;
-
+    clus->SetDistanceToBadChannel(recPoint->GetDistanceToBadTower()); 
     clusArray->Add(clus);
   } // recPoints loop
 }

diff --git a/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterize.h b/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterize.h
index 8c8d8cb71c93961f07a410d31f7e956ac0f19bd3..f2d97acdfc4c6cec3c9d032c407ce0df36266f1e 100644 (file)
--- a/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterize.h
+++ b/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterize.h
@@ -32,7 +32,7 @@ class AliAnalysisTaskEMCALClusterize : public AliAnalysisTaskSE {
  public:\r
   virtual void   UserCreateOutputObjects();\r
   virtual void   UserExec(Option_t *option);\r
-  virtual Bool_t UserNotify();\r
+  Bool_t         AccessOCDB();\r
 \r
   void           SetOCDBPath(const char *path)                  { fOCDBpath = path             ; }\r
   \r
@@ -84,7 +84,7 @@ class AliAnalysisTaskEMCALClusterize : public AliAnalysisTaskSE {
   TString                fOutputAODBranchName;  // New of output AOD branch\r
   Bool_t                 fFillAODFile;      // Fill the output AOD file with the new clusters, \r
                                             // if not they will be only available for the event they were generated\r
-\r
+ Int_t                   fRun;              //!run number\r
   ClassDef(AliAnalysisTaskEMCALClusterize, 1);\r
 };\r
 \r