Double defined data members corrected.

diff --git a/MUON/AliMUONDisplay.h b/MUON/AliMUONDisplay.h
index bc218f8a3ed160350830de59b66bf66e2855477f..6ab8014d054dbe93a8880b33eb10f2aec8a6bceb 100644 (file)
--- a/MUON/AliMUONDisplay.h
+++ b/MUON/AliMUONDisplay.h
@@ -87,32 +87,11 @@ private:
    Int_t             fEvent;                // Current event
    Int_t             fChamber;              // Current Chamber
    Int_t             fCathode;              // Current cathode plane
-   Int_t             fZoomMode;             // =1 if in zoom mode
-
    Bool_t            fDrawClusters;         //Flag True if Clusters to be drawn
    Bool_t            fDrawCoG;              //Flag True if CoG to be drawn
                                             //to be drawn
-   Float_t           fTheta;                //Viewing angle theta
-   Float_t           fPhi;                  //Viewing angle phi
-   Float_t           fPsi;                  //Viewving angle psi (rotation on display)
-   Float_t           fRrange;               //Size of view in R
-   Float_t           fZrange;               //Size of view along Z
-   Float_t           fZoomX0[20];           //Low x range of zoom number i
-   Float_t           fZoomY0[20];           //Low y range of zoom number i
-   Float_t           fZoomX1[20];           //High x range of zoom number i
-   Float_t           fZoomY1[20];           //High y range of zoom number i
-   Int_t             fZooms;                //Number of zooms
-   Int_t             fHitsCuts;             //Number of hits surviving cuts
    Int_t             fClustersCuts;         //Number of clusters surviving cuts
-   TCanvas          *fCanvas;               //Pointer to the display canvas
-   TPad             *fTrigPad;              //Pointer to the trigger pad 
    TPad             *fColPad;               //Pointer to the colors pad 
-   TPad             *fButtons;              //Pointer to the buttons pad
-   TPad             *fPad;                  //Pointer to the event display main pad
-   TSlider          *fRangeSlider;          //Range slider
-   TButton          *fPickButton;           //Button to activate Pick mode
-   TButton          *fZoomButton;           //Button to activate Zoom mode
-   TArc             *fArcButton;            //Gren/Red button to show Pick/Zoom mode
    TObjArray        *fPoints;               //Array of points for each cathode
    TObjArray        *fPhits;                //Array of hit points for each chamber
    TObjArray        *fRpoints;              //Array of cog points for each cathode

diff --git a/MUON/AliMUONSegmentationTrigger.h b/MUON/AliMUONSegmentationTrigger.h
index 5074c54a529bdbd759351346267b09c4ab7d9330..fcd30233ad2eb1fec74234dc3cfd8a33275bcea1 100644 (file)
--- a/MUON/AliMUONSegmentationTrigger.h
+++ b/MUON/AliMUONSegmentationTrigger.h
@@ -41,13 +41,6 @@ public AliMUONSegmentationV0 {
     Float_t fZscale;            // scaling factor (Zx/Z1, x=1,2,3,4)
   
 // Current pad during integration (cursor for disintegration)
-  Int_t fIx;  // pad coord.  x 
-  Int_t fIy;  // pad coord.  y 
-  Float_t fX; // real coord. x
-  Float_t fY; // real ccord. y
-  
-  Float_t fXhit;  // x-position of hit
-  Float_t fYhit;  // y-position of hit
   Int_t   fSector;// Segmentation Sector
   
   ClassDef(AliMUONSegmentationTrigger,1) //Segmentation class for trigger  

diff --git a/MUON/AliMUONSegmentationTriggerX.h b/MUON/AliMUONSegmentationTriggerX.h
index 08774eceeb45c5f8af19238a49c661229425f920..ace6b5c21c3d0f6c52ff9859ecb29a308313d46a 100644 (file)
--- a/MUON/AliMUONSegmentationTriggerX.h
+++ b/MUON/AliMUONSegmentationTriggerX.h
@@ -68,13 +68,6 @@ public AliMUONSegmentationTrigger {
   float fXofxsmax[126][64];    // x-max
   float fYofxsmin[126][64];    // y-min
   float fYofxsmax[126][64];    // y-max
-
-// Current pad during integration (cursor for disintegration)
-  Int_t fIx;  // pad coord.  x 
-  Int_t fIy;  // pad coord.  y 
-  Float_t fX; // real coord. x
-  Float_t fY; // real ccord. y
-
 };
 #endif
 

diff --git a/MUON/AliMUONSegmentationTriggerY.h b/MUON/AliMUONSegmentationTriggerY.h
index 958a62afbd1367df5cf1ee4110c6a1d7c53f234f..6955ae4c8cd396ea84df6d79da5b1acaa1699d24 100644 (file)
--- a/MUON/AliMUONSegmentationTriggerY.h
+++ b/MUON/AliMUONSegmentationTriggerY.h
@@ -66,13 +66,6 @@ public AliMUONSegmentationTrigger {
   float fXofysmax[126][16]; // x-max
   float fYofysmin[126][16]; // y-min
   float fYofysmax[126][16]; // y-max
-
-// Current pad during integration (cursor for disintegration)
-  Int_t fIx;  // pad coord.  x 
-  Int_t fIy;  // pad coord.  y 
-  Float_t fX; // real coord. x
-  Float_t fY; // real ccord. y
-
 };
 #endif
 

diff --git a/MUON/AliMUONSegmentationV01.h b/MUON/AliMUONSegmentationV01.h
index e5343e387f6d39def0cd79006cdc21610fe4a7c9..dbe709ed4ae2fbc133144871a5c6e8e799f9704b 100644 (file)
--- a/MUON/AliMUONSegmentationV01.h
+++ b/MUON/AliMUONSegmentationV01.h
@@ -114,9 +114,9 @@ public AliMUONSegmentationV0 {
 
     //
     // Current pad during integration (cursor for disintegration)
-    Int_t   fSector; // Current sector
+    Int_t   fSector;   // Current sector
     //
-    TObjArray *fCorr; // Correction functions
+    TObjArray *fCorrA; // Array of correction functions
 };
 #endif