- Bug fix: in the creation/reading of the trigger DCS values, the HV and currents...

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

diff --git a/MUON/AliMUONResponseTriggerV1.cxx b/MUON/AliMUONResponseTriggerV1.cxx
index 57e05d763f8010b3426f3ca0717f68ced415e5b9..9a7cbb16c055c1ad9aa88d6c15fa52a1b5aee94d 100644 (file)
--- a/MUON/AliMUONResponseTriggerV1.cxx
+++ b/MUON/AliMUONResponseTriggerV1.cxx
@@ -15,18 +15,17 @@
 
 /* $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"
@@ -63,11 +62,6 @@ namespace
     transformer->Global2Local(detElemId,xg,yg,zg,xl,yl,zl);
   }
 
-  AliMUONSegmentation* Segmentation()
-  {
-    static AliMUONSegmentation* segmentation = muon()->GetSegmentation();
-    return segmentation;
-  }
 }
 
 //------------------------------------------------------------------   
@@ -155,25 +149,34 @@ void AliMUONResponseTriggerV1::DisIntegrate(const AliMUONHit& hit, TList& digits
     twentyNano=1;
   }
 
+  Bool_t isTrig[2]={kTRUE, kTRUE};
+
   for ( Int_t cath = AliMp::kCath0; cath <= AliMp::kCath1; ++cath )
   {
     const AliMpVSegmentation* seg 
       = 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();
     
-    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)
@@ -194,16 +197,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);
@@ -214,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);
-                   
-                   dNeigh->SetPadX(ixNeigh);
-                   dNeigh->SetPadY(iyNeigh);
+                   AliMUONDigit* dNeigh = new AliMUONDigit(detElemId,padNeigh.GetLocalBoardId(0),
+                                                padNeigh.GetLocalBoardChannel(0),
+                                                cath);
                    
-                   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