Coverity

[u/mrichter/AliRoot.git] / EVE / EveDet / AliEveEMCALSModuleData.cxx

diff --git a/EVE/EveDet/AliEveEMCALSModuleData.cxx b/EVE/EveDet/AliEveEMCALSModuleData.cxx
index 89a92d93981be1000bbc2cccce8868e07b79b5fb..d959d08492d4f4faee2b5d8115e3977187fc6774 100644 (file)
--- a/EVE/EveDet/AliEveEMCALSModuleData.cxx
+++ b/EVE/EveDet/AliEveEMCALSModuleData.cxx
@@ -1,39 +1,35 @@
-//*************************************************************************
+//
 // EMCAL event display
 // Store the data related to each Super Module (SM)
 // Possible storage of hits, digits and clusters per SM
 //
 //  Author: Magali Estienne (magali.estienne@cern.ch)
 //  June 30 2008
-//*************************************************************************
-
-#include <Riostream.h>
-#include <vector>
+//
 
 #include "AliEveEMCALSModuleData.h"
 
-#include <AliEMCALGeometry.h>
-
-#include <TVector2.h>
-#include <TVectorT.h>
-#include <TClonesArray.h>
-#include <TGeoNode.h>
 #include <TGeoBBox.h>
-#include <TGeoMatrix.h>
 
-#include <EveBase/AliEveEventManager.h>
+class Riostream;
+class TClonesArray;
+class TGeoNode;
+class TGeoMatrix;
+class AliEMCALGeometry;
+class TVector2;
+class AliEveEventManager;
 
 ClassImp(AliEveEMCALSModuleData)
 
-Float_t AliEveEMCALSModuleData::fSModuleBigBox0 = 0.;
-Float_t AliEveEMCALSModuleData::fSModuleBigBox1 = 0.;
-Float_t AliEveEMCALSModuleData::fSModuleBigBox2 = 0.;
-Float_t AliEveEMCALSModuleData::fSModuleSmallBox0 = 0.;
-Float_t AliEveEMCALSModuleData::fSModuleSmallBox1 = 0.;
-Float_t AliEveEMCALSModuleData::fSModuleSmallBox2 = 0.;
-Float_t AliEveEMCALSModuleData::fSModuleCenter0 = 0.;
-Float_t AliEveEMCALSModuleData::fSModuleCenter1 = 0.;
-Float_t AliEveEMCALSModuleData::fSModuleCenter2 = 0.;
+Float_t AliEveEMCALSModuleData::fgSModuleBigBox0 = 0.;
+Float_t AliEveEMCALSModuleData::fgSModuleBigBox1 = 0.;
+Float_t AliEveEMCALSModuleData::fgSModuleBigBox2 = 0.;
+Float_t AliEveEMCALSModuleData::fgSModuleSmallBox0 = 0.;
+Float_t AliEveEMCALSModuleData::fgSModuleSmallBox1 = 0.;
+Float_t AliEveEMCALSModuleData::fgSModuleSmallBox2 = 0.;
+Float_t AliEveEMCALSModuleData::fgSModuleCenter0 = 0.;
+Float_t AliEveEMCALSModuleData::fgSModuleCenter1 = 0.;
+Float_t AliEveEMCALSModuleData::fgSModuleCenter2 = 0.;
 
 //______________________________________________________________________________
 AliEveEMCALSModuleData::AliEveEMCALSModuleData(Int_t sm,AliEMCALGeometry* geom, TGeoNode* node, TGeoHMatrix* m) :
@@ -47,6 +43,7 @@ AliEveEMCALSModuleData::AliEveEMCALSModuleData(Int_t sm,AliEMCALGeometry* geom,
   fNDigits(0),
   fNClusters(0),
   fNHits(0),
+  fPhiTileSize(0), fEtaTileSize(0),
   fHitArray(0),
   fDigitArray(0),
   fClusterArray(0),
@@ -73,6 +70,7 @@ AliEveEMCALSModuleData::AliEveEMCALSModuleData(Int_t sm,AliEMCALGeometry* geom,
   fNDigits(esmdata.fNDigits),
   fNClusters(esmdata.fNClusters),
   fNHits(esmdata.fNHits),
+  fPhiTileSize(esmdata.fPhiTileSize), fEtaTileSize(esmdata.fEtaTileSize),
   fHitArray(esmdata.fHitArray),
   fDigitArray(esmdata.fDigitArray),
   fClusterArray(esmdata.fClusterArray),
@@ -146,23 +144,21 @@ void AliEveEMCALSModuleData::Init(Int_t sm)
   fEtaTileSize = fGeom->GetPhiTileSize();
 
   TGeoBBox* bbbox = (TGeoBBox*) fNode->GetDaughter(0) ->GetVolume()->GetShape();
-  bbbox->Dump();
   TGeoBBox* sbbox = (TGeoBBox*) fNode->GetDaughter(10)->GetVolume()->GetShape();
-  sbbox->Dump();
 
   fMatrix = (TGeoMatrix*) fNode->GetDaughter(sm)->GetMatrix();
 
   if(sm<fNsmfull)
     {
-      fSModuleBigBox0 = bbbox->GetDX();
-      fSModuleBigBox1 = bbbox->GetDY();
-      fSModuleBigBox2 = bbbox->GetDZ();
+      fgSModuleBigBox0 = bbbox->GetDX();
+      fgSModuleBigBox1 = bbbox->GetDY();
+      fgSModuleBigBox2 = bbbox->GetDZ();
     }
   else 
     {
-      fSModuleSmallBox0 = sbbox->GetDX();
-      fSModuleSmallBox1 = sbbox->GetDY();
-      fSModuleSmallBox2 = sbbox->GetDZ();
+      fgSModuleSmallBox0 = sbbox->GetDX();
+      fgSModuleSmallBox1 = sbbox->GetDY();
+      fgSModuleSmallBox2 = sbbox->GetDZ();
     }
 }
 
@@ -174,7 +170,7 @@ void AliEveEMCALSModuleData::RegisterDigit(Int_t AbsId, Int_t isupMod, Double_t
   // Add a digit to this SM
   //
 
-  vector<Double_t> bufDig(6);
+  std::vector<Double_t> bufDig(6);
   bufDig[0] = AbsId;
   bufDig[1] = isupMod;
   bufDig[2] = iamp;
@@ -195,7 +191,7 @@ void AliEveEMCALSModuleData::RegisterHit(Int_t AbsId, Int_t isupMod, Double_t ia
   // Add a hit to this SM
   //
 
-  vector<Float_t> bufHit(6);
+  std::vector<Float_t> bufHit(6);
   bufHit[0] = AbsId;
   bufHit[1] = isupMod;
   bufHit[2] = iamp;
@@ -216,7 +212,7 @@ void AliEveEMCALSModuleData::RegisterCluster(Int_t isupMod, Double_t iamp, Doubl
   // Add a cluster to this SM
   //
 
-  vector<Double_t> bufClu(5);
+  std::vector<Double_t> bufClu(5);
   bufClu[0] = isupMod;
   bufClu[1] = iamp;
   bufClu[2] = ix;