Memory leak corrected (Ch. Klein-Boesing)

[u/mrichter/AliRoot.git] / STEER / AliAODRedCov.h

diff --git a/STEER/AliAODRedCov.h b/STEER/AliAODRedCov.h
index eca4093d332d08137f58e2213fc137544961f2bb..cb4c6207e0b614a62cfecbdaf65878bc0eb70e2c 100644 (file)
--- a/STEER/AliAODRedCov.h
+++ b/STEER/AliAODRedCov.h
@@ -11,6 +11,7 @@
 //-------------------------------------------------------------------------
 
 #include <Rtypes.h>
+#include <TMath.h>
 
 template <Int_t N> class AliAODRedCov {
 
@@ -33,19 +34,108 @@ template <Int_t N> class AliAODRedCov {
    // Pz fOdia[10]  fOdia[11]  fOdia[12]  fOdia[13]  fOdia[14]  fDiag[ 5]
    //
 
-   public:
-   AliAODRedCov() {}
-   virtual ~AliAODRedCov() {}
-   template <class T> void GetCovMatrix(T *cmat) const;
-   template <class T> void SetCovMatrix(T *cmat);
+ public:
+  AliAODRedCov() {}
+  virtual ~AliAODRedCov() {}
+  template <class T> void GetCovMatrix(T *cmat) const;
+  template <class T> void SetCovMatrix(T *cmat);
+  
+ private:
+  Double32_t   fDiag[N];         // Diagonal elements
+  Double32_t   fODia[N*(N-1)/2]; // [-1, 1,8] 8 bit precision for off diagonal elements
+  
+  ClassDef(AliAODRedCov,1)
 
-   private:
-   Double32_t   fDiag[N];         // Diagonal elements
-   Double32_t   fODia[N*(N-1)/2]; // [-1, 1,8] 8 bit precision for off diagonal elements
+ };
 
-   ClassDef(AliAODRedCov,1)
+//Cint craps out here, we protect this part
+#if !defined(__CINT__) && !defined(__MAKECINT__)
 
- };
+//#define DEBUG
 
+//______________________________________________________________________________
+template <Int_t N> template <class T> inline void AliAODRedCov<N>::GetCovMatrix(T *cmat) const
+{
+  //
+  // Returns the external cov matrix
+  //
 
+  for(Int_t i=0; i<N; ++i) {
+    // Off diagonal elements
+    for(Int_t j=0; j<i; ++j) {
+      cmat[i*(i+1)/2+j] = (fDiag[j] >= 0. && fDiag[i] >= 0.) ? fODia[(i-1)*i/2+j]*fDiag[j]*fDiag[i]: -999.;
+#ifdef DEBUG
+      printf("cmat[%2d] = fODia[%2d]*fDiag[%2d]*fDiag[%2d] = %f\n",
+            i*(i+1)/2+j,(i-1)*i/2+j,j,i,cmat[i*(i+1)/2+j]);
+#endif
+    }
+
+    // Diagonal elements
+    cmat[i*(i+1)/2+i] = (fDiag[i] >= 0.) ? fDiag[i]*fDiag[i] : -999.;
+#ifdef DEBUG
+    printf("cmat[%2d] = fDiag[%2d]*fDiag[%2d] = %f\n",
+          i*(i+1)/2+i,i,i,cmat[i*(i+1)/2+i]);
+#endif
+  }
+}
+
+
+//______________________________________________________________________________
+template <Int_t N> template <class T> inline void AliAODRedCov<N>::SetCovMatrix(T *cmat)
+{
+  //
+  // Sets the external cov matrix
+  //
+
+  if(cmat) {
+    
+#ifdef DEBUG
+    for (Int_t i=0; i<(N*(N+1))/2; i++) {
+      printf("cmat[%d] = %f\n", i, cmat[i]);
+    }
+#endif
+    
+    // Diagonal elements first
+    for(Int_t i=0; i<N; ++i) {
+      fDiag[i] = (cmat[i*(i+1)/2+i] >= 0.) ? TMath::Sqrt(cmat[i*(i+1)/2+i]) : -999.;
+#ifdef DEBUG
+       printf("fDiag[%2d] = TMath::Sqrt(cmat[%2d]) = %f\n",
+              i,i*(i+1)/2+i, fDiag[i]);
+#endif
+  }
+  
+  // ... then the ones off diagonal
+  for(Int_t i=0; i<N; ++i) 
+    // Off diagonal elements
+    for(Int_t j=0; j<i; ++j) {
+      fODia[(i-1)*i/2+j] = (fDiag[i] > 0. && fDiag[j] > 0.) ? cmat[i*(i+1)/2+j]/(fDiag[j]*fDiag[i]) : 0.;
+      // check for division by zero (due to diagonal element of 0) and for fDiag != -999. (due to negative input diagonal element).
+      if (fODia[(i-1)*i/2+j]>1.) { // check upper boundary
+#ifdef DEBUG
+       printf("out of bounds: %f\n", fODia[(i-1)*i/2+j]);
+#endif
+       fODia[(i-1)*i/2+j] = 1.;
+      }
+      if (fODia[(i-1)*i/2+j]<-1.) { // check lower boundary
+#ifdef DEBUG
+       printf("out of bounds: %f\n", fODia[(i-1)*i/2+j]);
+#endif
+       fODia[(i-1)*i/2+j] = -1.; 
+      }
+#ifdef DEBUG
+       printf("fODia[%2d] = cmat[%2d]/(fDiag[%2d]*fDiag[%2d]) = %f\n",
+              (i-1)*i/2+j,i*(i+1)/2+j,j,i,fODia[(i-1)*i/2+j]); 
+#endif
+    }
+  } else {
+    for(Int_t i=0; i< N; ++i) fDiag[i]=-999.;
+    for(Int_t i=0; i< N*(N-1)/2; ++i) fODia[i]=0.;
+  }
+
+  return;
+}
+
+#undef DEBUG
+
+#endif
 #endif