Mario's change of SubStave -> HalfStave, to be reverted

[u/mrichter/AliRoot.git] / ITS / UPGRADE / AliITSUSegmentationPix.cxx

diff --git a/ITS/UPGRADE/AliITSUSegmentationPix.cxx b/ITS/UPGRADE/AliITSUSegmentationPix.cxx
index 12651991e45894a236e9b665bf3cf0ac7735c795..05a267c41b500b1047ce465149baf4f94a80d2bb 100644 (file)
--- a/ITS/UPGRADE/AliITSUSegmentationPix.cxx
+++ b/ITS/UPGRADE/AliITSUSegmentationPix.cxx
@@ -27,7 +27,7 @@ using namespace TMath;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Segmentation class for pixels                                                                          //
-// Questions to solve: are guardrings needed and do they belong to the sensor or to the module in TGeo    //
+// Questions to solve: are guardrings needed and do they belong to the sensor or to the chip in TGeo    //
 //                     At the moment assume that the local coord syst. is located at bottom left corner   //
 //                     of the ACTIVE matrix. If the guardring to be accounted in the local coords, in     //
 //                     the Z and X conversions one needs to first subtract the  fGuardLft and fGuardBot   //
@@ -70,7 +70,7 @@ AliITSUSegmentationPix::AliITSUSegmentationPix(UInt_t id, int nchips,int ncol,in
   ,fDiodShidtMatZ(0)
 {
   // Default constructor, sizes in cm
-  if (nchips) SetUniqueID( AliITSUGeomTGeo::ComposeDetTypeID(id) );
+  if (nchips) SetUniqueID( AliITSUGeomTGeo::ComposeChipTypeID(id) );
   fChipDZ = (fNColPerChip-2)*fPitchZ + fPitchZLftCol + fPitchZRgtCol;;
   fDxActive = fNRow*fPitchX;
   fDzActive = fNChips*fChipDZ;
@@ -80,6 +80,15 @@ AliITSUSegmentationPix::AliITSUSegmentationPix(UInt_t id, int nchips,int ncol,in
   //
 }
 
+//_____________________________________________________________________________RS
+AliITSUSegmentationPix::~AliITSUSegmentationPix()
+{
+  // d-tor
+  delete[] fDiodShidtMatX;
+  delete[] fDiodShidtMatZ;
+}
+
+
 //_____________________________________________________________________________RS
 void AliITSUSegmentationPix::GetPadIxz(Float_t x,Float_t z,Int_t &ix,Int_t &iz) const 
 {
@@ -550,11 +559,11 @@ void AliITSUSegmentationPix::SetDiodShiftMatrix(Int_t nrow,Int_t ncol, const Dou
 }
 
 //______________________________________________________________________
-void AliITSUSegmentationPix::Print(Option_t* option) const
+void AliITSUSegmentationPix::Print(Option_t* /*option*/) const
 {
   // print itself
   const double kmc=1e4;
-  printf("Segmentation %d: Active Size: DX: %.1f DZ: %.1f DY: %.1f | Pitch: X:%.1f Z:%.1f\n",
+  printf("Segmentation %d: Active Size: DX: %.1f DY: %.1f DZ: %.1f | Pitch: X:%.1f Z:%.1f\n",
         GetUniqueID(),kmc*DxActive(),kmc*Dy(),kmc*DzActive(),kmc*Dpx(1),kmc*Dpz(1));
   printf("Passive Edges: Bottom: %.1f Right: %.1f Top: %.1f Left: %.1f -> DX: %.1f DZ: %.1f Shift: x:%.1f z:%.1f\n",
         kmc*fGuardBot,kmc*fGuardRgt,kmc*fGuardTop,kmc*fGuardLft,kmc*Dx(),kmc*Dz(),kmc*fShiftXLoc,kmc*fShiftZLoc);