Formatting changes.

[u/mrichter/AliRoot.git] / EMCAL / AliEMCALClusterizerv1.cxx

diff --git a/EMCAL/AliEMCALClusterizerv1.cxx b/EMCAL/AliEMCALClusterizerv1.cxx
index dce0d2fa9c3b7bfbb2e6b5fa7d7c27ef5c1dfc69..044b6b334dbfc97f051f8ec3878c520f20da8bb5 100644 (file)
--- a/EMCAL/AliEMCALClusterizerv1.cxx
+++ b/EMCAL/AliEMCALClusterizerv1.cxx
@@ -46,22 +46,24 @@
 
 // --- ROOT system ---
 
-#include <TROOT.h>
+class TROOT;
 #include <TH1.h>
 #include <TFile.h> 
-#include <TFolder.h> 
+class TFolder;
 #include <TMath.h> 
 #include <TMinuit.h>
 #include <TTree.h> 
-#include <TSystem.h> 
+class TSystem; 
 #include <TBenchmark.h>
 #include <TBrowser.h>
+
 // --- Standard library ---
 
 
 // --- AliRoot header files ---
 #include "AliRunLoader.h"
 #include "AliRun.h"
+#include "AliESD.h"
 #include "AliEMCALLoader.h"
 #include "AliEMCALClusterizerv1.h"
 #include "AliEMCALRecPoint.h"
@@ -71,7 +73,8 @@
 #include "AliEMCALGeometry.h"
 #include "AliEMCALHistoUtilities.h"
 #include "AliCDBManager.h"
-#include "AliCDBStorage.h"
+
+class AliCDBStorage;
 #include "AliCDBEntry.h"
 
 ClassImp(AliEMCALClusterizerv1)
@@ -248,11 +251,12 @@ Bool_t AliEMCALClusterizerv1::FindFit(AliEMCALRecPoint * emcRP, AliEMCALDigit **
   for(iDigit = 0; iDigit < nDigits; iDigit++){
     digit = maxAt[iDigit]; 
 
-    Int_t relid[2] ;
     Float_t x = 0.;
     Float_t z = 0.;
-    fGeom->AbsToRelNumbering(digit->GetId(), relid) ;
-    fGeom->PosInAlice(relid, x, z) ;
+    //   have to be tune for TRD1; May 31,06
+    //   Int_t relid[2] ;
+    //   fGeom->AbsToRelNumbering(digit->GetId(), relid) ; // obsolete method
+    //   fGeom->PosInAlice(relid, x, z) ;                  // obsolete method
 
     Float_t energy = maxAtEnergy[iDigit] ;
 
@@ -317,10 +321,8 @@ void AliEMCALClusterizerv1::GetCalibrationParameters()
 
   //Check if calibration is stored in data base
    if(AliCDBManager::Instance()->IsDefaultStorageSet()){
-     AliCDBEntry *entry = (AliCDBEntry*) AliCDBManager::Instance()
-       ->GetDefaultStorage()
-       ->Get("EMCAL/GainFactors_and_Pedestals/Calibration",
-            gAlice->GetRunNumber());
+     AliCDBEntry *entry = (AliCDBEntry*) 
+     AliCDBManager::Instance()->Get("EMCAL/Calib/Data");
      if (entry) fCalibData = (AliEMCALCalibData*) entry->GetObject();
    }
    if(!fCalibData)
@@ -554,7 +556,7 @@ void AliEMCALClusterizerv1::MakeClusters(char* option)
        recPoint = dynamic_cast<AliEMCALRecPoint *>(aECARecPoints->At(fNumberOfECAClusters)) ; 
        fNumberOfECAClusters++ ; 
 
-       recPoint->SetClusterType(AliEMCALRecPoint::kPseudoCluster);
+       recPoint->SetClusterType(AliESDCaloCluster::kPseudoCluster);
 
        recPoint->AddDigit(*digit, digit->GetAmp()) ; 
        clusterECAdigitslist[iDigitInECACluster] = digit->GetIndexInList() ;    
@@ -591,7 +593,9 @@ void AliEMCALClusterizerv1::MakeClusters(char* option)
        nextdigit.Reset() ;  // will start from beggining
       }
     }
-    if(recPoint) cout << "cl.e " << recPoint->GetEnergy() << endl; 
+    if(recPoint)
+      AliDebug(1,Form("MakeClusters: cl.e %f \n", recPoint->GetEnergy())); 
+    //if(recPoint) cout << "cl.e " << recPoint->GetEnergy() << endl; 
     delete digitsC ;
   }
 
@@ -613,9 +617,11 @@ void AliEMCALClusterizerv1::MakeClusters(char* option)
     AliEMCALHistoUtilities::FillH1(fHists, 11, e);
     if(e < fMinECut ) digitsC->Remove(digit);
     else              ehs += e;
-  }  
-  cout << " Number of digits " << digits->GetEntries() << " -> (e>" <<fMinECut <<")";
-  cout << digitsC->GetEntries()<< " ehs "<<ehs<<endl; 
+  } 
+  AliDebug(1,Form("MakeClusters: Number of digits %d  -> (e %f), ehs %d\n",
+                 digits->GetEntries(),fMinECut,ehs));
+  //cout << " Number of digits " << digits->GetEntries() << " -> (e>" <<fMinECut <<")";
+  //cout << digitsC->GetEntries()<< " ehs "<<ehs<<endl; 
 
   // Clusterization starts    
   //  cout << "Outer Loop" << endl;
@@ -634,7 +640,7 @@ void AliEMCALClusterizerv1::MakeClusters(char* option)
       recPoint = dynamic_cast<AliEMCALRecPoint *>(aECARecPoints->At(fNumberOfECAClusters)) ; 
       fNumberOfECAClusters++ ; 
 
-      recPoint->SetClusterType(AliEMCALRecPoint::kClusterv1);
+      recPoint->SetClusterType(AliESDCaloCluster::kClusterv1);
 
       recPoint->AddDigit(*digit, Calibrate(digit->GetAmp(), digit->GetId())) ; 
       clusterECAdigitslist[iDigitInECACluster] = digit->GetIndexInList() ;     
@@ -669,8 +675,10 @@ void AliEMCALClusterizerv1::MakeClusters(char* option)
       } // scan over digits already in cluster
       nextdigit.Reset() ;  // will start from beggining
     }
-  } // while digit  
-  if(recPoint) cout << "cl.e " << recPoint->GetEnergy() << endl; 
+  } // while digit 
+  if(recPoint)
+    AliDebug(1,Form("MakeClusters: cl.e %f \n", recPoint->GetEnergy())); 
+  //if(recPoint) cout << "cl.e " << recPoint->GetEnergy() << endl; 
   delete digitsC ;
 
   AliDebug(1,Form("total no of clusters %d from %d digits",fNumberOfECAClusters,digits->GetEntriesFast())); 
@@ -822,6 +830,8 @@ void AliEMCALClusterizerv1::PrintRecPoints(Option_t * option)
 }
 TList* AliEMCALClusterizerv1::BookHists()
 {
+  //set up histograms for monitoring clusterizer performance
+
   gROOT->cd();
 
        fPointE = new TH1F("pointE","point energy", 2000, 0.0, 150.);