remove unnecessary histogram booking, filling, storing; QA classes handle that now

diff --git a/EMCAL/AliEMCALClusterizerv1.cxx b/EMCAL/AliEMCALClusterizerv1.cxx
index 090b8af37eaa14e90233f3c903760d2c57627820..dcd78931caa561f2a320b47609e4f3713aeb301b 100644 (file)
--- a/EMCAL/AliEMCALClusterizerv1.cxx
+++ b/EMCAL/AliEMCALClusterizerv1.cxx
@@ -73,7 +73,8 @@ class TSystem;
 #include "AliEMCALDigitizer.h"
 #include "AliEMCAL.h"
 #include "AliEMCALGeometry.h"
-#include "AliEMCALHistoUtilities.h"
+//JLK
+//#include "AliEMCALHistoUtilities.h"
 #include "AliEMCALRecParam.h"
 #include "AliEMCALReconstructor.h"
 #include "AliCDBManager.h"
@@ -86,9 +87,11 @@ ClassImp(AliEMCALClusterizerv1)
 //____________________________________________________________________________
 AliEMCALClusterizerv1::AliEMCALClusterizerv1()
   : AliEMCALClusterizer(),
-    fHists(0),fPointE(0),fPointL1(0),fPointL2(0),
-    fPointDis(0),fPointMult(0),fDigitAmp(0),fMaxE(0),
-    fMaxL1(0),fMaxL2(0),fMaxDis(0),fGeom(0),
+    //JLK
+    //fHists(0),fPointE(0),fPointL1(0),fPointL2(0),
+    //fPointDis(0),fPointMult(0),fDigitAmp(0),fMaxE(0),
+    //fMaxL1(0),fMaxL2(0),fMaxDis(0),
+    fGeom(0),
     fDefaultInit(kFALSE),
     fToUnfold(kFALSE),
     fNumberOfECAClusters(0),fCalibData(0),
@@ -308,18 +311,6 @@ void AliEMCALClusterizerv1::GetCalibrationParameters()
   if(!fCalibData)
     AliFatal("Calibration parameters not found in CDB!");
  
-  //  Please fix it!! Or better just remove it...
-//    if(!fCalibData)
-//      {
-//        //If calibration is not available use default parameters
-//        //Loader
-//        if ( !emcalLoader->Digitizer() ) 
-//      emcalLoader->LoadDigitizer();
-//        AliEMCALDigitizer * dig = dynamic_cast<AliEMCALDigitizer*>(emcalLoader->Digitizer());
-       
-//        fADCchannelECA   = dig->GetECAchannel() ;
-//        fADCpedestalECA  = dig->GetECApedestal();
-//      }
 }
 
 //____________________________________________________________________________
@@ -339,7 +330,8 @@ void AliEMCALClusterizerv1::Init()
   if(!gMinuit) 
     gMinuit = new TMinuit(100) ;
 
-  fHists = BookHists();
+  //JLK
+  //fHists = BookHists();
 }
 
 //____________________________________________________________________________
@@ -429,8 +421,9 @@ void AliEMCALClusterizerv1::MakeClusters()
 
   while ( (digit = dynamic_cast<AliEMCALDigit *>(nextdigitC())) ) { // clean up digits
     e = Calibrate(digit->GetAmp(), digit->GetId());
-    AliEMCALHistoUtilities::FillH1(fHists, 10, digit->GetAmp());
-    AliEMCALHistoUtilities::FillH1(fHists, 11, e);
+    //JLK
+    //AliEMCALHistoUtilities::FillH1(fHists, 10, digit->GetAmp());
+    //AliEMCALHistoUtilities::FillH1(fHists, 11, e);
     if ( e < fMinECut || digit->GetTimeR() > fTimeCut ) 
       digitsC->Remove(digit);
     else    
@@ -485,6 +478,7 @@ void AliEMCALClusterizerv1::MakeClusters()
   AliDebug(1,Form("total no of clusters %d from %d digits",fNumberOfECAClusters,fDigitsArr->GetEntriesFast())); 
 }
 
+//____________________________________________________________________________
 void AliEMCALClusterizerv1::MakeUnfolding() const
 {
   Fatal("AliEMCALClusterizerv1::MakeUnfolding", "--> Unfolding not implemented") ;
@@ -577,7 +571,8 @@ void AliEMCALClusterizerv1::PrintRecPoints(Option_t * option)
    Float_t maxL2=0; 
    Float_t maxDis=0; 
 
-    AliEMCALHistoUtilities::FillH1(fHists, 12, double(fRecPoints->GetEntries()));
+   //JLK
+   //AliEMCALHistoUtilities::FillH1(fHists, 12, double(fRecPoints->GetEntries()));
 
     for (index = 0 ; index < fRecPoints->GetEntries() ; index++) {
       AliEMCALRecPoint * rp = dynamic_cast<AliEMCALRecPoint * >(fRecPoints->At(index)) ; 
@@ -602,11 +597,12 @@ void AliEMCALClusterizerv1::PrintRecPoints(Option_t * option)
              maxL2=lambda[1];
              maxDis=rp->GetDispersion();
       }
-      fPointE->Fill(rp->GetEnergy());
-      fPointL1->Fill(lambda[0]);
-      fPointL2->Fill(lambda[1]);
-      fPointDis->Fill(rp->GetDispersion());
-      fPointMult->Fill(rp->GetMultiplicity());
+      //JLK
+      //fPointE->Fill(rp->GetEnergy());
+      //fPointL1->Fill(lambda[0]);
+      //fPointL2->Fill(lambda[1]);
+      //fPointDis->Fill(rp->GetDispersion());
+      //fPointMult->Fill(rp->GetMultiplicity());
       ///////////// 
       if(strstr(option,"deb")){ 
         for (Int_t iprimary=0; iprimary<nprimaries; iprimary++) {
@@ -615,15 +611,18 @@ void AliEMCALClusterizerv1::PrintRecPoints(Option_t * option)
       }
     }
 
-      fMaxE->Fill(maxE);
-      fMaxL1->Fill(maxL1);
-      fMaxL2->Fill(maxL2);
-      fMaxDis->Fill(maxDis);
+    //JLK
+    //      fMaxE->Fill(maxE);
+    //  fMaxL1->Fill(maxL1);
+    //  fMaxL2->Fill(maxL2);
+    //  fMaxDis->Fill(maxDis);
 
     if(strstr(option,"deb"))
     printf("\n-----------------------------------------------------------------------\n");
   }
 }
+
+/*
 TList* AliEMCALClusterizerv1::BookHists()
 {
   //set up histograms for monitoring clusterizer performance
@@ -652,21 +651,27 @@ void AliEMCALClusterizerv1::SaveHists(const char *fn)
 {
   AliEMCALHistoUtilities::SaveListOfHists(fHists, fn, kTRUE);
 }
+*/
 
+//___________________________________________________________________
 void  AliEMCALClusterizerv1::PrintRecoInfo()
 {
   printf(" AliEMCALClusterizerv1::PrintRecoInfo() : version %s \n", Version() );
-  TH1F *h = (TH1F*)fHists->At(12);
-  if(h) {
-    printf(" ## Multiplicity of RecPoints ## \n");
-    for(int i=1; i<=h->GetNbinsX(); i++) {
-      int nbin = int((*h)[i]);
-      int mult = int(h->GetBinCenter(i));
-      if(nbin > 0) printf(" %i : %5.5i %6.3f %% \n", mult, nbin, 100.*nbin/h->GetEntries()); 
-    }    
-  }
+  //JLK
+  //TH1F *h = (TH1F*)fHists->At(12);
+  //if(h) {
+  //  printf(" ## Multiplicity of RecPoints ## \n");
+  //  for(int i=1; i<=h->GetNbinsX(); i++) {
+  //    int nbin = int((*h)[i]);
+  //    int mult = int(h->GetBinCenter(i));
+  //    if(nbin > 0) printf(" %i : %5.5i %6.3f %% \n", mult, nbin, 100.*nbin/h->GetEntries()); 
+  //  }    
+  // }
+
 }
 
+/*
+//___________________________________________________________________
 void AliEMCALClusterizerv1::DrawLambdasHists()
 {
   if(fMaxL1) {
@@ -677,3 +682,4 @@ void AliEMCALClusterizerv1::DrawLambdasHists()
     }
   }
 }
+*/

diff --git a/EMCAL/AliEMCALClusterizerv1.h b/EMCAL/AliEMCALClusterizerv1.h
index ef68008651dda54246176319fcd621c1a20b7338..360c71eb3c7b7a0240237ae6dda8cfac0d0715f9 100644 (file)
--- a/EMCAL/AliEMCALClusterizerv1.h
+++ b/EMCAL/AliEMCALClusterizerv1.h
@@ -68,26 +68,30 @@ public:
                                             // Chi^2 of the fit. Should be static to be passes to MINUIT
   virtual const char * Version() const { return "clu-v1" ; }  
  
-  TList* BookHists();
-  void   SaveHists(const char *fn="reco.root");  //*MENU*
+  //JLK
+  //TList* BookHists();
+  //void   SaveHists(const char *fn="reco.root");  //*MENU*
+  //void   DrawLambdasHists();                     //*MENU*
+
   void   PrintRecoInfo();                        //*MENU*
-  void   DrawLambdasHists();                     //*MENU*
+
 protected:
 
   virtual void   MakeClusters();            
-            
+
+  //JLK
 ///////////////////// 
-   TList  *fHists;   //!
-   TH1F* fPointE;    //histogram of point energy
-   TH1F* fPointL1;   //histogram of point L1
-   TH1F* fPointL2;   //histogram of point L2
-   TH1F* fPointDis;  //histogram of point dispersion
-   TH1F* fPointMult; //histogram of point multiplicity
-   TH1F* fDigitAmp;  //histogram of digit ADC Amplitude
-   TH1F* fMaxE;      //histogram of maximum point energy
-   TH1F* fMaxL1;     //histogram of largest (first) of eigenvalue of covariance matrix
-   TH1F* fMaxL2;     //histogram of smalest (second) of eigenvalue of covariace matrix
-   TH1F* fMaxDis;    //histogram of point dispersion
+  // TList  *fHists;   //!
+  // TH1F* fPointE;    //histogram of point energy
+  // TH1F* fPointL1;   //histogram of point L1
+  // TH1F* fPointL2;   //histogram of point L2
+  // TH1F* fPointDis;  //histogram of point dispersion
+  // TH1F* fPointMult; //histogram of point multiplicity
+  // TH1F* fDigitAmp;  //histogram of digit ADC Amplitude
+  // TH1F* fMaxE;      //histogram of maximum point energy
+  // TH1F* fMaxL1;     //histogram of largest (first) of eigenvalue of covariance matrix
+  // TH1F* fMaxL2;     //histogram of smalest (second) of eigenvalue of covariace matrix
+  // TH1F* fMaxDis;    //histogram of point dispersion
 ///////////////////////
 
 
@@ -127,7 +131,9 @@ private:
   Float_t fTimeCut ;                // Maximum time difference between the digits in ont EMC cluster
   Float_t fMinECut;                  // Minimum energy for a digit to be a member of a cluster
 
-  ClassDef(AliEMCALClusterizerv1,6)   // Clusterizer implementation version 1
+  //JLK
+  //ClassDef(AliEMCALClusterizerv1,6)   // Clusterizer implementation version 1
+  ClassDef(AliEMCALClusterizerv1,7)   // Clusterizer implementation version 1
 
 };
 

diff --git a/EMCAL/AliEMCALDigitizer.cxx b/EMCAL/AliEMCALDigitizer.cxx
index 767fdd5cad360a0f59578f3303cbf1fda2dd696f..e8adde378d3db6f7feb521a3c2de9ecaeae2cbe1 100644 (file)
--- a/EMCAL/AliEMCALDigitizer.cxx
+++ b/EMCAL/AliEMCALDigitizer.cxx
@@ -84,7 +84,8 @@
 #include "AliEMCALSDigitizer.h"
 #include "AliEMCALGeometry.h"
 #include "AliEMCALTick.h"
-#include "AliEMCALHistoUtilities.h"
+//JLK
+//#include "AliEMCALHistoUtilities.h"
 
 ClassImp(AliEMCALDigitizer)
 
@@ -112,8 +113,10 @@ AliEMCALDigitizer::AliEMCALDigitizer()
     fEventFolderName(""),
     fFirstEvent(0),
     fLastEvent(0),
-    fControlHists(0),
-    fHists(0),fCalibData(0x0)
+    //JLK
+    //fControlHists(0),
+    //fHists(0),
+    fCalibData(0x0)
 {
   // ctor
   InitParameters() ; 
@@ -143,8 +146,10 @@ AliEMCALDigitizer::AliEMCALDigitizer(TString alirunFileName, TString eventFolder
     fEventFolderName(eventFolderName),
     fFirstEvent(0),
     fLastEvent(0),
-    fControlHists(0),
-    fHists(0),fCalibData(0x0)
+    //JLK
+    //fControlHists(0),
+    //fHists(0),
+    fCalibData(0x0)
 {
   // ctor
   InitParameters() ; 
@@ -175,8 +180,10 @@ AliEMCALDigitizer::AliEMCALDigitizer(const AliEMCALDigitizer & d)
     fEventFolderName(d.fEventFolderName),
     fFirstEvent(d.fFirstEvent),
     fLastEvent(d.fLastEvent),
-    fControlHists(d.fControlHists),
-    fHists(d.fHists),fCalibData(d.fCalibData)
+    //JLK
+    //fControlHists(d.fControlHists),
+    //fHists(d.fHists),
+    fCalibData(d.fCalibData)
 {
   // copyy ctor 
  }
@@ -204,8 +211,10 @@ AliEMCALDigitizer::AliEMCALDigitizer(AliRunDigitizer * rd)
     fEventFolderName(0),
     fFirstEvent(0),
     fLastEvent(0),
-    fControlHists(0),
-    fHists(0),fCalibData(0x0)
+    //JLK
+    //fControlHists(0),
+    //fHists(0),
+    fCalibData(0x0)
 {
   // ctor Init() is called by RunDigitizer
   fManager = rd ; 
@@ -228,7 +237,8 @@ AliEMCALDigitizer::AliEMCALDigitizer(AliRunDigitizer * rd)
   delete [] fInputFileNames ; 
   delete [] fEventNames ; 
 
-  if(fHists) delete fHists;
+  //JLK
+  //if(fHists) delete fHists;
 }
 
 //____________________________________________________________________________
@@ -433,9 +443,10 @@ void AliEMCALDigitizer::Digitize(Int_t event)
   digits->Compress() ;  
   
   Int_t ndigits = digits->GetEntriesFast() ; 
-  
+
+  //JLK
   //Set indexes in list of digits and fill hists.
-  AliEMCALHistoUtilities::FillH1(fHists, 0, Double_t(ndigits));
+  //AliEMCALHistoUtilities::FillH1(fHists, 0, Double_t(ndigits));
   Float_t energy=0., esum=0.;
   for (i = 0 ; i < ndigits ; i++) { 
     digit = dynamic_cast<AliEMCALDigit *>( digits->At(i) ) ; 
@@ -443,16 +454,18 @@ void AliEMCALDigitizer::Digitize(Int_t event)
     energy = sDigitizer->Calibrate(digit->GetAmp()) ;
     esum += energy;
     digit->SetAmp(DigitizeEnergy(energy, digit->GetId()) ) ; // for what ??
-    AliEMCALHistoUtilities::FillH1(fHists, 2, double(digit->GetAmp()));
-    AliEMCALHistoUtilities::FillH1(fHists, 3, double(energy));
-    AliEMCALHistoUtilities::FillH1(fHists, 4, double(digit->GetId()));
+    //JLK
+    //AliEMCALHistoUtilities::FillH1(fHists, 2, double(digit->GetAmp()));
+    //AliEMCALHistoUtilities::FillH1(fHists, 3, double(energy));
+    //AliEMCALHistoUtilities::FillH1(fHists, 4, double(digit->GetId()));
     //    if(digit->GetId() == nEMC) {
     //  printf(" i %i \n", i );
     //  digit->Dump();
     //  assert(0);
     //}
   }
-  AliEMCALHistoUtilities::FillH1(fHists, 1, esum);
+  //JLK
+  //AliEMCALHistoUtilities::FillH1(fHists, 1, esum);
 }
 
 // //_____________________________________________________________________
@@ -640,9 +653,10 @@ void AliEMCALDigitizer::InitParameters()
   fNADCEC          = (Int_t) TMath::Power(2,16) ;  // number of channels in Tower ADC - 65536
 
   fTimeThreshold      = 0.001*10000000 ; // Means 1 MeV in terms of SDigits amplitude ??
+  //JLK
   // hists. for control; no hists on default
-  fControlHists = 0;
-  fHists        = 0;
+  //fControlHists = 0;
+  //fHists        = 0;
 }
 
 //__________________________________________________________________
@@ -848,10 +862,12 @@ void AliEMCALDigitizer::WriteDigits()
 //__________________________________________________________________
 void AliEMCALDigitizer::Browse(TBrowser* b)
 {
-  if(fHists) b->Add(fHists);
+  //JLK
+  //if(fHists) b->Add(fHists);
   TTask::Browse(b);
 }
 
+/*
 //__________________________________________________________________
 TList *AliEMCALDigitizer::BookControlHists(int var)
 { 
@@ -881,3 +897,4 @@ void AliEMCALDigitizer::SaveHists(const char* name, Bool_t kSingleKey, const cha
 {
   AliEMCALHistoUtilities::SaveListOfHists(fHists, name, kSingleKey, opt); 
 }
+*/

diff --git a/EMCAL/AliEMCALDigitizer.h b/EMCAL/AliEMCALDigitizer.h
index 13ab83700bbf78f7c8cef87c54cda9572e30e65a..b85ee6b9ef14bfa8138ec0ac5ab396ce98b4760c 100644 (file)
--- a/EMCAL/AliEMCALDigitizer.h
+++ b/EMCAL/AliEMCALDigitizer.h
@@ -50,12 +50,12 @@ public:
   Float_t GetTimeResolution() const { return fTimeResolution ; }
   Float_t GetECAchannel()     const { return fADCchannelEC ; }
   Float_t GetECApedestal()    const { return fADCpedestalEC ; }
- void   SetEventRange(Int_t first=0, Int_t last=-1) {fFirstEvent=first; fLastEvent=last; }
+  void    SetEventRange(Int_t first=0, Int_t last=-1) {fFirstEvent=first; fLastEvent=last; }
   void    SetDigitThreshold(Float_t EMCThreshold)  {fDigitThreshold = EMCThreshold;}
   void    SetPinNoise(Float_t PinNoise )         {fPinNoise = PinNoise;}
 
   //General
-  Int_t   GetDigitsInRun()  const { return fDigitsInRun; } 
+  Int_t GetDigitsInRun()  const { return fDigitsInRun; } 
   void  MixWith(TString alirunFileName, 
                TString eventFolderName = AliConfig::GetDefaultEventFolderName()) ; // Add another one file to mix
   void  Print(Option_t* option="") const ;
@@ -68,13 +68,14 @@ public:
   }
 
   virtual void Browse(TBrowser* b);
+  //JLK
   // hists
-  void   SetControlHists(Int_t var=0) {fControlHists=var;}
-  Int_t  GetControlHist() const {return fControlHists;}
-  TList *GetListOfHists() {return fHists;}
-  TList* BookControlHists(int var=0);
-  void   SaveHists(const char* name="RF/TRD1/Digitizations/DigiVar?",
-  Bool_t kSingleKey=kTRUE, const char* opt="RECREATE"); // *MENU*
+  //void   SetControlHists(Int_t var=0) {fControlHists=var;}
+  //Int_t  GetControlHist() const {return fControlHists;}
+  //TList *GetListOfHists() {return fHists;}
+  //TList* BookControlHists(int var=0);
+  //void   SaveHists(const char* name="RF/TRD1/Digitizations/DigiVar?",
+  //Bool_t kSingleKey=kTRUE, const char* opt="RECREATE"); // *MENU*
 
 private:
 
@@ -114,12 +115,15 @@ private:
   TString fEventFolderName;         // skowron: name of EFN to read data from in stand alone mode
   Int_t   fFirstEvent;        // first event to process
   Int_t   fLastEvent;         // last  event to process
+  //JLK
   // Control hists
-  Int_t   fControlHists;          //!
-  TList  *fHists;                 //!
+  //Int_t   fControlHists;          //!
+  //TList  *fHists;                 //!
   AliEMCALCalibData * fCalibData; //Calibration data pointer
 
-  ClassDef(AliEMCALDigitizer,6)  // description 
+  //JLK
+  //ClassDef(AliEMCALDigitizer,6)  // description 
+  ClassDef(AliEMCALDigitizer,7)  // description 
 };
 
 

diff --git a/EMCAL/AliEMCALSDigitizer.cxx b/EMCAL/AliEMCALSDigitizer.cxx
index c7b0c17f94f44be7daa97c5d6bb7bf9beef388e1..4c7eb33fe18ef1cb0f75736171e29710521923bf 100644 (file)
--- a/EMCAL/AliEMCALSDigitizer.cxx
+++ b/EMCAL/AliEMCALSDigitizer.cxx
@@ -68,7 +68,8 @@
 #include "AliEMCALHit.h"
 #include "AliEMCALSDigitizer.h"
 #include "AliEMCALGeometry.h"
-#include "AliEMCALHistoUtilities.h"
+//JLK
+//#include "AliEMCALHistoUtilities.h"
 
 ClassImp(AliEMCALSDigitizer)
            
@@ -82,9 +83,10 @@ AliEMCALSDigitizer::AliEMCALSDigitizer()
     fSDigitsInRun(0),
     fFirstEvent(0),
     fLastEvent(0),
-    fSampling(0.),
-    fControlHists(0),
-    fHists(0)
+    fSampling(0.)
+    //JLK 
+    //fControlHists(0),
+    //fHists(0)
 {
   // ctor
   InitParameters();
@@ -101,14 +103,17 @@ AliEMCALSDigitizer::AliEMCALSDigitizer(const char * alirunFileName,
     fSDigitsInRun(0),
     fFirstEvent(0),
     fLastEvent(0),
-    fSampling(0.),
-    fControlHists(1),
-    fHists(0)
+    fSampling(0.)
+    //JLK
+    //fControlHists(1),
+    //fHists(0)
 {
   // ctor
   Init();
   InitParameters() ; 
-  if(fControlHists) BookControlHists(1);
+
+  //JLK
+  //if(fControlHists) BookControlHists(1);
 }
 
 
@@ -124,9 +129,10 @@ AliEMCALSDigitizer::AliEMCALSDigitizer(const AliEMCALSDigitizer & sd)
     fSDigitsInRun(sd.fSDigitsInRun),
     fFirstEvent(sd.fFirstEvent),
     fLastEvent(sd.fLastEvent),
-    fSampling(sd.fSampling),
-    fControlHists(sd.fControlHists),
-    fHists(sd.fHists)
+    fSampling(sd.fSampling)
+    //JLK
+    //fControlHists(sd.fControlHists),
+    //fHists(sd.fHists)
 {
   //cpy ctor 
 }
@@ -303,19 +309,22 @@ void AliEMCALSDigitizer::Exec(Option_t *option)
     nSdigits = sdigits->GetEntriesFast() ;
     fSDigitsInRun += nSdigits ;  
     
-    Double_t e=0.,esum=0.;
-    AliEMCALHistoUtilities::FillH1(fHists, 0, double(sdigits->GetEntriesFast()));
+    //JLK
+    //Double_t e=0.,esum=0.;
+    //AliEMCALHistoUtilities::FillH1(fHists, 0, double(sdigits->GetEntriesFast()));
     for (i = 0 ; i < sdigits->GetEntriesFast() ; i++) { 
       AliEMCALDigit * sdigit = dynamic_cast<AliEMCALDigit *>(sdigits->At(i)) ;
       sdigit->SetIndexInList(i) ;
       
-      AliEMCALHistoUtilities::FillH1(fHists, 2, double(sdigit->GetAmp()));
-      e = double(Calibrate(sdigit->GetAmp()));
-      esum += e;
-      AliEMCALHistoUtilities::FillH1(fHists, 3, e);
-      AliEMCALHistoUtilities::FillH1(fHists, 4, double(sdigit->GetId()));
+      //JLK
+      //AliEMCALHistoUtilities::FillH1(fHists, 2, double(sdigit->GetAmp()));
+      //e = double(Calibrate(sdigit->GetAmp()));
+      //esum += e;
+      //AliEMCALHistoUtilities::FillH1(fHists, 3, e);
+      //AliEMCALHistoUtilities::FillH1(fHists, 4, double(sdigit->GetId()));
     }
-    if(esum>0.) AliEMCALHistoUtilities::FillH1(fHists, 1, esum);
+    //JLK
+    //if(esum>0.) AliEMCALHistoUtilities::FillH1(fHists, 1, esum);
     
     // Now write SDigits    
     
@@ -349,7 +358,6 @@ void AliEMCALSDigitizer::Exec(Option_t *option)
 }
 
 //__________________________________________________________________
-
 Int_t AliEMCALSDigitizer::Digitize(Float_t energy)const {
   // Digitize the energy
     Double_t aSignal = fA + energy*fB;
@@ -403,9 +411,7 @@ Bool_t AliEMCALSDigitizer::operator==( AliEMCALSDigitizer const &sd )const
 void AliEMCALSDigitizer::PrintSDigits(Option_t * option)
 {
   //Prints list of digits produced at the current pass of AliEMCALDigitizer
-  
-  
-  // AliEMCALGetter * gime = AliEMCALGetter::Instance() ; 
+    
   AliEMCALLoader *rl = dynamic_cast<AliEMCALLoader*>(AliRunLoader::GetRunLoader()->GetDetectorLoader("EMCAL"));
   const TClonesArray * sdigits = rl->SDigits() ; 
   
@@ -449,10 +455,12 @@ void AliEMCALSDigitizer::Unload() const
 //____________________________________________________________________________ 
 void AliEMCALSDigitizer::Browse(TBrowser* b)
 {
-  if(fHists) b->Add(fHists);
+  //JLK
+  //if(fHists) b->Add(fHists);
   TTask::Browse(b);
 }
 
+/*
 //____________________________________________________________________________ 
 TList *AliEMCALSDigitizer::BookControlHists(int var)
 { 
@@ -481,3 +489,4 @@ void AliEMCALSDigitizer::SaveHists(const char* name, Bool_t kSingleKey, const ch
 {
   AliEMCALHistoUtilities::SaveListOfHists(fHists, name, kSingleKey, opt); 
 }
+*/

diff --git a/EMCAL/AliEMCALSDigitizer.h b/EMCAL/AliEMCALSDigitizer.h
index 3c6fd6d512180c0f6869693733a1888d7f26b6fe..3d124ba3a7d2528f12f16793b895567319471e3d 100644 (file)
--- a/EMCAL/AliEMCALSDigitizer.h
+++ b/EMCAL/AliEMCALSDigitizer.h
@@ -47,13 +47,14 @@ public:
   const AliEMCALSDigitizer & operator = (const AliEMCALSDigitizer & /*sd*/) {return *this ;}
 
   virtual void Browse(TBrowser* b);
+  //JLK
   // hists
-  void   SetControlHists(Int_t var=0) {fControlHists=var;}
-  Int_t  GetControlHist() const {return fControlHists;}
-  TList *GetListOfHists() {return fHists;}
-  TList* BookControlHists(int var=0);
-  void   SaveHists(const char* name="RF/TRD1/Digitizations/SDigiVar?", 
-  Bool_t kSingleKey=kTRUE, const char* opt="RECREATE"); // *MENU*
+  //void   SetControlHists(Int_t var=0) {fControlHists=var;}
+  //Int_t  GetControlHist() const {return fControlHists;}
+  //TList *GetListOfHists() {return fHists;}
+  //TList* BookControlHists(int var=0);
+  //void   SaveHists(const char* name="RF/TRD1/Digitizations/SDigiVar?", 
+  //Bool_t kSingleKey=kTRUE, const char* opt="RECREATE"); // *MENU*
 
 private:
   void     Init() ;
@@ -72,11 +73,14 @@ private:
   Int_t   fFirstEvent;             // first event to process
   Int_t   fLastEvent;              // last  event to process
   Float_t fSampling;               // See AliEMCALGeometry
+  //JLK
   // Control hists
-  Int_t   fControlHists;          //!
-  TList  *fHists;                 //!
+  //Int_t   fControlHists;          //!
+  //TList  *fHists;                 //!
 
-  ClassDef(AliEMCALSDigitizer,5)  // description 
+  //JLK
+  //ClassDef(AliEMCALSDigitizer,5)  // description 
+  ClassDef(AliEMCALSDigitizer,6)  // description 
 };
 
 #endif // AliEMCALSDigitizer_H