From: cvetan <cvetan@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Mon, 12 Mar 2007 14:57:06 +0000 (+0000)
Subject: Next version
X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=67408a9fbddc0250d052b79a04261197958bf5aa;p=u%2Fmrichter%2FAliRoot.git

Next version
---

diff --git a/STEER/AliClusterTGeo.cxx b/STEER/AliClusterTGeo.cxx
index a91c041586c..a4c3e84d97b 100644
--- a/STEER/AliClusterTGeo.cxx
+++ b/STEER/AliClusterTGeo.cxx
@@ -78,6 +78,31 @@ AliClusterTGeo::AliClusterTGeo(UShort_t volId,
     fTracks[0]=fTracks[1]=fTracks[2]=-3141593; 
 }
 
+//______________________________________________________________________________
+AliClusterTGeo::AliClusterTGeo(UShort_t volId,
+			       Float_t x, Float_t y, Float_t z,
+			       Float_t sy2, Float_t sz2, Float_t syz,
+			       const Int_t *lab):
+  TObject(),
+  fX(x),
+  fY(y),
+  fZ(z),
+  fSigmaY2(sy2),
+  fSigmaZ2(sz2),
+  fSigmaYZ(syz),
+  fVolumeId(volId),
+  fIsMisaligned(kFALSE)
+{
+  // Constructor
+  if (lab) {
+    fTracks[0] = lab[0];
+    fTracks[1] = lab[1];
+    fTracks[2] = lab[2];
+  }
+  else
+    fTracks[0]=fTracks[1]=fTracks[2]=-3141593; 
+}
+
 //______________________________________________________________________________
 AliClusterTGeo::AliClusterTGeo(const AliClusterTGeo& cluster):
   TObject(cluster),
diff --git a/STEER/AliClusterTGeo.h b/STEER/AliClusterTGeo.h
index e5de6350ba3..85d295b1ed2 100644
--- a/STEER/AliClusterTGeo.h
+++ b/STEER/AliClusterTGeo.h
@@ -25,6 +25,12 @@ class AliClusterTGeo : public TObject {
  public:
   AliClusterTGeo();
   AliClusterTGeo(UShort_t volId, const Float_t *hit, Float_t x = 0, Float_t sigyz = 0, const Int_t *lab = NULL);
+  AliClusterTGeo(UShort_t volId,
+		 Float_t x, Float_t y, Float_t z,
+		 Float_t sy2, Float_t sz2, Float_t syz,
+		 const Int_t *lab = NULL);
+  AliClusterTGeo(const AliClusterTGeo& cluster);
+  AliClusterTGeo &operator=(const AliClusterTGeo& cluster);
   virtual ~AliClusterTGeo() {;}
 
   Int_t    GetLabel(Int_t i) const {return fTracks[i];}
@@ -33,6 +39,7 @@ class AliClusterTGeo : public TObject {
   Float_t  GetZ()            const {return fZ;}
   Float_t  GetSigmaY2()      const {return fSigmaY2;}
   Float_t  GetSigmaZ2()      const {return fSigmaZ2;}
+  Float_t  GetSigmaYZ()      const {return fSigmaYZ;}
   UShort_t GetVolumeId()     const {return fVolumeId;}
 
   virtual void Use(Int_t = 0) {;}
@@ -43,15 +50,20 @@ class AliClusterTGeo : public TObject {
 
   Bool_t   Misalign();
 
+  void     SetLabel(Int_t lab,Int_t i)
+  { if (i>0 && i<3) fTracks[i] = lab;}
+  void     SetY(Float_t y) {fY = y;}
+  void     SetZ(Float_t z) {fZ = z;}
+  void     SetSigmaY2(Float_t sigy2) {fSigmaY2 = sigy2;}
+  void     SetSigmaZ2(Float_t sigz2) {fSigmaZ2 = sigz2;}
+
  protected:
 
-  AliClusterTGeo(const AliClusterTGeo& cluster);
-  AliClusterTGeo &operator=(const AliClusterTGeo& cluster);
+  const TGeoHMatrix*   GetTracking2LocalMatrix() const;
 
  private:
 
   TGeoHMatrix*         GetMatrix(Bool_t original = kFALSE) const;
-  const TGeoHMatrix*   GetTracking2LocalMatrix() const;
   TGeoPNEntry*         GetPNEntry() const;
 
   Int_t    fTracks[3];//MC labels