In AliMUONResponseV0::DisIntegrate():

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

diff --git a/MUON/AliMUONResponseV0.cxx b/MUON/AliMUONResponseV0.cxx
index f607ceb25a1bd638874eb433c9a5ac3bf928209c..65b9ad5ef22b144483ff2c22addfbd2d187c172f 100644 (file)
--- a/MUON/AliMUONResponseV0.cxx
+++ b/MUON/AliMUONResponseV0.cxx
@@ -28,6 +28,7 @@
 #include "AliMUONDigit.h"
 #include "AliMUONGeometryTransformer.h"
 #include "AliMUONHit.h"
+#include "AliMUONConstants.h"
 
 #include "AliMpArea.h"
 #include "AliMpDEManager.h"
@@ -201,7 +202,7 @@ AliMUONResponseV0::GetAnod(Float_t x) const
 
 //______________________________________________________________________________
 void 
-AliMUONResponseV0::DisIntegrate(const AliMUONHit& hit, TList& digits)
+AliMUONResponseV0::DisIntegrate(const AliMUONHit& hit, TList& digits, Float_t timeDif)
 {
   /// Go from 1 hit to a list of digits.
   /// The energy deposition of that hit is first converted into charge
@@ -222,7 +223,7 @@ AliMUONResponseV0::DisIntegrate(const AliMUONHit& hit, TList& digits)
   //Modify to take the tailing effect.
   if(fIsTailEffect){
     Double_t locX,locY,locZ,globXCenter,globYCenter,globZ;
-    Int_t para = 5; // This parameter is a natural number(excluding zero and four), higher the value less is the tailing effect 
+    Int_t para = 5; // This parameter is a natural number(excluding zero), higher the value less is the tailing effect 
     Double_t termA = 1.0;
     Double_t termB = 1.0;
     if(para>0){
@@ -236,20 +237,20 @@ AliMUONResponseV0::DisIntegrate(const AliMUONHit& hit, TList& digits)
          
          if(plane == AliMp::kBendingPlane) {
            Global2Local(detElemId,hitX,hitY,hitZ,locX,locY,locZ);
-           TVector2 hitPoint(locX,locY);
-           AliMpPad pad = seg->PadByPosition(hitPoint,kFALSE);
-           Double_t locYCenter = pad.Position().Y();
-           Double_t locXCenter = pad.Position().X();
-           const AliMUONGeometryTransformer* transformer = muon()->GetGeometryTransformer();
-           transformer->Local2Global(detElemId,locXCenter,locYCenter,locZ,globXCenter,globYCenter,globZ);
-           for(Int_t itime = 0; itime<para; itime++)
-             termA *= 10.0;
-           
-           for(Int_t itime = 0; itime<Int_t((2*para) + 1); itime++)
-             termB *= (hitY - globYCenter) ; 
-
-           hitY = hitY + termA*termB;
-           
+           AliMpPad pad = seg->PadByPosition(locX,locY,kFALSE);
+            if(pad.IsValid()){
+              Double_t locYCenter = pad.GetPositionY();
+              Double_t locXCenter = pad.GetPositionX();
+              const AliMUONGeometryTransformer* transformer = muon()->GetGeometryTransformer();
+              transformer->Local2Global(detElemId,locXCenter,locYCenter,locZ,globXCenter,globYCenter,globZ);
+              for(Int_t itime = 0; itime<para; itime++)
+                termA *= 10.0;
+            
+              for(Int_t itime = 0; itime<Int_t((2*para) + 1); itime++)
+                termB *= (hitY - globYCenter) ; 
+            
+              hitY = hitY + termA*termB;
+            }// if the pad is a valid one
          }// if bending plane
        }// cathode loop
     }// if para > 0 condn
@@ -260,12 +261,16 @@ AliMUONResponseV0::DisIntegrate(const AliMUONHit& hit, TList& digits)
   Double_t x,y,z;
   Global2Local(detElemId,hitX,hitY,hitZ,x,y,z);
   x = GetAnod(x);
-  TVector2 hitPosition(x,y);
-  AliMpArea area(hitPosition,TVector2(dx,dy));
+  AliMpArea area(x,y,dx,dy);
   
   // Get pulse height from energy loss.
   Float_t qtot = IntPH(hit.Eloss());
   
+  // If from a pileup event we apply a reduction factor to the charge
+  if (timeDif!=0){
+    qtot = AliMUONConstants::ReducedQTot(qtot,timeDif);
+  }
+  
   // Get the charge correlation between cathodes.
   Float_t currentCorrel = TMath::Exp(gRandom->Gaus(0.0,ChargeCorrel()/2.0));
 
@@ -292,20 +297,21 @@ AliMUONResponseV0::DisIntegrate(const AliMUONHit& hit, TList& digits)
     if ( it->IsDone() )
     {
       // Exceptional case : iterator is built, but is invalid from the start.
-      AliMpPad pad = seg->PadByPosition(area.Position(),kFALSE);
+      AliMpPad pad = seg->PadByPosition(area.GetPositionX(),area.GetPositionY(),
+                                        kFALSE);
       if ( pad.IsValid() )
       {
-        AliWarning(Form("Got an invalid iterator bug (area.Position() is within "
+        AliDebug(1, Form("Got an invalid iterator bug (area.Position() is within "
                       " DE but the iterator is void) for detElemId %d cath %d",
                       detElemId,cath));        
       }
       else
       {
-        AliError(Form("Got an invalid iterator bug for detElemId %d cath %d."
+        AliDebug(1, Form("Got an invalid iterator bug for detElemId %d cath %d."
                       "Might be a bad hit ? area.Position()=(%e,%e) "
                       "Dimensions()=(%e,%e)",
-                      detElemId,cath,area.Position().X(),area.Position().Y(),
-                      area.Dimensions().X(),area.Dimensions().Y()));
+                      detElemId,cath,area.GetPositionX(),area.GetPositionY(),
+                      area.GetDimensionX(),area.GetDimensionY()));
       }
       delete it;
       return;
@@ -316,8 +322,9 @@ AliMUONResponseV0::DisIntegrate(const AliMUONHit& hit, TList& digits)
       // For each pad given by the iterator, compute the charge of that
       // pad, according to the Mathieson distribution.
       AliMpPad pad = it->CurrentItem();      
-      TVector2 lowerLeft(hitPosition-pad.Position()-pad.Dimensions());
-      TVector2 upperRight(lowerLeft + pad.Dimensions()*2.0);
+      TVector2 lowerLeft(TVector2(x,y)-TVector2(pad.GetPositionX(),pad.GetPositionY())-
+                         TVector2(pad.GetDimensionX(),pad.GetDimensionY()));
+      TVector2 upperRight(lowerLeft + TVector2(pad.GetDimensionX(),pad.GetDimensionY())*2.0);
       Float_t qp = TMath::Abs(fMathieson->IntXY(lowerLeft.X(),lowerLeft.Y(),
                                                 upperRight.X(),upperRight.Y()));
             
@@ -327,9 +334,9 @@ AliMUONResponseV0::DisIntegrate(const AliMUONHit& hit, TList& digits)
       {
         // If we're above threshold, then we create a digit,
         // and fill it with relevant information, including electronics.
-        AliMUONDigit* d = new AliMUONDigit(detElemId,pad.GetLocation().GetFirst(),
-                                           pad.GetLocation().GetSecond(),cath);
-        d->SetPadXY(pad.GetIndices().GetFirst(),pad.GetIndices().GetSecond());
+        AliMUONDigit* d = new AliMUONDigit(detElemId,pad.GetManuId(),
+                                           pad.GetManuChannel(),cath);
+        d->SetPadXY(pad.GetIx(),pad.GetIy());
         d->SetCharge(icharge);
         digits.Add(d);   
       }