In case of test setup use configuration data from the $DAQDA_TEST_DIR

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

diff --git a/EMCAL/AliEMCALv1.cxx b/EMCAL/AliEMCALv1.cxx
index 48e3ca0baef48dc21e35e2f91dcc304b28630ecd..6934ce7430237f6cf28e7be80e1724a06eadadf0 100644 (file)
--- a/EMCAL/AliEMCALv1.cxx
+++ b/EMCAL/AliEMCALv1.cxx
@@ -30,8 +30,9 @@
 //  2. Timing signal is collected and added to hit
 
 // --- ROOT system ---
-#include "TParticle.h"
-#include "TVirtualMC.h"
+#include <TClonesArray.h>
+#include <TParticle.h>
+#include <TVirtualMC.h>
 
 // --- Standard library ---
 
@@ -41,27 +42,37 @@
 #include "AliEMCALGeometry.h"
 #include "AliRun.h"
 #include "AliMC.h"
+#include "AliStack.h"
 
 ClassImp(AliEMCALv1)
 
 
 //______________________________________________________________________
-AliEMCALv1::AliEMCALv1():AliEMCALv0(), fCurPrimary(-1), fCurParent(-1), fCurTrack(-1){
-  // ctor
-
+AliEMCALv1::AliEMCALv1()
+  : AliEMCALv0(), 
+    fCurPrimary(-1), 
+    fCurParent(-1), 
+    fCurTrack(-1),
+    fTimeCut(30e-09)
+{
+  // default ctor
 }
 
 //______________________________________________________________________
-AliEMCALv1::AliEMCALv1(const char *name, const char *title):
-    AliEMCALv0(name,title), fCurPrimary(-1), fCurParent(-1), fCurTrack(-1) {
+AliEMCALv1::AliEMCALv1(const char *name, const char *title)
+  : AliEMCALv0(name,title), 
+    fCurPrimary(-1), 
+    fCurParent(-1), 
+    fCurTrack(-1), 
+    fTimeCut(30e-09)
+{
     // Standard Creator.
 
     fHits= new TClonesArray("AliEMCALHit",1000);
-    gAlice->GetMCApp()->AddHitList(fHits);
+    //    gAlice->GetMCApp()->AddHitList(fHits); // 20-dec-04 - advice of Andreas
 
     fNhits = 0;
     fIshunt     =  2; // All hits are associated with particles entering the calorimeter
-    fTimeCut = 30e-09;
 }
 
 //______________________________________________________________________
@@ -104,7 +115,7 @@ void AliEMCALv1::AddHit(Int_t shunt, Int_t primary, Int_t tracknumber, Int_t ipa
        new((*fHits)[fNhits]) AliEMCALHit(*newHit);
        fNhits++;
     } // end if
-
+    
     delete newHit;
 }
 //______________________________________________________________________
@@ -189,19 +200,19 @@ void AliEMCALv1::StepManager(void){
       // Apply Birk's law (copied from G3BIRK)
 
       if (gMC->TrackCharge()!=0) { // Check
-         Float_t BirkC1_mod = 0;
+         Float_t birkC1Mod = 0;
        if (fBirkC0==1){ // Apply correction for higher charge states
          if (TMath::Abs(gMC->TrackCharge())>=2)
-           BirkC1_mod=fBirkC1*7.2/12.6;
+           birkC1Mod=fBirkC1*7.2/12.6;
          else
-           BirkC1_mod=fBirkC1;
+           birkC1Mod=fBirkC1;
        }
        Float_t dedxcm;
        if (gMC->TrackStep()>0) 
          dedxcm=1000.*gMC->Edep()/gMC->TrackStep();
        else
          dedxcm=0;
-       lightYield=lightYield/(1.+BirkC1_mod*dedxcm+fBirkC2*dedxcm*dedxcm);
+       lightYield=lightYield/(1.+birkC1Mod*dedxcm+fBirkC2*dedxcm*dedxcm);
       } 
 
       // use sampling fraction to get original energy --HG
@@ -220,20 +231,21 @@ void AliEMCALv1::RemapTrackHitIDs(Int_t *map) {
   // (Called by AliStack::PurifyKine)
   if (Hits()==0)
     return;
-  TIter hit_it(Hits());
-  Int_t i_hit=0;
-  while (AliEMCALHit *hit=dynamic_cast<AliEMCALHit*>(hit_it()) ) {
+  TIter hitIter(Hits());
+  Int_t iHit=0;
+  while (AliEMCALHit *hit=dynamic_cast<AliEMCALHit*>(hitIter()) ) {
     if (map[hit->GetIparent()]==-99)
-      cout << "Remapping, found -99 for parent id " << hit->GetIparent() << ", " << map[hit->GetIparent()] << ", i_hit " << i_hit << endl;
+      cout << "Remapping, found -99 for parent id " << hit->GetIparent() << ", " << map[hit->GetIparent()] << ", iHit " << iHit << endl;
     hit->SetIparent(map[hit->GetIparent()]);
     if (map[hit->GetPrimary()]==-99)
-      cout << "Remapping, found -99 for primary id " << hit->GetPrimary() << ", " << map[hit->GetPrimary()] << ", i_hit " << i_hit << endl;
+      cout << "Remapping, found -99 for primary id " << hit->GetPrimary() << ", " << map[hit->GetPrimary()] << ", iHit " << iHit << endl;
     hit->SetPrimary(map[hit->GetPrimary()]);
-    i_hit++;
+    iHit++;
   }
 }
 
 void AliEMCALv1::FinishPrimary() {
+  // finish primary
   fCurPrimary=-1;
   fCurParent=-1;
   fCurTrack=-1;