Inserting TMath.h where required by the new version of ROOT

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

diff --git a/EMCAL/AliEMCALLoader.cxx b/EMCAL/AliEMCALLoader.cxx
index 3d4320bed1be8c5a7fd6b34f831987561fdca2e5..228af6008f87b40381228f5cf91c86278dc9d237 100644 (file)
--- a/EMCAL/AliEMCALLoader.cxx
+++ b/EMCAL/AliEMCALLoader.cxx
@@ -39,9 +39,8 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 
-
 // --- ROOT system ---
-
+#include "TMath.h"
 #include "TTree.h"
 
 // --- Standard library ---
@@ -52,15 +51,23 @@
 #include "AliCDBLocal.h"
 #include "AliCDBStorage.h"
 #include "AliCDBManager.h"
+#include "AliEMCALHit.h"
 
 ClassImp(AliEMCALLoader)
   
 const TString AliEMCALLoader::fgkECARecPointsBranchName("EMCALECARP");//Name for branch with ECA Reconstructed Points
-AliEMCALCalibData* AliEMCALLoader::fCalibData = 0; //calibation data
+AliEMCALCalibData* AliEMCALLoader::fgCalibData = 0; //calibation data
 
 //____________________________________________________________________________ 
 AliEMCALLoader::AliEMCALLoader()
+  : fDebug(0),
+    fHits(0),
+    fDigits(0),
+    fSDigits(0),
+    fRecPoints(0)
 {
+  //Default constructor for EMCAL Loader Class
+
   fDebug = 0;
   fHits = new TClonesArray("AliEMCALHit");
   fDigits = new TClonesArray("AliEMCALDigit");
@@ -69,9 +76,16 @@ AliEMCALLoader::AliEMCALLoader()
 }
 
 //____________________________________________________________________________ 
-AliEMCALLoader::AliEMCALLoader(const Char_t *detname,const Char_t *eventfoldername):
-  AliLoader(detname,eventfoldername)
+AliEMCALLoader::AliEMCALLoader(const Char_t *detname,const Char_t *eventfoldername)
+  : AliLoader(detname,eventfoldername),
+    fDebug(0),
+    fHits(0),
+    fDigits(0),
+    fSDigits(0),
+    fRecPoints(0)
 {
+  //Specific constructor for EMCAL Loader class
+
   fDebug=0;
   fHits = new TClonesArray("AliEMCALHit");
   fDigits = new TClonesArray("AliEMCALDigit");
@@ -79,6 +93,18 @@ AliEMCALLoader::AliEMCALLoader(const Char_t *detname,const Char_t *eventfolderna
   fRecPoints = new TObjArray();
 }
 
+//____________________________________________________________________________
+AliEMCALLoader::AliEMCALLoader(const AliEMCALLoader & obj)
+  : AliLoader(obj),
+    fDebug(obj.fDebug),
+    fHits(obj.fHits),
+    fDigits(obj.fDigits),
+    fSDigits(obj.fSDigits),
+    fRecPoints(obj.fRecPoints)
+{
+  //copy ctor
+}
+
 //____________________________________________________________________________ 
 AliEMCALLoader::~AliEMCALLoader()
 {
@@ -91,7 +117,10 @@ AliEMCALLoader::~AliEMCALLoader()
     TreeS()->SetBranchAddress(fDetectorName,0);
   if (TreeR())
     TreeR()->SetBranchAddress(fgkECARecPointsBranchName,0);
-  delete fHits;
+  if (fHits) {
+    fHits->Delete();
+    delete fHits;
+  }
   delete fDigits;
   delete fSDigits;
   delete fRecPoints;
@@ -100,16 +129,13 @@ AliEMCALLoader::~AliEMCALLoader()
 //____________________________________________________________________________ 
 AliEMCALCalibData* AliEMCALLoader::CalibData()
 { 
-  //Get the Calibration data list
-
-  if( !(AliCDBManager::Instance()->IsDefaultStorageSet()) ) {
-    fCalibData=0x0;
-    Warning("CalibData","Calibration DB is not initiated!");
-    return fCalibData;
-  }
-
- return fCalibData;
+  // Check if the instance of AliEMCALCalibData exists, and return it
 
+  if( !(AliCDBManager::Instance()->IsDefaultStorageSet()) ) 
+    fgCalibData=0x0;
+  
+  return fgCalibData;
+  
 }
 
 //____________________________________________________________________________ 
@@ -129,8 +155,8 @@ Int_t AliEMCALLoader::CalibrateRaw(Double_t energy, Int_t module,
   if (CalibData() == 0)
     Warning("CalibrateRaw","Calibration DB is not initiated!");
 
-  Float_t gainFactor = 0.0015; // width of one ADC channel in GeV
-  Float_t pedestal   = 0.005;  // pedestals
+  Float_t gainFactor = 0.00305;//0.0015; // width of one ADC channel in GeV
+  Float_t pedestal   = 0.009;//0.005;  // pedestals
 
   if(CalibData()) {
     gainFactor = CalibData()->GetADCchannel (module,column,row);
@@ -141,42 +167,83 @@ Int_t AliEMCALLoader::CalibrateRaw(Double_t energy, Int_t module,
   return amp;
 }
 
-
 //____________________________________________________________________________ 
-Int_t AliEMCALLoader::GetEvent() {
-  AliLoader::GetEvent();  // First call AliLoader to do all the groundwork
+Int_t AliEMCALLoader::GetEvent() 
+{
+  //Method to load all of the data
+  //members of the EMCAL for a given
+  //event from the Trees
 
+  AliLoader::GetEvent();  // First call AliLoader to do all the groundwork
+  
   // Now connect and fill TClonesArray
 
   // Hits
-  TTree *treeH = TreeH();
-  if (treeH) {
-    treeH->SetBranchAddress(fDetectorName,&fHits);
-    if (treeH->GetEntries() > 1)
-      AliWarning("Multiple arrays in treeH no longer supported");
-    treeH->GetEvent(0);
-  }
-
-  // SDigits
-  TTree *treeS = TreeS();
-  if (treeS) {
-    treeS->SetBranchAddress(fDetectorName,&fSDigits);
-    treeS->GetEvent(0);
-  }
-
-  // Digits
-  TTree *treeD = TreeD();
-  if (treeD) {
-    treeD->SetBranchAddress(fDetectorName,&fDigits);
-    treeD->GetEvent(0);
-  }
-
-  // RecPoints
-  TTree *treeR = TreeR();
-  if (treeR) {
-    treeR->SetBranchAddress(fgkECARecPointsBranchName,&fRecPoints);
-    treeR->GetEvent(0);
-  }
-
-  return 0;
+   TTree *treeH = TreeH();
+   
+   if (treeH) {
+     Int_t nEnt = treeH->GetEntries();  // TreeH has array of hits for every primary
+     fHits->Clear();
+     Int_t index = 0;
+     TClonesArray *tempArr = 0x0;
+     TBranch * branchH = treeH->GetBranch(fDetectorName);
+     branchH->SetAddress(&tempArr);
+     for (Int_t iEnt = 0; iEnt < nEnt; iEnt++) {
+       treeH->GetEntry(iEnt);
+       Int_t nHit = tempArr->GetEntriesFast();
+       for (Int_t iHit = 0; iHit < nHit; iHit++) {
+        new ((*fHits)[index]) AliEMCALHit(*((AliEMCALHit*)tempArr->At(iHit)));
+        index++;
+       }
+     }
+     branchH->ResetAddress();
+     if (tempArr) {
+       tempArr->Delete();
+       delete tempArr;
+     }
+   }
+  
+   // SDigits
+   TTree *treeS = TreeS();
+   if (treeS) {
+     TBranch * branchS = treeS->GetBranch(fDetectorName);
+     branchS->ResetAddress();
+     if (fSDigits) {
+       fSDigits->Delete();
+       delete fSDigits;
+       fSDigits = 0x0;
+     }
+     branchS->SetAddress(&fSDigits);
+     treeS->GetEvent(0);
+   }
+   
+   // Digits
+   TTree *treeD = TreeD();
+   if (treeD) {
+     TBranch * branchD = treeD->GetBranch(fDetectorName);
+     branchD->ResetAddress();
+     if (fDigits) {
+       fDigits->Delete();
+       delete fDigits;
+       fDigits = 0x0;
+     }
+     branchD->SetAddress(&fDigits);
+     treeD->GetEvent(0);
+   }
+
+   // RecPoints
+   TTree *treeR = TreeR();
+   if (treeR) {
+     TBranch * branchR = treeR->GetBranch(fgkECARecPointsBranchName);
+     branchR->ResetAddress();
+     if (fRecPoints) {
+       fRecPoints->Delete();
+       delete fRecPoints;
+       fRecPoints = 0x0;
+     }
+     branchR->SetAddress(&fRecPoints);
+     treeR->GetEvent(0);
+   }
+   
+   return 0;
 }