M AliTPCAnalysisTaskcalib.cxx - Chckeing the friend status bit

[u/mrichter/AliRoot.git] / EMCAL / AliEMCALTriggerBoard.cxx

diff --git a/EMCAL/AliEMCALTriggerBoard.cxx b/EMCAL/AliEMCALTriggerBoard.cxx
index 2eb739e43c2ea61d93de2969bdec1a19c8b2bf64..f7354e50a7e3be012faf434c289857d2c031b7ce 100644 (file)
--- a/EMCAL/AliEMCALTriggerBoard.cxx
+++ b/EMCAL/AliEMCALTriggerBoard.cxx
@@ -23,9 +23,9 @@ Author: R. GUERNANE LPSC Grenoble CNRS/IN2P3
 
 #include "AliEMCALTriggerBoard.h"
 #include "AliEMCALTriggerPatch.h"
+#include "AliLog.h"
 
 #include <TClonesArray.h>
-
 #include <iostream>
 #include <cstdlib>
 
@@ -54,34 +54,38 @@ fSubRegionSize( new TVector2() ),
 fPatchSize(     new TVector2() ),
 fPatches( new TClonesArray("AliEMCALTriggerPatch",10) )
 {
-   fRegion = (int**)malloc( (int)fRegionSize->X() * sizeof( int* ) );  
-
-   if (!fRegion) printf("Error: malloc could not allocate %d bytes for fRegion\n",
-                        int(fRegionSize->X() * sizeof( int* )));
-
-      fMap = (int**)malloc( (int)fRegionSize->X() * sizeof( int* ) );
-
-      if (!fMap) printf("Error: malloc could not allocate %d bytes for fMap\n",
-                        int(fRegionSize->X() * sizeof( int* )));
-
-   for (Int_t i=0;i<fRegionSize->X();i++)
-   {
+  fRegion = (int**)malloc( (int)fRegionSize->X() * sizeof( int* ) );  
+  
+  if (!fRegion) printf("Error: malloc could not allocate %d bytes for fRegion\n",
+                       int(fRegionSize->X() * sizeof( int* )));
+  
+  fMap = (int**)malloc( (int)fRegionSize->X() * sizeof( int* ) );
+  
+  if (!fMap) printf("Error: malloc could not allocate %d bytes for fMap\n",
+                    int(fRegionSize->X() * sizeof( int* )));
+  
+  for (Int_t i=0;i<fRegionSize->X();i++)
+  {
+    if(fRegion){
       fRegion[i] = (int*)malloc( (int)fRegionSize->Y() * sizeof( int ) );
-      
+    
       if (!fRegion[i]) printf("Error: malloc could not allocate %d bytes for fRegion[%d]\n",
-                              i,int(fRegionSize->Y() * sizeof( int )));
-
-         fMap[i] = (int*)malloc( (int)fRegionSize->Y() * sizeof( int ) );
-
-            if (!fMap[i]) printf("Error: malloc could not allocate %d bytes for fMap[%d]\n",
-                              i,int(fRegionSize->Y() * sizeof( int )));
-   }
-
+                            i,int(fRegionSize->Y() * sizeof( int )));
+    }
+    if(fMap){
+      fMap[i] = (int*)malloc( (int)fRegionSize->Y() * sizeof( int ) );
+    
+      if (!fMap[i]) printf("Error: malloc could not allocate %d bytes for fMap[%d]\n",
+                           i,int(fRegionSize->Y() * sizeof( int )));
+    }
+  }
+  
        // Initialize region matrix
        ZeroRegion();
-       
+       if(fMap){
        for (int i=0; i<fRegionSize->X(); ++i)
                for (int j=0; j<fRegionSize->Y(); ++j) fMap[i][j] = 0;
+  }
 }
 
 //_______________
@@ -89,26 +93,34 @@ AliEMCALTriggerBoard::~AliEMCALTriggerBoard()
 {
    for (Int_t i=0;i<fRegionSize->X();i++) 
    {
-      if (fRegion[i]) {delete fRegion[i]; fRegion[i] = 0;}
-      if (   fMap[i]) {delete    fMap[i];    fMap[i] = 0;}
+      if (fRegion[i]) {free(fRegion[i]); fRegion[i] = 0;}
+      if (   fMap[i]) {free(fMap[i]);    fMap[i] = 0;}
    }
    
-   delete [] fRegion; fRegion = 0x0;
-   delete []    fMap;    fMap = 0x0;
+   free(fRegion); fRegion = 0x0;
+   free(fMap);    fMap = 0x0;
    
    if(fPatches)fPatches->Delete();
+   
    delete fPatches;
 }
 
 //_______________
 void AliEMCALTriggerBoard::ZeroRegion()
 {
-       //
-       for (Int_t i=0;i<int(fRegionSize->X());i++) for (Int_t j=0;j<int(fRegionSize->Y());j++) fRegion[i][j] = 0;
+       // Initilize fRegion
+  
+  if(fRegion){
+    for (Int_t i=0;i<int(fRegionSize->X());i++) for (Int_t j=0;j<int(fRegionSize->Y());j++) fRegion[i][j] = 0;
+  }
+  else {
+    AliFatal("fRegion was not previously initialized");
+  }
+
 }
 
 //_______________
-void AliEMCALTriggerBoard::SlidingWindow( L1TriggerType_t /*type*/, Int_t thres )
+void AliEMCALTriggerBoard::SlidingWindow(TriggerType_t type, Int_t thres, Int_t time)
 {
        //
        Int_t ipatch = 0;
@@ -129,12 +141,12 @@ void AliEMCALTriggerBoard::SlidingWindow( L1TriggerType_t /*type*/, Int_t thres
                                }
                        }
 
+                       if ( type == kL1Jet ) sum /= 4; // truncate patch sum for jet case
+
                        if ( sum > thres ) 
                        {
-                               //if ( type == kJet ) sum /= 4; // truncate patch sum for jet case
-                               
                                new((*fPatches)[fPatches->GetLast()+1]) 
-                                               AliEMCALTriggerPatch( int(i/fSubRegionSize->X()), int(j/fSubRegionSize->Y()), int(sum) );
+                                               AliEMCALTriggerPatch(int(i/fSubRegionSize->X()), int(j/fSubRegionSize->Y()), int(sum), time);
                        }
                }
        }