Fix last coverity defects (Jochen)

[u/mrichter/AliRoot.git] / FMD / AliFMDPattern.h

diff --git a/FMD/AliFMDPattern.h b/FMD/AliFMDPattern.h
index b29c5e037aa08620e9b6843256304b7c1dbefee1..e456a05856440bb5aa0e7f3830cbdb969aabb609 100644 (file)
--- a/FMD/AliFMDPattern.h
+++ b/FMD/AliFMDPattern.h
@@ -23,6 +23,7 @@
 #include <TObjArray.h>
 // #include <TGraph.h>
 #include <TLatex.h>
+#include "AliPhysicsSelection.h"
 #include <TLine.h>
 class TCanvas;
 class TPad;
@@ -79,11 +80,16 @@ public:
   private:
     /** Copy constructor 
        - Not implemented. */ 
-    AliFMDPatternDetector(const AliFMDPattern&);
+    AliFMDPatternDetector(const AliFMDPatternDetector&);
     /** Assignement operator 
        -- Not implemented */
     AliFMDPatternDetector& operator=(const AliFMDPatternDetector&);
-
+    void CopyShapes(TObjArray& input, TObjArray& own, 
+                   Double_t ang=0, Double_t fx=1, Double_t fy=1);
+    /** Our own cache of shapes */
+    TObjArray fInners;
+    /** Our own cache of shapes */
+    TObjArray fOuters;
   };
   
   
@@ -107,6 +113,11 @@ public:
   /** Assignement operator 
       -- Not implemented */
   AliFMDPattern& operator=(const AliFMDPattern&);
+  virtual void AddMarker(Float_t x, Float_t y, Float_t z, 
+                        TObject* o, Float_t s, Float_t min, Float_t max)
+  {
+    AliFMDDisplay::AddMarker(x, y, z, o, s, min, max);
+  }
   /** Add a marker to the display
       @param det Detector
       @param rng Ring
@@ -116,7 +127,8 @@ public:
       @param s   Signal 
       @param max Maximum of signal */
   virtual void AddMarker(UShort_t det, Char_t rng, UShort_t sec,
-                        UShort_t str, TObject* o, Float_t s, Float_t max);
+                        UShort_t str, TObject* o, Float_t s, 
+                        Float_t min, Float_t max);
   /** @param hit Hit to process */
   virtual Bool_t ProcessHit(AliFMDHit* hit, TParticle*);
   /** Re-draw the patterns */
@@ -153,6 +165,12 @@ public:
   TLine  fLine;                // Just a line 
   TLatex fTotal;       // Total in FMD
 
+  Double_t fFMD1Area;   // 
+  Double_t fFMD2Area;   // 
+  Double_t fFMD3Area;   // 
+
+  AliPhysicsSelection* fPhysicsSelection;
+  
   ClassDef(AliFMDPattern,0) // Display FMD data as hit-patterns. 
 };