Further fixes to the par file generation

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

diff --git a/ITS/AliITSvBeamTestITS04.cxx b/ITS/AliITSvBeamTestITS04.cxx
index 17f7958492bdc395196060c58e3dd92f0fb95269..829de0b7ed602de991bb1fc6816d4a0d623873e2 100644 (file)
--- a/ITS/AliITSvBeamTestITS04.cxx
+++ b/ITS/AliITSvBeamTestITS04.cxx
@@ -3,24 +3,24 @@
 //   integrated ITS test beam of Nov. 04              //
 //  Author: mercedes.lopez.noriega@cern.ch            //
 ////////////////////////////////////////////////////////
+
+#include <TLorentzVector.h>
+
+#include <TGeoManager.h>
+#include <TGeoVolume.h>
+#include <TGeoMatrix.h>
+#include <TGeoPcon.h>
 #include "AliRun.h"
 #include "AliITSvBeamTestITS04.h"
 #include <TClonesArray.h>
 #include <TString.h>
 #include "AliITS.h"
-#include "AliITSDetTypeSim.h"
-#include "AliITSgeom.h"
-#include "AliITShit.h"
-#include "AliITSresponseSDD.h"
-#include "AliITSCalibrationSDD.h"
-#include "AliITSCalibrationSPD.h"
-#include "AliITSCalibrationSSD.h"
-#include "AliITSsegmentationSDD.h"
-#include "AliITSsegmentationSPD.h"
-#include "AliITSsegmentationSSD.h"
 #include "AliMagF.h"
 #include "TVirtualMC.h"
 #include "AliMC.h"
+#include "AliTrackReference.h"
+#include "AliITSgeom.h"
+#include "AliITShit.h"
 
 const Int_t AliITSvBeamTestITS04::fgkNumberOfSPD = 4;
 const Int_t AliITSvBeamTestITS04::fgkNumberOfSDD = 2;
@@ -68,24 +68,6 @@ const Double_t AliITSvBeamTestITS04::fgkSSD1y = 80.6;
 //===============================================================
 
 
-#include <TLorentzVector.h>
-#include "AliTrackReference.h"
-#include "AliITSDetTypeSim.h"
-#include "AliITSgeom.h"
-#include "AliITSgeomSDD.h"
-#include "AliITSgeomSPD.h"
-#include "AliITSgeomSSD.h"
-#include "AliITShit.h"
-#include "AliITSCalibrationSDD.h"
-#include "AliITSCalibrationSPD.h"
-#include "AliITSCalibrationSSD.h"
-#include "AliITSsegmentationSDD.h"
-#include "AliITSsegmentationSPD.h"
-#include "AliITSsegmentationSSD.h"
-
-#include <TGeoManager.h>
-#include <TGeoVolume.h>
-#include <TGeoPcon.h>
 
 ClassImp(AliITSvBeamTestITS04)
     
@@ -214,9 +196,9 @@ void AliITSvBeamTestITS04::CreateGeometry(){
     
     TGeoMedium *air = geoManager->GetMedium("ITSair");
     fITSmotherVolume = new TGeoVolume("ITSV",sITS,air);
-    const Int_t length=100;
-    Char_t vstrng[length];
-    if(fIgm.WriteVersionString(vstrng,length,(AliITSVersion_t)IsVersion(),
+    const Int_t kLength=100;
+    Char_t vstrng[kLength];
+    if(fIgm.WriteVersionString(vstrng,kLength,(AliITSVersion_t)IsVersion(),
                                fMinorVersion,cvsDate,cvsRevision))
         fITSmotherVolume->SetTitle(vstrng);
     else Error("CreateGeometry","Error writing/setting version string");
@@ -418,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
@@ -435,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(AliITSresponseSDD::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
@@ -462,9 +434,6 @@ void AliITSvBeamTestITS04::SetDefaults()
       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!");}