]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - MUON/AliMUONResponseTriggerV1.cxx
Replacement of AliMpIntPair object with algoritmic
[u/mrichter/AliRoot.git] / MUON / AliMUONResponseTriggerV1.cxx
index b4d9836220b66f9d12170c086280950814a93d66..5fcb648ef876d9555710bdea41bc7fe8fc23467f 100644 (file)
 
 /* $Id$ */
 
-// ------------------
+//-----------------------------------------------------------------------------
 // Class AliMUONTriggerResponseV1
 // ------------------
 // Trigger chamber response 
 // with cluster size activated
+//-----------------------------------------------------------------------------
 
 #include "AliMUONResponseTriggerV1.h"
-#include "AliMUONGeometrySegmentation.h"
 #include "AliMUON.h"
 #include "AliMUONDigit.h"
 #include "AliMUONGeometryTransformer.h"
-#include "AliMUONSegmentation.h"
 #include "AliMUONConstants.h"
 
 #include "AliMpPad.h"
 #include "AliMpSegmentation.h"
 #include "AliMpVSegmentation.h"
+#include "AliMpCathodType.h"
 
 #include "AliRun.h"
 
@@ -62,11 +62,6 @@ namespace
     transformer->Global2Local(detElemId,xg,yg,zg,xl,yl,zl);
   }
 
-  AliMUONSegmentation* Segmentation()
-  {
-    static AliMUONSegmentation* segmentation = muon()->GetSegmentation();
-    return segmentation;
-  }
 }
 
 //------------------------------------------------------------------   
@@ -122,9 +117,9 @@ Int_t AliMUONResponseTriggerV1::SetGenerCluster()
 Float_t AliMUONResponseTriggerV1::FireStripProb(Float_t x4, Float_t theta)
 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
+/// 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
 
  return 
      (TMath::Cos(theta)*fA/(fA+TMath::Cos(theta)*TMath::Power(x4*10.,fB))+fC)/
@@ -154,24 +149,34 @@ void AliMUONResponseTriggerV1::DisIntegrate(const AliMUONHit& hit, TList& digits
     twentyNano=1;
   }
 
-  for ( Int_t cath = 0; cath < 2; ++cath )
+  Bool_t isTrig[2]={kTRUE, kTRUE};
+
+  for ( Int_t cath = AliMp::kCath0; cath <= AliMp::kCath1; ++cath )
   {
     const AliMpVSegmentation* seg 
-      = AliMpSegmentation::Instance()->GetMpSegmentation(detElemId,cath);
+      = 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();
+    Int_t ix = pad.GetIx();
+    Int_t iy = pad.GetIy();
     
-    AliMUONDigit* d = new AliMUONDigit;
-    d->SetDetElemId(detElemId);
+    AliMUONDigit* d = new AliMUONDigit(detElemId,pad.GetLocalBoardId(0),
+                                       pad.GetLocalBoardChannel(0),
+                                       cath);
+    d->SetPadXY(ix,iy);
 
-    d->SetPadX(ix);
-    d->SetPadY(iy);
+    d->SetCharge(twentyNano);
+
+    if(fTriggerEfficiency){
+      if(cath==0){
+       Int_t nboard = pad.GetLocalBoardId(0);
+       fTriggerEfficiency->IsTriggered(detElemId, nboard, 
+                                       isTrig[0], isTrig[1]);
+      }
+      if(!isTrig[cath]) continue;
+    }
 
-    d->SetSignal(twentyNano);
-    d->AddPhysicsSignal(d->Signal());
-    d->SetCathode(cath);
     digits.Add(d);
 
     SetGenerCluster(); // 1 randum number per cathode (to be checked)
@@ -192,8 +197,7 @@ 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);
@@ -212,15 +216,12 @@ void AliMUONResponseTriggerV1::DisIntegrate(const AliMUONHit& hit, TList& digits
                else qp = 0;
                
                if (qp == 1) { // this digit is fired    
-                   AliMUONDigit* dNeigh = new AliMUONDigit;
-                   dNeigh->SetDetElemId(detElemId);
+                   AliMUONDigit* dNeigh = new AliMUONDigit(detElemId,padNeigh.GetLocalBoardId(0),
+                                                padNeigh.GetLocalBoardChannel(0),
+                                                cath);
                    
-                   dNeigh->SetPadX(ixNeigh);
-                   dNeigh->SetPadY(iyNeigh);
-                   
-                   dNeigh->SetSignal(twentyNano);
-                   dNeigh->AddPhysicsSignal(dNeigh->Signal());
-                   dNeigh->SetCathode(cath);
+                   dNeigh->SetPadXY(ixNeigh,iyNeigh);      
+                   dNeigh->SetCharge(twentyNano);
                    digits.Add(dNeigh);
                } // digit fired                
            } // pad is valid
@@ -251,7 +252,8 @@ void AliMUONResponseTriggerV1::Neighbours(const Int_t cath,
     ///-----------------NON-BENDING-------------------------------------      /n
     /// Returns list of 10 next neighbours for given Y strip (ix, iy)         /n 
     /// neighbour number 9 8 7 6 5 (Y strip (ix, iy)) 0 1 2 3 4 in the list   /n 
-    ///                  \_______/                    \_______/               /n 
+    ///                  |_______|                    |_______/               /n 
+
     ///                    left                         right                 /n
     
     for (Int_t i=0; i<10; i++) {