Comments.

[u/mrichter/AliRoot.git] / EVE / Alieve / ITSModule.cxx

diff --git a/EVE/Alieve/ITSModule.cxx b/EVE/Alieve/ITSModule.cxx
index f4afeac5ddaa73cf8bf4710cb45691821e0abed7..52ea4f25b9cf6b63184a4d0884bea3fe7552e517 100644 (file)
--- a/EVE/Alieve/ITSModule.cxx
+++ b/EVE/Alieve/ITSModule.cxx
@@ -62,12 +62,12 @@ void ITSModule::InitStatics(ITSDigitsInfo* info)
 
   {
     Float_t dx = info->fSegSPD->Dx()*0.00005;
-    Float_t dz = 3.48; 
+    Float_t dz = 3.50; 
 
     fgSPDFrameBox = new FrameBox();
     fgSPDFrameBox->SetAAQuadXZ(-dx, 0, -dz, 2*dx, 2*dz);
     fgSPDFrameBox->SetFrameColor((Color_t) 31);
-    fgSPDPalette  = new RGBAPalette(0, 1);
+    fgSPDPalette  = new RGBAPalette(info->fSPDMinVal,info->fSPDMaxVal);
   }
 
   {
@@ -77,7 +77,7 @@ void ITSModule::InitStatics(ITSDigitsInfo* info)
     fgSDDFrameBox = new FrameBox();
     fgSDDFrameBox->SetAAQuadXZ(-dx, 0, -dz, 2*dx, 2*dz);
     fgSDDFrameBox->SetFrameColor((Color_t) 32);
-    fgSDDPalette  = new RGBAPalette(5, 80);
+    fgSDDPalette  = new RGBAPalette(info->fSDDMinVal,info->fSDDMaxVal);
     fgSDDPalette->SetLimits(0, 512); // Set proper ADC range.
   }
 
@@ -88,7 +88,7 @@ void ITSModule::InitStatics(ITSDigitsInfo* info)
     fgSSDFrameBox = new FrameBox();
     fgSSDFrameBox->SetAAQuadXZ(-dx, 0, -dz, 2*dx, 2*dz);
     fgSSDFrameBox->SetFrameColor((Color_t) 33);
-    fgSSDPalette  = new RGBAPalette(2, 100);
+    fgSSDPalette  = new RGBAPalette(info->fSSDMinVal,info->fSSDMaxVal);
     fgSSDPalette->SetLimits(0, 1024); // Set proper ADC range.
   }
 
@@ -106,7 +106,7 @@ void ITSModule::SetDigitsInfo(ITSDigitsInfo* info)
 
 /**************************************************************************/
 
-void ITSModule::SetID(Int_t gid)
+void ITSModule::SetID(Int_t gid, Bool_t trans)
 {
   static const Exc_t eH("ITSModule::SetID ");
 
@@ -165,7 +165,7 @@ void ITSModule::SetID(Int_t gid)
     SetName(symname);
     fDetID = 0;
     fDx = fInfo->fSegSPD->Dx()*0.00005;
-    fDz = 3.48; 
+    fDz = 3.50; 
     fDy = fInfo->fSegSPD->Dy()*0.00005;
 
   }
@@ -229,7 +229,8 @@ void ITSModule::SetID(Int_t gid)
 
   LoadQuads();  
   ComputeBBox();
-  SetTrans();
+  if (trans)
+    SetTrans();
 }
 
 void ITSModule::LoadQuads()
@@ -241,11 +242,11 @@ void ITSModule::LoadQuads()
 
   // printf("its module load quads \n");
 
-  TClonesArray *digits;
+  TClonesArray *digits  = fInfo->GetDigits(fID, fDetID);
+  Int_t         ndigits = digits ? digits->GetEntriesFast() : 0;
+
   Float_t       x, z, dpx, dpz; 
-  Int_t         i, j, ndigits;
-  digits  = fInfo->GetDigits(fID, fDetID);
-  ndigits = digits->GetEntriesFast(); 
+  Int_t         i, j;
 
   switch(fDetID)
   {
@@ -257,7 +258,7 @@ void ITSModule::LoadQuads()
 
       for (Int_t k=0; k<ndigits; ++k)
       {
-       AliITSdigitSPD *d = (AliITSdigitSPD*) digits->UncheckedAt(k);
+       AliITSdigit *d = (AliITSdigit*) digits->UncheckedAt(k);
        j = d->GetCoord1();
        i = d->GetCoord2();
        x  = -0.5*seg->Dx() + i*seg->Dpx(0);
@@ -280,7 +281,7 @@ void ITSModule::LoadQuads()
 
       for (Int_t k=0; k<ndigits; ++k)
       {
-       AliITSdigitSDD* d = (AliITSdigitSDD*) digits->UncheckedAt(k);
+       AliITSdigit* d = (AliITSdigit*) digits->UncheckedAt(k);
 
        // if (d->GetSignal() > fgSDDThreshold)
        {
@@ -290,7 +291,7 @@ void ITSModule::LoadQuads()
          dpx = seg->Dpx(i)*0.0001;
          dpz = seg->Dpz(j)*0.0001;
 
-         AddQuad(x-2*dpx, z, 4*dpx, dpz);
+         AddQuad(x-2*dpx, z - dpz*0.5, 4*dpx, dpz);
          QuadValue(d->GetSignal());
          QuadId(d);
        }
@@ -310,7 +311,7 @@ void ITSModule::LoadQuads()
 
       for (Int_t k=0; k<ndigits; ++k)
       {
-       AliITSdigitSSD *d = (AliITSdigitSSD*) digits->UncheckedAt(k);
+       AliITSdigit *d = (AliITSdigit*) digits->UncheckedAt(k);
        // if(d->GetSignal() > fgSSDThreshold)
        {
          j = d->GetCoord1();
@@ -337,10 +338,16 @@ void ITSModule::LoadQuads()
 
 void ITSModule::SetTrans()
 {
+  // Set transformation matrix based on module id (use geometry to
+  // retrieve this information).
+
   Double_t x[9];
   fHMTrans.UnitTrans();
 
-   // column major
+  // !!!! Here should use AliITSgeomTGeo ... but can i be sure
+  // the geometry has been loaded?
+
+  // column major
   fInfo->fGeom->GetRotMatrix(fID, x);
   fHMTrans.SetBaseVec(1, x[0], x[3], x[6]);
   fHMTrans.SetBaseVec(2, x[1], x[4], x[7]);