final geometry and cleanup

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

diff --git a/EMCAL/AliEMCALJetFinder.cxx b/EMCAL/AliEMCALJetFinder.cxx
index b5c6718f5a754cf828281091f27e38b12daee7af..52d87b0c081a5bed8cf156d78c8112ee9cf7b566 100644 (file)
--- a/EMCAL/AliEMCALJetFinder.cxx
+++ b/EMCAL/AliEMCALJetFinder.cxx
@@ -1072,12 +1072,8 @@ void AliEMCALJetFinder::FillFromDigits(Int_t flag)
     nbytes += branchDr->GetEntry(0);
 //
 //  Get digitizer parameters
-    Float_t preADCped = digr->GetPREpedestal();
-    Float_t preADCcha = digr->GetPREchannel();
     Float_t ecADCped  = digr->GetECApedestal();
     Float_t ecADCcha  = digr->GetECAchannel();
-    Float_t hcADCped  = digr->GetHCApedestal();
-    Float_t hcADCcha  = digr->GetHCAchannel();
 
     AliEMCAL* pEMCAL = (AliEMCAL*) gAlice->GetModule("EMCAL");
     AliEMCALGeometry* geom = 
@@ -1085,8 +1081,8 @@ void AliEMCALJetFinder::FillFromDigits(Int_t flag)
     
     if (fDebug) {
        Int_t   ndig = digs->GetEntries();
-       Info("FillFromDigits","Number of Digits: %d %d\n Parameters: PRE : %f %f EC: %f %f HC: %f %f\n Geometry: %d %d", 
-            ndig, nent, preADCped, preADCcha, ecADCped, ecADCcha, hcADCped, hcADCcha, geom->GetNEta(), geom->GetNPhi());
+               Info("FillFromDigits","Number of Digits: %d %d\n Parameters: EC: %f %f\n Geometry: %d %d", 
+            ndig, nent, ecADCped, ecADCcha, geom->GetNEta(), geom->GetNPhi());
     }
     
 //
@@ -1097,18 +1093,10 @@ void AliEMCALJetFinder::FillFromDigits(Int_t flag)
     {
        Double_t pedestal = 0.;
        Double_t channel  = 0.;
-       if (geom->IsInPRE(sdg->GetId())) {
-         pedestal = preADCped;
-         channel  = preADCcha; 
-       } 
-       else if (geom->IsInECA(sdg->GetId()))  {
+       if (geom->IsInECA(sdg->GetId()))  {
          pedestal = ecADCped;
          channel  = ecADCcha; 
-       }
-       else if (geom->IsInHCA(sdg->GetId()))  {
-         pedestal = hcADCped;
-         channel  = hcADCcha; 
-       }
+               }
        else 
          Fatal("FillFromDigits", "unexpected digit is number!") ;