New methods and data member added by M. Horner.

diff --git a/EMCAL/AliEMCALHadronCorrectionv1.cxx b/EMCAL/AliEMCALHadronCorrectionv1.cxx
index 5abd87f39e3e29013fda39c6caf6bd6a665deac7..d5cafcd20843c85ba55dc5a6a65d0900207fbfeb 100755 (executable)
--- a/EMCAL/AliEMCALHadronCorrectionv1.cxx
+++ b/EMCAL/AliEMCALHadronCorrectionv1.cxx
@@ -18,7 +18,7 @@
 
 #include "AliEMCALHadronCorrectionv1.h"
 #include "AliEMCALGeometry.h"
-#include "iostream.h"
+#include "Riostream.h"
 #include "TMath.h"
 static Double_t par_look_up[HCPARAMETERS][HCPARAMETERSETS] = 
 {  
@@ -52,7 +52,7 @@ void AliEMCALHadronCorrectionv1::SetGeometry(AliEMCALGeometry *geometry)
     return;    
 }      
        
-void AliEMCALHadronCorrectionv1::SetGeometry(TString name,Double_t fs = 1.0)
+void AliEMCALHadronCorrectionv1::SetGeometry(TString name,Double_t fs)
 {
   cout << "Setting sampling fraction to "<<fSamplingFraction<<endl;    
    fSamplingFraction = fs;     

diff --git a/EMCAL/AliEMCALHadronCorrectionv1.h b/EMCAL/AliEMCALHadronCorrectionv1.h
index c70c9b5187f5c01eeffc9f3f91a0ddd1bf220b51..1eea00a85a010aa82d66e242b2d149f0da2048c4 100755 (executable)
--- a/EMCAL/AliEMCALHadronCorrectionv1.h
+++ b/EMCAL/AliEMCALHadronCorrectionv1.h
@@ -21,20 +21,23 @@ class AliEMCALHadronCorrectionv1: public AliEMCALHadronCorrection {
     Double_t GetEnergy(const Double_t pmom, const Double_t eta) 
        {return GetEnergy(pmom,eta,7);}
     
-    void SetGeometry(TString name); 
-    void SetGeometry(AliEMCALGeometry *geometry); 
+    void SetGeometry(TString name, Double_t fs = 1.); 
     virtual ~AliEMCALHadronCorrectionv1() {}
  protected:
     AliEMCALHadronCorrectionv1(const char *name="HadronCorrectionv1", const char *title="Hadron Correction");
     
 //    AliEMCALHadronCorrectionv1(const char *name="HadronCorrectionv1", const char *title="Hadron Correction",AliEMCALGeometry *geometry = NULL);
+    void SetGeometry(AliEMCALGeometry *geometry);
+    
  private:
     void SetParameters(TString name = "") {;}
     
     static AliEMCALHadronCorrectionv1* fHadrCorr;
     Double_t fPar[6];
+    Float_t  fSamplingFraction;
+    
     
-    ClassDef(AliEMCALHadronCorrectionv1,1) // Hadron correction for EMC (version for MDC)
+    ClassDef(AliEMCALHadronCorrectionv1,2) // Hadron correction for EMC (version for MDC)
 };
 
 #endif // ALIEMCALHADRONCORRECTIONV1_H