trigger with new coordinate system in MUONdisplay

diff --git a/MUON/AliMUONDisplay.cxx b/MUON/AliMUONDisplay.cxx
index c7234800f88ad1a6fd955e9e4b4b854eb6013cdc..5c8a018d7e4dde2ce8833c363009a897d882bfd5 100644 (file)
--- a/MUON/AliMUONDisplay.cxx
+++ b/MUON/AliMUONDisplay.cxx
@@ -811,12 +811,12 @@ void AliMUONDisplay::LoadDigits(Int_t chamber, Int_t cathode)
     
     Int_t npoints  = 1;
     Float_t adcmax = 1024;
-    if (response) adcmax = response->MaxAdc();
+    if (response&&chamber<11) adcmax = response->MaxAdc();
 
     for (Int_t digit = 0; digit < ndigits; digit++) {
         mdig    = (AliMUONDigit*)muonDigits->UncheckedAt(digit);
        if (mdig->Cathode() != cathode-1) continue;
-
+       
         //
         // First get all needed parameters
         //
@@ -827,6 +827,7 @@ void AliMUONDisplay::LoadDigits(Int_t chamber, Int_t cathode)
         if (color > 282) color = 282;
 
        if (chamber > 10) { // trigger chamber 
+
            Int_t sumCharge = 0;
            for (Int_t icharge = 0; icharge < 10; icharge++) {
                sumCharge = sumCharge+mdig->TrackCharge(icharge);
@@ -865,8 +866,8 @@ void AliMUONDisplay::LoadDigits(Int_t chamber, Int_t cathode)
         points->SetHitIndex(-1);
         points->SetTrackIndex(-1);
         points->SetDigitIndex(digit);
-        points->SetPoint(0,xpad,ypad,zpos);    
-
+        points->SetPoint(0,xpad,ypad,zpos);
+       
        Int_t lineColor = (zpad-zpos > 0) ? 2:3;
        marker=new TMarker3DBox(xpad,ypad,zpos,dpx,dpy,0,0,0);
 

diff --git a/MUON/AliMUONSegmentationTriggerX.h b/MUON/AliMUONSegmentationTriggerX.h
index 87e798e2d933699eaaab3d0243c49a3ee2cc272e..747c938f95c73e37493a1aa72f8711d8d6ccf269 100644 (file)
--- a/MUON/AliMUONSegmentationTriggerX.h
+++ b/MUON/AliMUONSegmentationTriggerX.h
@@ -24,7 +24,7 @@ public AliMUONSegmentationTrigger {
   // Transform from real to pad coordinates
   virtual void    GetPadC(Int_t ix, Int_t iy, Float_t &x, Float_t &y);
   virtual void    GetPadC(Int_t ix, Int_t iy, Float_t &x, Float_t &y, Float_t &z) 
-      {z=0; GetPadC(ix, iy, x , y);}
+      {z=-10000.; GetPadC(ix, iy, x , y);}
   // Draw the segmentation zones
   virtual void Draw(const char *opt = "") const;
 

diff --git a/MUON/AliMUONSegmentationTriggerY.h b/MUON/AliMUONSegmentationTriggerY.h
index 6156bfc1d4c5c2b8ce826257fdea1ebba131ce86..fba16978954cebf909a82490535a418d1492f6a1 100644 (file)
--- a/MUON/AliMUONSegmentationTriggerY.h
+++ b/MUON/AliMUONSegmentationTriggerY.h
@@ -24,7 +24,7 @@ public AliMUONSegmentationTrigger {
   // Transform from real to pad coordinates
   virtual void    GetPadC(Int_t ix,Int_t iy,Float_t &x,Float_t &y);
   virtual void    GetPadC(Int_t ix, Int_t iy, Float_t &x, Float_t &y, Float_t &z) 
-      {z=0; GetPadC(ix, iy, x , y);}
+      {z=-10000.; GetPadC(ix, iy, x , y);}
   // Pad size Dx*Dy 
   virtual void SetPadSize(Float_t dp1, Float_t dp2);
   // Strip size by Module