Corrected overloading functions (defined in TObject) (Ivana)

diff --git a/MUON/AliMUONGeometrySVMap.cxx b/MUON/AliMUONGeometrySVMap.cxx
index 43f063c8e336e28a4e45fec4fdfb2c782074dd07..2149e886f97e97d60e196846d98ea50997f61fa9 100644 (file)
--- a/MUON/AliMUONGeometrySVMap.cxx
+++ b/MUON/AliMUONGeometrySVMap.cxx
@@ -129,7 +129,7 @@ Int_t  AliMUONStringIntMap::GetNofItems() const
 }  
 
 //______________________________________________________________________________
-void  AliMUONStringIntMap::Clear()
+void  AliMUONStringIntMap::Clear(Option_t* /*option*/)
 {
 // Deletes the elements
 // ---
@@ -286,7 +286,7 @@ void AliMUONGeometrySVMap::AddPosition(const TString& volumePath,
 }                    
     
 //______________________________________________________________________________
-void AliMUONGeometrySVMap::Clear()
+void AliMUONGeometrySVMap::Clear(Option_t* /*option*/)
 {
 // Clears the sensitive volumes map
 

diff --git a/MUON/AliMUONGeometrySVMap.h b/MUON/AliMUONGeometrySVMap.h
index 90c3e28eb6239bd1407105977fa360ee89b18bad..a512e575297c98fb22a70f30ffcec7eef1c8b0e0 100644 (file)
--- a/MUON/AliMUONGeometrySVMap.h
+++ b/MUON/AliMUONGeometrySVMap.h
@@ -42,7 +42,7 @@ class AliMUONStringIntMap : public TObject
     Bool_t  Add(const TString& first, Int_t second);
     Int_t   Get(const TString& first) const;
     Int_t   GetNofItems() const;
-    void    Clear();
+    virtual void Clear(Option_t* /*option*/ ="");
     virtual void Print(const char* /*option*/ = "") const;
     void Print(const TString& key, ofstream& out) const;
     
@@ -75,7 +75,7 @@ class AliMUONGeometrySVMap : public TObject
     void AddPosition(const TString& volumePath, 
              const TGeoTranslation& globalPosition);  
 
-    void Clear();
+    virtual void Clear(Option_t* /*option*/ ="");
     void ClearPositions();
     void SortPositions();
     virtual void Print(Option_t* option) const;

diff --git a/MUON/AliMUONGeometrySegmentation.cxx b/MUON/AliMUONGeometrySegmentation.cxx
index 166b3e1006d53b16ec3472a6736ca24bf0930a37..a8bec81039d56a73e1bcd548a381834ef0ad607b 100644 (file)
--- a/MUON/AliMUONGeometrySegmentation.cxx
+++ b/MUON/AliMUONGeometrySegmentation.cxx
@@ -105,7 +105,7 @@ AliMUONGeometrySegmentation::operator=(const AliMUONGeometrySegmentation& rhs)
 //
 
 //______________________________________________________________________________
-Bool_t AliMUONGeometrySegmentation::Notify(Int_t detElemId) const
+Bool_t AliMUONGeometrySegmentation::OwnNotify(Int_t detElemId) const
 {
 // Updates current detection element and segmentation,
 // and checks if they exist.
@@ -159,7 +159,7 @@ AliMUONGeometrySegmentation::GetDirection(Int_t detElemId) const
 // Return direction with a constant pad size 
 // (Direction or coordinate where the resolution is the best)
 
-  if (!Notify(detElemId)) return kDirUndefined;
+  if (!OwnNotify(detElemId)) return kDirUndefined;
 
   return fCurrentSegmentation->GetDirection();
 }
@@ -199,7 +199,7 @@ Float_t AliMUONGeometrySegmentation::GetAnod(Int_t detElemId, Float_t xhit) cons
 // CHECK
 // ---
 
-  if (!Notify(detElemId)) return 0;
+  if (!OwnNotify(detElemId)) return 0;
 
   return fCurrentSegmentation->GetAnod(xhit);
 }
@@ -212,8 +212,8 @@ Bool_t  AliMUONGeometrySegmentation::GetPadI(Int_t detElemId,
 //  Returns pad coordinates (ix,iy) for given real coordinates (x,y)
 // ---
 
-  if (!Notify(detElemId)) return false;
-
+  if (!OwnNotify(detElemId)) return false;
+  
   Float_t xl, yl, zl;
   fCurrentDetElement->Global2Local(xg, yg, zg, xl, yl, zl); 
 
@@ -231,7 +231,7 @@ Bool_t  AliMUONGeometrySegmentation::GetPadC(Int_t detElemId,
 // Transform from pad to real coordinates
 // ---
 
-  if (!Notify(detElemId)) return false;
+  if (!OwnNotify(detElemId)) return false;
 
   if (!fCurrentSegmentation->HasPad(ix, iy)) return false;
 
@@ -276,7 +276,7 @@ Float_t AliMUONGeometrySegmentation::Dpx(Int_t detElemId) const
 // Get pad size in x
 // ---
 
-  if (!Notify(detElemId)) return 0.;
+  if (!OwnNotify(detElemId)) return 0.;
   
   return fCurrentSegmentation->Dpx();
 }
@@ -287,7 +287,7 @@ Float_t AliMUONGeometrySegmentation::Dpy(Int_t detElemId) const
 // Get pad size in y
 // ---
 
-  if (!Notify(detElemId)) return 0.;
+  if (!OwnNotify(detElemId)) return 0.;
 
   return fCurrentSegmentation->Dpy();
 }
@@ -298,7 +298,7 @@ Float_t AliMUONGeometrySegmentation::Dpx(Int_t detElemId, Int_t isector) const
 // Pad size in x by sector
 // ---
 
-  if (!Notify(detElemId)) return 0.;
+  if (!OwnNotify(detElemId)) return 0.;
 
   return fCurrentSegmentation->Dpx(isector);
 } 
@@ -309,7 +309,7 @@ Float_t AliMUONGeometrySegmentation::Dpy(Int_t detElemId, Int_t isector) const
 // Pad size in x, y by Sector 
 // ---
 
-  if (!Notify(detElemId)) return 0.;
+  if (!OwnNotify(detElemId)) return 0.;
 
   return fCurrentSegmentation->Dpy(isector);
 }
@@ -320,7 +320,7 @@ Int_t AliMUONGeometrySegmentation::Npx(Int_t detElemId) const
 // Maximum number of Pads in x
 // ---
 
-  if (!Notify(detElemId)) return 0;
+  if (!OwnNotify(detElemId)) return 0;
 
   return fCurrentSegmentation->Npx();
 }
@@ -331,7 +331,7 @@ Int_t AliMUONGeometrySegmentation::Npy(Int_t detElemId) const
 // Maximum number of Pads in y
 // ---
 
-  if (!Notify(detElemId)) return 0;
+  if (!OwnNotify(detElemId)) return 0;
 
   return fCurrentSegmentation->Npy();
 }
@@ -345,7 +345,7 @@ void  AliMUONGeometrySegmentation::SetPad(Int_t detElemId, Int_t ix, Int_t iy)
 // From AliMUONGeometrySegmentationV01.
 // ---
 
-  if (!Notify(detElemId)) return;
+  if (!OwnNotify(detElemId)) return;
 
   fCurrentSegmentation->SetPad(ix, iy);
 }
@@ -359,7 +359,7 @@ void  AliMUONGeometrySegmentation::SetHit(Int_t detElemId,
 // outside the tracking program 
 // From AliMUONGeometrySegmentationV01.
 
-  if (!Notify(detElemId)) return;
+  if (!OwnNotify(detElemId)) return;
 
   Float_t xl, yl, zl;
   fCurrentDetElement->Global2Local(xghit, yghit, zghit, xl, yl, zl); 
@@ -375,7 +375,7 @@ void  AliMUONGeometrySegmentation::FirstPad(Int_t detElemId,
 // Iterate over pads - initialiser
 // ---
 
-  if (!Notify(detElemId)) return;
+  if (!OwnNotify(detElemId)) return;
 
   Float_t xl, yl, zl;
   fCurrentDetElement->Global2Local(xghit, yghit, zghit, xl, yl, zl); 
@@ -389,7 +389,7 @@ void  AliMUONGeometrySegmentation::NextPad(Int_t detElemId)
 // Iterate over pads - stepper
 // ---
 
-  if (!Notify(detElemId)) return;
+  if (!OwnNotify(detElemId)) return;
   
   fCurrentSegmentation->NextPad();
 }
@@ -400,7 +400,7 @@ Int_t AliMUONGeometrySegmentation::MorePads(Int_t detElemId)
 // Iterate over pads - condition
 // ---
 
-  if (!Notify(detElemId)) return 0;
+  if (!OwnNotify(detElemId)) return 0;
   
   return fCurrentSegmentation->MorePads();
 }
@@ -415,7 +415,7 @@ Float_t AliMUONGeometrySegmentation::Distance2AndOffset(Int_t detElemId,
 // labelled by its channel numbers and a coordinate
 // ---
 
-  if (!Notify(detElemId)) return 0.;
+  if (!OwnNotify(detElemId)) return 0.;
 
   Float_t xl, yl, zl;
   fCurrentDetElement->Global2Local(xg, yg, zg, xl, yl, zl); 
@@ -433,7 +433,7 @@ void AliMUONGeometrySegmentation::GetNParallelAndOffset(Int_t detElemId,
 // CHECK
 // ---
 
-  if (!Notify(detElemId)) return;
+  if (!OwnNotify(detElemId)) return;
 
   fCurrentSegmentation->GetNParallelAndOffset(ix, iy, nparallel, offset);  
 }
@@ -448,7 +448,7 @@ void AliMUONGeometrySegmentation::Neighbours(Int_t detElemId,
 // Get next neighbours 
 // ---
 
-  if (!Notify(detElemId)) return;
+  if (!OwnNotify(detElemId)) return;
 
   fCurrentSegmentation->Neighbours(ix, iy, nlist, xlist, ylist);
 }
@@ -498,7 +498,7 @@ Int_t AliMUONGeometrySegmentation::Sector(Int_t detElemId, Int_t ix, Int_t iy)
 // Calculate sector from pad coordinates
 // ---
 
-  if (!Notify(detElemId)) return 0;
+  if (!OwnNotify(detElemId)) return 0;
 
   return fCurrentSegmentation->Sector(ix, iy);
 }
@@ -510,7 +510,7 @@ Int_t AliMUONGeometrySegmentation::Sector(Int_t detElemId,
 // Calculate sector from pad coordinates
 // ---
 
-  if (!Notify(detElemId)) return 0;
+  if (!OwnNotify(detElemId)) return 0;
 
   Float_t xl, yl, zl;
   fCurrentDetElement->Global2Local(xg, yg, zg, xl, yl, zl); 
@@ -526,7 +526,7 @@ void  AliMUONGeometrySegmentation::IntegrationLimits(Int_t detElemId,
 // Current integration limits 
 // ---
  
-  if (!Notify(detElemId)) return;
+  if (!OwnNotify(detElemId)) return;
 
   fCurrentSegmentation->IntegrationLimits(x1, x2, y1, y2);
 }
@@ -549,7 +549,7 @@ Int_t AliMUONGeometrySegmentation::SigGenCond(Int_t detElemId,
 //  boundary between two wires. 
 // ---
 
-  if (!Notify(detElemId)) return 0;
+  if (!OwnNotify(detElemId)) return 0;
 
   Float_t xl, yl, zl;
   fCurrentDetElement->Global2Local(xg, yg, zg, xl, yl, zl); 
@@ -566,7 +566,7 @@ void  AliMUONGeometrySegmentation::SigGenInit(Int_t detElemId,
 // From AliMUONGeometrySegmentationV01
 // ---
 
-  if (!Notify(detElemId)) return;
+  if (!OwnNotify(detElemId)) return;
 
   Float_t xl, yl, zl;
   fCurrentDetElement->Global2Local(xg, yg, zg, xl, yl, zl); 
@@ -599,13 +599,25 @@ void AliMUONGeometrySegmentation::GiveTestPoints(Int_t /*detElemId*/,
 }
 
 //______________________________________________________________________________
-void AliMUONGeometrySegmentation::Draw(Int_t detElemId, const char* opt) const
+void AliMUONGeometrySegmentation::Draw(const char* opt)
+{
+// Draws the segmentation zones for all detElemId 
+// ---
+
+  for (Int_t i=0; i<fDESegmentations->GetNofEntries(); i++) {
+     AliMUONVGeometryDESegmentation* segmentation
+       = (AliMUONVGeometryDESegmentation*)fDESegmentations->GetEntry(i);
+     segmentation->Draw(opt);
+  }   
+}
+
+//______________________________________________________________________________
+void AliMUONGeometrySegmentation::Draw(Int_t detElemId, const char* opt)
 {
-// Draw the segmentation zones.
-// (Called from AliMUON::BuildGeometry)
+// Draw the segmentation zones for a given detElemId.
 // ---
 
-  if (!Notify(detElemId)) return;
+  if (!OwnNotify(detElemId)) return;
 
   fCurrentSegmentation->Draw(opt);
 }
@@ -618,7 +630,7 @@ void AliMUONGeometrySegmentation::SetCorrFunc(Int_t detElemId,
 // From AliMUONGeometrySegmentationV01
 // ---
 
-  if (!Notify(detElemId)) return;
+  if (!OwnNotify(detElemId)) return;
 
   fCurrentSegmentation->SetCorrFunc(isec, func);
 }
@@ -630,7 +642,7 @@ TF1* AliMUONGeometrySegmentation::CorrFunc(Int_t detElemId, Int_t isec) const
 // From AliMUONGeometrySegmentationV01
 // ---
 
-  if (!Notify(detElemId)) return 0;
+  if (!OwnNotify(detElemId)) return 0;
 
   return  fCurrentSegmentation->CorrFunc(isec);
 } 

diff --git a/MUON/AliMUONGeometrySegmentation.h b/MUON/AliMUONGeometrySegmentation.h
index 6869c85a60b17da809ca7d6bcd94c1219e2c33d4..915157cec989c63432dc4c7f890f3a192b2d46fb 100644 (file)
--- a/MUON/AliMUONGeometrySegmentation.h
+++ b/MUON/AliMUONGeometrySegmentation.h
@@ -146,8 +146,8 @@ class AliMUONGeometrySegmentation : public TObject
     virtual void GiveTestPoints(Int_t detElemId,
                           Int_t& n, Float_t* xg, Float_t* yg) const;
                    // Test points for auto calibration
-    virtual void Draw(Int_t detElemId,
-                          const char *opt = "") const;
+    virtual void Draw(const char *opt = "");
+    virtual void Draw(Int_t detElemId, const char *opt = "");
                    // Draw the segmentation zones
 
     // Function for systematic corrections
@@ -166,7 +166,7 @@ class AliMUONGeometrySegmentation : public TObject
 
   private:
     // methods
-    Bool_t Notify(Int_t detElemId) const;
+    Bool_t OwnNotify(Int_t detElemId) const;
   
     // data members
     mutable  Int_t                           fCurrentDetElemId;  

diff --git a/MUON/AliMUONSt1Segmentation.cxx b/MUON/AliMUONSt1Segmentation.cxx
index f975bd38dbc43bd2c4b815ff28791a15b2f30b89..e3ed8ab7f2282fe62c16e95e090d55bbb5d5fbb0 100644 (file)
--- a/MUON/AliMUONSt1Segmentation.cxx
+++ b/MUON/AliMUONSt1Segmentation.cxx
@@ -574,7 +574,7 @@ void AliMUONSt1Segmentation::GiveTestPoints(Int_t& n, Float_t* x, Float_t* y) co
 }
 
 //______________________________________________________________________________
-void AliMUONSt1Segmentation::Draw(const char * /*opt*/) const
+void AliMUONSt1Segmentation::Draw(const char * /*opt*/)
 {
 // Draw the segmentation zones.
 // (Called from AliMUON::BuildGeometry)

diff --git a/MUON/AliMUONSt1Segmentation.h b/MUON/AliMUONSt1Segmentation.h
index dc766b3ac2784fa1c043dcbda032c049555e2429..99b2601ff676b25f5a4886a5a49414c944278aaa 100644 (file)
--- a/MUON/AliMUONSt1Segmentation.h
+++ b/MUON/AliMUONSt1Segmentation.h
@@ -124,7 +124,7 @@ class AliMUONSt1Segmentation : public AliSegmentation
     
     virtual void GiveTestPoints(Int_t& n, Float_t* x, Float_t* y) const;
                    // Test points for auto calibration
-    virtual void Draw(const char *opt = "") const;
+    virtual void Draw(const char *opt = "");
                    // Draw the segmentation zones
 
     // Function for systematic corrections