Fixing RC20 violations

[u/mrichter/AliRoot.git] / MUON / AliMUONResponseTrigger.cxx

diff --git a/MUON/AliMUONResponseTrigger.cxx b/MUON/AliMUONResponseTrigger.cxx
index c46d286ac26dffc958e10afb79137afd6390924f..d1a8e1a45133c6551bacc9e318aa0d855f90af2c 100644 (file)
--- a/MUON/AliMUONResponseTrigger.cxx
+++ b/MUON/AliMUONResponseTrigger.cxx
@@ -30,7 +30,6 @@
 #include "AliMUONGeometryTransformer.h"
 #include "AliMUONHit.h"
 #include "AliMUONConstants.h"
-#include "AliMUONTriggerEfficiencyCells.h"
 
 #include "AliMpPad.h"
 #include "AliMpCathodType.h"
@@ -69,8 +68,7 @@ namespace
 
 //------------------------------------------------------------------   
 AliMUONResponseTrigger::AliMUONResponseTrigger()
-  : AliMUONResponse(),
-    fTriggerEfficiency(0x0)
+  : AliMUONResponse()
 {
 /// Default constructor
 }
@@ -83,7 +81,7 @@ AliMUONResponseTrigger::~AliMUONResponseTrigger()
 
 //_____________________________________________________________________________
 void 
-AliMUONResponseTrigger::DisIntegrate(const AliMUONHit& hit, TList& digits)
+AliMUONResponseTrigger::DisIntegrate(const AliMUONHit& hit, TList& digits, Float_t /*timeDif*/)
 {
   /// Generate 2 digits (one on each cathode) from 1 hit, i.e. no cluster-size
   /// generation (simplest response case).
@@ -92,7 +90,7 @@ AliMUONResponseTrigger::DisIntegrate(const AliMUONHit& hit, TList& digits)
   
   Float_t xhit = hit.X();
   Float_t yhit = hit.Y();
-  Float_t zhit = 0; // FIXME : should it be hit.Z() ?
+  Float_t zhit = hit.Z();
   Int_t detElemId = hit.DetElemId();  
   
   Double_t x,y,z;
@@ -104,8 +102,8 @@ AliMUONResponseTrigger::DisIntegrate(const AliMUONHit& hit, TList& digits)
   {
     twentyNano=1;
   }
-
-  Bool_t isTrig[2]={kTRUE,kTRUE};
+  
+  Int_t nboard=0;
 
   for ( Int_t cath = AliMp::kCath0; cath <= AliMp::kCath1; ++cath )
   {
@@ -113,9 +111,9 @@ AliMUONResponseTrigger::DisIntegrate(const AliMUONHit& hit, TList& digits)
       = AliMpSegmentation::Instance()
         ->GetMpSegmentation(detElemId,AliMp::GetCathodType(cath));
     
-    AliMpPad pad = seg->PadByPosition(TVector2(x,y),kFALSE);
-    Int_t ix = pad.GetIndices().GetFirst();
-    Int_t iy = pad.GetIndices().GetSecond();
+    AliMpPad pad = seg->PadByPosition(x,y,kFALSE);
+    Int_t ix = pad.GetIx();
+    Int_t iy = pad.GetIy();
     
     AliDebug(1,Form("xhit,yhit=%e,%e lx,ly,lz=%e,%e,%e ix,iy=%d,%d",
                     xhit,yhit,x,y,z,ix,iy));
@@ -128,43 +126,18 @@ AliMUONResponseTrigger::DisIntegrate(const AliMUONHit& hit, TList& digits)
                       xhit,yhit,x,y,z,ix,iy));
       continue;
     }
-    AliMUONDigit* d = new AliMUONDigit(detElemId,pad.GetLocation(0).GetFirst(),
-                                       pad.GetLocation(0).GetSecond(),cath);
+    
+    if ( cath == AliMp::kCath0 ) nboard = pad.GetLocalBoardId(0);
+        
+    AliMUONDigit* d = new AliMUONDigit(detElemId,nboard,
+                                       pad.GetLocalBoardChannel(0),cath);
     d->SetPadXY(ix,iy);
 
     //FIXME : a trigger digit can have several locations. 
     //this is not currently supported by the digit class. Change that or not ?
     d->SetCharge(twentyNano);
 
-    if(fTriggerEfficiency){
-      if(cath==0){
-       Int_t nboard = pad.GetLocation(0).GetFirst();
-       fTriggerEfficiency->IsTriggered(detElemId, nboard, 
-                                       isTrig[0], isTrig[1]);
-      }
-      if(!isTrig[cath]) continue;
-    }
 
     digits.Add(d);   
   }
-  
-}
-
-
-//_____________________________________________________________________________
-void
-AliMUONResponseTrigger::InitTriggerEfficiency(AliMUONTriggerEfficiencyCells *triggerEfficiency)
-{
-/// Initialize trigger chamber efficiency (on demand)
-
-  fTriggerEfficiency = triggerEfficiency;
-  if ( fTriggerEfficiency )
-  {
-    AliDebug(1, "Will apply trigger efficiency");
-  }
-  else
-  {
-    AliFatal("I was requested to apply trigger efficiency, but I could "
-            "not get it !");
-  }
 }