Upgrade of SDD response class (F. Prino)

[u/mrichter/AliRoot.git] / ITS / AliITSvBeamTestITS04.cxx

diff --git a/ITS/AliITSvBeamTestITS04.cxx b/ITS/AliITSvBeamTestITS04.cxx
index 387115c2f81cb156f8f36dafe4fc2ab5122b10c6..9dd394fb0e5229716a5e54cfd0e3b5a9aa32eab6 100644 (file)
--- a/ITS/AliITSvBeamTestITS04.cxx
+++ b/ITS/AliITSvBeamTestITS04.cxx
@@ -8,6 +8,7 @@
 
 #include <TGeoManager.h>
 #include <TGeoVolume.h>
+#include <TGeoMatrix.h>
 #include <TGeoPcon.h>
 #include "AliRun.h"
 #include "AliITSvBeamTestITS04.h"
@@ -399,11 +400,6 @@ void AliITSvBeamTestITS04::SetDefaults()
        bz[160] = 425.0;                       // Set so that there is no zero pixel size for fNz.
        seg0->SetBinSize(bx,bz);               // Based on AliITSgeomSPD for now.
        SetSegmentationModel(kSPD,seg0);
-       // set digit and raw cluster classes to be used
-       const char *kData0=(fDetTypeSim->GetCalibrationModel(kSPD))->DataType();
-       if (strstr(kData0,"real")) 
-         fDetTypeSim->SetDigitClassName(kSPD,"AliITSdigit");
-       else fDetTypeSim->SetDigitClassName(kSPD,"AliITSdigitSPD");
     }
   
     // SDD
@@ -416,14 +412,9 @@ void AliITSvBeamTestITS04::SetDefaults()
       seg1->SetDetSize(s1->GetDx()*kconv, // base this on AliITSgeomSDD
                       s1->GetDz()*4.*kconv, // for now.
                       s1->GetDy()*4.*kconv); // x,z,y full width in microns.
-      seg1->SetDriftSpeed(resp1->GetDriftSpeed());
+      seg1->SetDriftSpeed(AliITSDriftSpeedSDD::DefaultDriftSpeed());
       seg1->SetNPads(256,256);// Use AliITSgeomSDD for now
       SetSegmentationModel(kSDD,seg1);
-      const char *kData1=(fDetTypeSim->GetCalibrationModel(kSDD))->DataType();
-      const char *kopt=resp1->GetZeroSuppOption();
-      if((!strstr(kopt,"2D")) && (!strstr(kopt,"1D")) || strstr(kData1,"real") ){
-       fDetTypeSim->SetDigitClassName(kSDD,"AliITSdigit");
-       } else fDetTypeSim->SetDigitClassName(kSDD,"AliITSdigitSDD");
     }
     
     // SSD
@@ -440,12 +431,7 @@ void AliITSvBeamTestITS04::SetDefaults()
       seg2->SetPadSize(95.,0.); // strip x pitch in microns
       seg2->SetNPads(768,0); // number of strips on each side.
       seg2->SetAngles(0.0075,0.0275); // strip angels rad P and N side.
-      seg2->SetAnglesLay5(0.0075,0.0275); // strip angels rad P and N side.
-      seg2->SetAnglesLay6(0.0275,0.0075); // strip angels rad P and N side.
       SetSegmentationModel(kSSD,seg2); 
-      const char *kData2=(fDetTypeSim->GetCalibrationModel(kSSD))->DataType();
-      if(strstr(kData2,"real") ) fDetTypeSim->SetDigitClassName(kSSD,"AliITSdigit");
-      else fDetTypeSim->SetDigitClassName(kSSD,"AliITSdigitSSD");
     }
     
   if(fgkNTYPES>3){Warning("SetDefaults","Only the four basic detector types are initialised!");}