Updating info for ACORDE and TRD

[u/mrichter/AliRoot.git] / TRD / AliTRDarrayDictionary.cxx

diff --git a/TRD/AliTRDarrayDictionary.cxx b/TRD/AliTRDarrayDictionary.cxx
index 09c1514ed10b527fd2b83cce3ac7c4875db67e31..3d5dfeeaed1329bf6ce9eb23fd83760e1e1424f0 100644 (file)
--- a/TRD/AliTRDarrayDictionary.cxx
+++ b/TRD/AliTRDarrayDictionary.cxx
@@ -28,6 +28,7 @@
 
 #include "AliTRDarrayDictionary.h"
 #include "AliTRDfeeParam.h"
+#include "AliLog.h"
 
 ClassImp(AliTRDarrayDictionary)
 
@@ -43,7 +44,7 @@ AliTRDarrayDictionary::AliTRDarrayDictionary()
                       ,fNtime(0)
                       ,fNDdim(0)
                       ,fDictionary(0)
-                      ,fFlag(kTRUE)
+                      ,fFlag(kFALSE)
 {
   //
   // AliTRDarrayDictionary default contructor
@@ -63,8 +64,7 @@ AliTRDarrayDictionary::AliTRDarrayDictionary(Int_t nrow, Int_t ncol, Int_t ntime
                       ,fNtime(0)
                      ,fNDdim(0)
                      ,fDictionary(0)
-                      ,fFlag(kTRUE)
-
+                      ,fFlag(kFALSE)
 {
   //
   // AliTRDarrayDictionary contructor
@@ -106,11 +106,8 @@ AliTRDarrayDictionary::~AliTRDarrayDictionary()
   //   AliTRDarrayDictionary destructor
   //
 
-  if(fDictionary)
-    {
-      delete [] fDictionary;
-      fDictionary=0;
-    }
+  delete [] fDictionary;
+  fDictionary=0;
 
 }
 
@@ -228,10 +225,6 @@ void AliTRDarrayDictionary::Compress()
         }
       newDim=fNDdim-counter;   //Size of the compressed array
 
-      //Set the flag if the array has no data
-      if(newDim==1)
-       fFlag=kFALSE;
-
       //Fill the buffer of the compressed array
       Int_t* buffer = new Int_t[newDim];
       Int_t counterTwo=0;
@@ -268,9 +261,8 @@ void AliTRDarrayDictionary::Compress()
     
       delete [] longArr;
       longArr=0;
-
     }
-
+  fFlag=kFALSE; // This way it can be expanded afterwards
 }
 
 //________________________________________________________________________________
@@ -280,30 +272,41 @@ void AliTRDarrayDictionary::Expand()
   //  Expand the array
   //  
 
+  if(fNDdim==0)
+    {
+      AliError("Called expand with dimension zero");
+      return;    
+    }
+
+
   Int_t dimexp=0;
+  
+//   if(WasExpandCalled()) 
+//     return;
 
-  if(!HasData()) //if the array has no data (only -1's)
-    {
-      if(fDictionary&&fNDdim==1)
-       { 
-         dimexp = -fDictionary[0];     
-         delete [] fDictionary;
-         fDictionary=0;
-         fDictionary = new Int_t[dimexp];
-         fNDdim = dimexp;
-         // Re-initialize the array
-         memset(fDictionary,-1,sizeof(Int_t)*dimexp);
-       }
+  if(fNDdim==fNrow*fNumberOfChannels*fNtime)
+    return;
+
+  if(fDictionary&&fNDdim==1)
+    { 
+      dimexp = -fDictionary[0];        
+      delete [] fDictionary;
+      fDictionary=0;
+      fDictionary = new Int_t[dimexp];
+      fNDdim = dimexp;
+      // Re-initialize the array
+      memset(fDictionary,-1,sizeof(Int_t)*dimexp);
+      fFlag=kTRUE; // Not expand again
       return;
     }
 
-  UShort_t *longArr = new UShort_t[fNDdim];
+  Int_t *longArr = new Int_t[fNDdim];
   if(longArr && fDictionary)
     {
       //Initialize the array
-      memset(longArr,0,sizeof(UShort_t)*fNDdim);
+      memset(longArr,0,sizeof(Int_t)*fNDdim);
 
-      UShort_t r2=0;
+      Int_t r2=0;
       for(Int_t i=0; i<fNDdim;i++)
         {
           if((fDictionary[i]<0)&&(fDictionary[i]!=-1))  
@@ -327,11 +330,10 @@ void AliTRDarrayDictionary::Expand()
       Int_t contaexp =0;    
       Int_t h=0;
       Int_t* bufferE = new Int_t[dimexp];
-      memset(bufferE,-1,sizeof(Int_t)*dimexp);
 
       if(bufferE)
        {
-
+         memset(bufferE,-1,sizeof(Int_t)*dimexp);
           for(Int_t i=0; i<dimexp; i++)
             {
               if(fDictionary[contaexp]>=-1)  
@@ -356,6 +358,7 @@ void AliTRDarrayDictionary::Expand()
     {
       delete [] longArr; 
     }
+  fFlag=kTRUE; // Not expand again
 
 }
 //________________________________________________________________________________