Force header file AliEMCALTriggerTypes.h to be copied to the global include directory...

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

diff --git a/EMCAL/AliEMCALShishKebabTrd1Module.cxx b/EMCAL/AliEMCALShishKebabTrd1Module.cxx
index a55b63529c1a545053512b0e8ec8c711af1e6f12..f797403ef4152a50a0acad4a6699d96907fc9331 100644 (file)
--- a/EMCAL/AliEMCALShishKebabTrd1Module.cxx
+++ b/EMCAL/AliEMCALShishKebabTrd1Module.cxx
@@ -60,9 +60,12 @@ AliEMCALShishKebabTrd1Module::AliEMCALShishKebabTrd1Module(Double_t theta, AliEM
     fORB(), 
     fORT()
 { 
+  // ctor
+  
   TString snam(g->GetName());
   Int_t key=0;
-  if(snam.Contains("FIRSTYEARv1",TString::kIgnoreCase)) key=1;
+  if     (snam.Contains("v1",TString::kIgnoreCase)) key=1; //EMCAL_COMPLETEV1 vs EMCAL_COMPLETEv1 (or other)
+  
   if(GetParameters()) {
     DefineFirstModule(key);
   }
@@ -90,6 +93,9 @@ AliEMCALShishKebabTrd1Module::AliEMCALShishKebabTrd1Module(AliEMCALShishKebabTrd
     fORB(), 
     fORT()
 { 
+  
+  // ctor
+  
   //  printf("** Left Neighbor : %s **\n", leftNeighbor.GetName());
   fTheta  = leftNeighbor.GetTheta() - fgangle; 
 
@@ -117,7 +123,8 @@ AliEMCALShishKebabTrd1Module::AliEMCALShishKebabTrd1Module(const AliEMCALShishKe
     fORB(mod.fORB),
     fORT(mod.fORT)
 {
-  //copy ctor
+  // copy ctor
+  
   for (Int_t i=0; i<3; i++) fOK3X3[i] = mod.fOK3X3[i];
 }
 
@@ -151,7 +158,7 @@ void AliEMCALShishKebabTrd1Module::Init(Double_t A, Double_t B)
 }
 
 void AliEMCALShishKebabTrd1Module::DefineAllStaff()
-{
+{ 
   //Define some parameters     
   DefineName(fTheta);
   // Centers of cells - 2X2 case
@@ -328,15 +335,16 @@ void AliEMCALShishKebabTrd1Module::GetPositionAtCenterCellLine(Int_t ieta, Doubl
 {
   // Jul 30, 2007
   static Double_t theta=0., x=0., y=0.;
-  if(ieta==0) {
+  if(ieta==0) {    
     v     = fOB2;
-    theta = fThetaOB2;
+    theta = fTheta;
   } else if(ieta==1) {
     v     = fOB1;
-    theta = fThetaOB1;
+    theta = fTheta;
   } else {
     assert(0);
   }
+  
   x = v.X() + TMath::Cos(theta) * dist;
   y = v.Y() + TMath::Sin(theta) * dist;
   //  printf(" GetPositionAtCenterCellLine() %s : dist %f : ieta %i : x %f %f v.X() | y %f %f v.Y() : cos %f sin %f \n",