Updates by M. Horner and J. Klay

diff --git a/EMCAL/AliEMCALHadronCorrectionv1.cxx b/EMCAL/AliEMCALHadronCorrectionv1.cxx
index e81b55d59e9da2b02012a823aacc43bea42e826e..5abd87f39e3e29013fda39c6caf6bd6a665deac7 100755 (executable)
--- a/EMCAL/AliEMCALHadronCorrectionv1.cxx
+++ b/EMCAL/AliEMCALHadronCorrectionv1.cxx
@@ -18,14 +18,16 @@
 
 #include "AliEMCALHadronCorrectionv1.h"
 #include "AliEMCALGeometry.h"
 
 #include "AliEMCALHadronCorrectionv1.h"
 #include "AliEMCALGeometry.h"

+#include "iostream.h"
+#include "TMath.h"

 static Double_t par_look_up[HCPARAMETERS][HCPARAMETERSETS] = 
 {  
 static Double_t par_look_up[HCPARAMETERS][HCPARAMETERSETS] = 
 {  

-    {-1.68945e-04 , -1.68945e-04},   
-    { 2.09684e-02 ,  2.09684e-02},   
-    {-1.45683e-04 , -1.45683e-04},   
-    { 6.64803e-03 ,  6.64803e-03},   
-    { 2.00834e-02 ,  2.00834e-02},   
-    { 9.22074e-07 ,  9.22074e-07}
+    {-2.82271e-4 , -2.39954e-4},   
+    {2.50796e-2  , 2.07172e-2},   
+    {1.02861e-3  , 1.48576e-3},   
+    {2.11539e-2  , -1.38473-2},   
+    {2.27003e-2  , 2.78252e-2},   
+    {1.65078e-6  , 1.51821e-6}

 };
 
 
 };
 
 


@@ -39,15 +41,21 @@ void AliEMCALHadronCorrectionv1::SetGeometry(AliEMCALGeometry *geometry)
     if (!geometry)
     {
        SetParameters();
     if (!geometry)
     {
        SetParameters();

+       fSamplingFraction = geometry->GetSampling();
+       cout<<"Setting the sampling fraction to :"<<fSamplingFraction<<endl; 

     }else
     {
         SetParameters(geometry->GetName());
     }else
     {
         SetParameters(geometry->GetName());

+       fSamplingFraction = geometry->GetSampling();
+       cout<<"Setting the sampling fraction to :"<<fSamplingFraction<<endl; 

     }
     return;    
 }      
        
     }
     return;    
 }      
        

-void AliEMCALHadronCorrectionv1::SetGeometry(TString name)
+void AliEMCALHadronCorrectionv1::SetGeometry(TString name,Double_t fs = 1.0)

 {
 {

+  cout << "Setting sampling fraction to "<<fSamplingFraction<<endl;    
+   fSamplingFraction = fs;     

   if ( name == ""              ||
        name == "EMCAL_5655_21" ||
        name == "EMCALArch1a"   ||
   if ( name == ""              ||
        name == "EMCAL_5655_21" ||
        name == "EMCALArch1a"   ||


@@ -55,16 +63,20 @@ void AliEMCALHadronCorrectionv1::SetGeometry(TString name)
        name == "G56_2_55_19"   ||
        name == "G56_2_55_19_104_14" )
   { // set parameters to this hadron correction
        name == "G56_2_55_19"   ||
        name == "G56_2_55_19_104_14" )
   { // set parameters to this hadron correction

+     cout<<"HC parameters!"<<endl;

      for (Int_t i=0;i<6;i++)
      {
           fPar[i] = par_look_up[i][0];  
      for (Int_t i=0;i<6;i++)
      {
           fPar[i] = par_look_up[i][0];  

+          cout <<fPar[i]<<endl;

      }
   }else if( name == "EMCAL_6564_21" ||  
            name == "G65_2_64_19" )
   {      
      }
   }else if( name == "EMCAL_6564_21" ||  
            name == "G65_2_64_19" )
   {      

+      cout<<"HC parameters!"<<endl;

      for (Int_t i=0;i<6;i++)
      {
           fPar[i] = par_look_up[i][1];  
      for (Int_t i=0;i<6;i++)
      {
           fPar[i] = par_look_up[i][1];  

+          cout <<fPar[i]<<endl;

      }
   }else
   {
      }
   }else
   {


@@ -100,8 +112,8 @@ AliEMCALHadronCorrectionv1::Instance()
 Double_t 
 AliEMCALHadronCorrectionv1::GetEnergy(const Double_t pmom,const Double_t eta,const Int_t gid)
 {
 Double_t 
 AliEMCALHadronCorrectionv1::GetEnergy(const Double_t pmom,const Double_t eta,const Int_t gid)
 {

-
-  Double_t value =  fPar[5]*pmom*pmom*pmom+ fPar[0]*pmom*pmom+fPar[1]*pmom +fPar[2]*pmom*eta +fPar[3]*eta + fPar[4];
-  return value;
+  Double_t etai = TMath::Abs(eta); 
+  Double_t value =  fPar[5]*pmom*pmom*pmom+ fPar[0]*pmom*pmom+fPar[1]*pmom +fPar[2]*pmom*etai +fPar[3]*etai + fPar[4];
+  return fSamplingFraction*value;

    
 }
    
 }

diff --git a/EMCAL/AliEMCALParton.cxx b/EMCAL/AliEMCALParton.cxx
index d542c6e8f8cd2cf7622e21ac563a9bc666c4dbc6..5cf41cce5133f61bcc95c1097095cfb349101c34 100644 (file)
--- a/EMCAL/AliEMCALParton.cxx
+++ b/EMCAL/AliEMCALParton.cxx
@@ -16,6 +16,9 @@
 /* $Id:  */
 /*
   $Log$
 /* $Id:  */
 /*
   $Log$

+  Revision 1.3  2003/02/05 17:24:25  morsch
+  Modifiactions by M. Horner.
+

   Revision 1.2  2002/10/14 14:55:35  hristov
   Merging the VirtualMC branch to the main development branch (HEAD)
 
   Revision 1.2  2002/10/14 14:55:35  hristov
   Merging the VirtualMC branch to the main development branch (HEAD)
 


@@ -31,16 +34,17 @@
 
 #include "AliEMCALParton.h"
 #include "Ecommon.h"
 
 #include "AliEMCALParton.h"
 #include "Ecommon.h"

+#include <iostream.h>

 ClassImp(AliEMCALParton)   
     
 //____________________________________________________________________________
 AliEMCALParton::AliEMCALParton()
 {
   // Default constructor
 ClassImp(AliEMCALParton)   
     
 //____________________________________________________________________________
 AliEMCALParton::AliEMCALParton()
 {
   // Default constructor

-  fTrackEnergy = 0;
-  fTrackEta    = 0;
-  fTrackPhi    = 0;
-  fTrackPDG    = 0;
+//  fTrackEnergy = 0;
+//  fTrackEta    = 0;
+//  fTrackPhi    = 0;
+//  fTrackPDG    = 0;

   fNTracks     = 0;
 }
 
   fNTracks     = 0;
 }
 


@@ -50,36 +54,24 @@ AliEMCALParton::AliEMCALParton(Float_t energy, Float_t phi, Float_t eta)
   fEnergy = energy;
   fPhi    = phi;
   fEta    = eta;
   fEnergy = energy;
   fPhi    = phi;
   fEta    = eta;

-  fTrackEnergy = 0;
-  fTrackEta    = 0;
-  fTrackPhi    = 0;
-  fTrackPDG    = 0;
+//  fTrackEnergy = 0;
+//  fTrackEta    = 0;
+//  fTrackPhi    = 0;
+//  fTrackPDG    = 0;

   fNTracks     = 0;
 }
 
 void AliEMCALParton::SetTrackList(Int_t NTracks, Float_t* Energy,  Float_t* Eta, Float_t* Phi, Int_t* PDG)
 {
 
   fNTracks     = 0;
 }
 
 void AliEMCALParton::SetTrackList(Int_t NTracks, Float_t* Energy,  Float_t* Eta, Float_t* Phi, Int_t* PDG)
 {
 

-  if (fNTracks)
-  {
-    delete[] fTrackEnergy;
-    delete[] fTrackEta;
-    delete[] fTrackPhi;
-    delete[] fTrackPDG;
-  }

   fNTracks     = NTracks;
   fNTracks     = NTracks;

-  fTrackEnergy = new Float_t[NTracks];
-  fTrackEta    = new Float_t[NTracks];
-  fTrackPhi    = new Float_t[NTracks];
-  fTrackPDG    = new Int_t[NTracks];
-  

   for (Int_t i=0;i<NTracks;i++)
   {
     fTrackEnergy[i] = Energy[i] ;
     fTrackEta[i]    = Eta[i];
     fTrackPhi[i]    = Phi[i];
     fTrackPDG[i]    = PDG[i];
   for (Int_t i=0;i<NTracks;i++)
   {
     fTrackEnergy[i] = Energy[i] ;
     fTrackEta[i]    = Eta[i];
     fTrackPhi[i]    = Phi[i];
     fTrackPDG[i]    = PDG[i];

-  } 
+  }

 }
 
 void AliEMCALParton::GetTrackList(Float_t* Energy,  Float_t* Eta, Float_t* Phi, Int_t* PDG)
 }
 
 void AliEMCALParton::GetTrackList(Float_t* Energy,  Float_t* Eta, Float_t* Phi, Int_t* PDG)


@@ -99,9 +91,5 @@ void AliEMCALParton::GetTrackList(Float_t* Energy,  Float_t* Eta, Float_t* Phi,
 AliEMCALParton::~AliEMCALParton()
 {
   // Destructor
 AliEMCALParton::~AliEMCALParton()
 {
   // Destructor

-  delete[] fTrackEnergy;
-  delete[] fTrackEta;
-  delete[] fTrackPhi;
-  delete[] fTrackPDG;

   
 }
   
 }

diff --git a/EMCAL/AliEMCALParton.h b/EMCAL/AliEMCALParton.h
index 5345874b525bfc54faf02e04ff85450a917e2eee..9d912216f0e264cacb863c7ebec7e32351f3713f 100644 (file)
--- a/EMCAL/AliEMCALParton.h
+++ b/EMCAL/AliEMCALParton.h
@@ -26,14 +26,14 @@ public:
   
 protected:
   Float_t   fEnergy;   // Jet Energy
   
 protected:
   Float_t   fEnergy;   // Jet Energy

-  Float_t*  fTrackEnergy;  // Jet Tracks Energy
-  Float_t*  fTrackEta;     // Jet Tracks Eta
-  Float_t*  fTrackPhi;     // Jet Tracks Phi
-  Int_t*    fTrackPDG;       // Jet Tracks PDG code
-  Int_t     fNTracks;

   Float_t   fEta;      // Jet Phi
   Float_t   fPhi;      // Jet Eta
   Float_t   fEta;      // Jet Phi
   Float_t   fPhi;      // Jet Eta

-  ClassDef(AliEMCALParton,3) // Jet for EMCAL
+  Int_t     fNTracks;      // Number of tracks 
+  Float_t  fTrackEnergy[1000];  // Jet Tracks Energy
+  Float_t  fTrackEta[1000];     // Jet Tracks Eta
+  Float_t  fTrackPhi[1000];     // Jet Tracks Phi
+  Int_t    fTrackPDG[1000];     // Jet Tracks PDG code
+  ClassDef(AliEMCALParton,4) // Jet for EMCAL

     
 } ;
 
     
 } ;