Changed signature of store digits to correspond to base class

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

diff --git a/MUON/AliMUONResponseTriggerV1.cxx b/MUON/AliMUONResponseTriggerV1.cxx
index 4d8070ec7cbb3c12df701e127343e7a36af7bd4c..9735d3536fe88c0a74f1c5404bab4b195840202b 100644 (file)
--- a/MUON/AliMUONResponseTriggerV1.cxx
+++ b/MUON/AliMUONResponseTriggerV1.cxx
@@ -100,6 +100,7 @@ void AliMUONResponseTriggerV1::SetParameters(Float_t hv)
 {
 /// initialize parameters accoring to HV
 /// (see V.Barret B.Espagnon and P.Rosnet Alice/note xxx)
+/// this parametrisation is valid only for the "streamer" mode
   fA = 6.089 * hv - 52.70;
   fB = 2.966;
   fC = 4.3e-4 * hv - 3.5e-3;
@@ -120,6 +121,7 @@ const
 /// parametrisation of the probability that a strip neighbour of the main 
 /// strip is fired (V.Barret B.Espagnon and P.Rosnet INT/DIM/01-04 (2001)
 /// WARNING : need to convert x4 from cm to mm
+/// this parametrisation is valid only for the "streamer" mode
 
  return 
      (TMath::Cos(theta)*fA/(fA+TMath::Cos(theta)*TMath::Power(x4*10.,fB))+fC)/
@@ -127,7 +129,7 @@ const
 }
 
 //------------------------------------------------------------------  
-void AliMUONResponseTriggerV1::DisIntegrate(const AliMUONHit& hit, TList& digits)
+void AliMUONResponseTriggerV1::DisIntegrate(const AliMUONHit& hit, TList& digits, Float_t /*timeDif*/)
 {
   /// Generate digits (on each cathode) from 1 hit, with cluster-size
   /// generation.
@@ -136,7 +138,7 @@ void AliMUONResponseTriggerV1::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;
@@ -150,6 +152,7 @@ void AliMUONResponseTriggerV1::DisIntegrate(const AliMUONHit& hit, TList& digits
   }
 
   Bool_t isTrig[2]={kTRUE, kTRUE};
+  Int_t nboard = 0;
 
   for ( Int_t cath = AliMp::kCath0; cath <= AliMp::kCath1; ++cath )
   {
@@ -157,25 +160,38 @@ void AliMUONResponseTriggerV1::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));
+    
+    if ( !pad.IsValid() )
+    {
+      AliWarning(Form("hit w/o strip %d-%d xhit,yhit=%e,%e local x,y,z "
+                      "%e,%e,%e ix,iy=%d,%d",detElemId,
+                      cath,
+                      xhit,yhit,x,y,z,ix,iy));
+      continue;
+    }
     
-    AliMUONDigit* d = new AliMUONDigit(detElemId,pad.GetLocation(0).GetFirst(),
-                                       pad.GetLocation(0).GetSecond(),
-                                       cath);
-    d->SetPadXY(ix,iy);
-
-    d->SetCharge(twentyNano);
-
     if(fTriggerEfficiency){
       if(cath==0){
-       Int_t nboard = pad.GetLocation(0).GetFirst();
-       fTriggerEfficiency->IsTriggered(detElemId, nboard, 
-                                       isTrig[0], isTrig[1]);
+        nboard = pad.GetLocalBoardId(0);
+        fTriggerEfficiency->IsTriggered(detElemId, nboard, 
+                                        isTrig[0], isTrig[1]);
       }
       if(!isTrig[cath]) continue;
     }
+    
+    AliMUONDigit* d = new AliMUONDigit(detElemId,pad.GetLocalBoardId(0),
+                                       pad.GetLocalBoardChannel(0),
+                                       cath);
+    d->SetPadXY(ix,iy);
+
+    d->SetCharge(twentyNano);
+
 
     digits.Add(d);
 
@@ -197,16 +213,15 @@ void AliMUONResponseTriggerV1::DisIntegrate(const AliMUONHit& hit, TList& digits
            Int_t ixNeigh = ( cath == 0 ) ? ix : xList[i];
            Int_t iyNeigh = ( cath == 0 ) ? yList[i] : iy;
            
-           AliMpIntPair pairNeigh = AliMpIntPair(ixNeigh,iyNeigh);
-           AliMpPad padNeigh = seg->PadByIndices(pairNeigh,kFALSE);
+           AliMpPad padNeigh = seg->PadByIndices(ixNeigh,iyNeigh,kFALSE);
            if(padNeigh.IsValid()){ // existing neighbourg              
                
                Int_t dix=-(ixNeigh-ix);
                Int_t diy=-(iyNeigh-iy);
-               Float_t xlocalNeigh = padNeigh.Position().X();
-               Float_t ylocalNeigh = padNeigh.Position().Y();
-               Float_t dpx = padNeigh.Dimensions().X();
-               Float_t dpy = padNeigh.Dimensions().Y();
+               Float_t xlocalNeigh = padNeigh.GetPositionX();
+               Float_t ylocalNeigh = padNeigh.GetPositionY();
+               Float_t dpx = padNeigh.GetDimensionX();
+               Float_t dpy = padNeigh.GetDimensionY();
                Float_t distX = TMath::Abs((Float_t)dix) * ((Float_t)dix * dpx + xlocalNeigh - x);
                Float_t distY = TMath::Abs((Float_t)diy) * ((Float_t)diy * dpy + ylocalNeigh - y);
                Float_t dist = TMath::Sqrt(distX*distX+distY*distY);
@@ -217,8 +232,8 @@ void AliMUONResponseTriggerV1::DisIntegrate(const AliMUONHit& hit, TList& digits
                else qp = 0;
                
                if (qp == 1) { // this digit is fired    
-                   AliMUONDigit* dNeigh = new AliMUONDigit(detElemId,padNeigh.GetLocation(0).GetFirst(),
-                                                padNeigh.GetLocation(0).GetSecond(),
+                   AliMUONDigit* dNeigh = new AliMUONDigit(detElemId,padNeigh.GetLocalBoardId(0),
+                                                padNeigh.GetLocalBoardChannel(0),
                                                 cath);
                    
                    dNeigh->SetPadXY(ixNeigh,iyNeigh);      
@@ -229,12 +244,13 @@ void AliMUONResponseTriggerV1::DisIntegrate(const AliMUONHit& hit, TList& digits
        } // built-up cluster
     } // loop on neighbors
   } // loop on cathode
+  if ( fTriggerEfficiency ) AliDebug(1,Form("MTReff: DetElemId %i  Board %3i  Fired %i %i", detElemId, nboard, isTrig[0], isTrig[1]));
 }
 
 //------------------------------------------------------------------  
 void AliMUONResponseTriggerV1::Neighbours(const Int_t cath, 
                                          const Int_t ix, const Int_t iy, 
-                                         Int_t Xlist[10], Int_t Ylist[10]) 
+                                         Int_t Xlist[10], Int_t Ylist[10]) const
 {
     ///-----------------BENDING-----------------------------------------      /n
     /// Returns list of 10 next neighbours for given X strip (ix, iy)         /n