correcting printf format specifiers

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

diff --git a/ITS/AliITSvBeamTestITS04.cxx b/ITS/AliITSvBeamTestITS04.cxx
index 4afd66993a37e3bf0f2eb7a54d425f107f5d107f..076d08f3dd1dcde1e4112ff2d3ad8a04cf318188 100644 (file)
--- a/ITS/AliITSvBeamTestITS04.cxx
+++ b/ITS/AliITSvBeamTestITS04.cxx
@@ -4,22 +4,25 @@
 //  Author: mercedes.lopez.noriega@cern.ch            //
 ////////////////////////////////////////////////////////
 
-#include <TLorentzVector.h>
 
-#include <TGeoManager.h>
-#include <TGeoVolume.h>
-#include <TGeoPcon.h>
-#include "AliRun.h"
-#include "AliITSvBeamTestITS04.h"
-#include <TClonesArray.h>
-#include <TString.h>
 #include "AliITS.h"
-#include "AliMagF.h"
-#include "TVirtualMC.h"
-#include "AliMC.h"
-#include "AliTrackReference.h"
 #include "AliITSgeom.h"
 #include "AliITShit.h"
+#include "AliITSvBeamTestITS04.h"
+#include "AliMC.h"
+#include "AliMagF.h"
+#include "AliRun.h"
+#include "AliTrackReference.h"
+
+#include <TVirtualMC.h>
+#include <TClonesArray.h>
+#include <TGeoGlobalMagField.h>
+#include <TGeoManager.h>
+#include <TGeoMatrix.h>
+#include <TGeoPcon.h>
+#include <TGeoVolume.h>
+#include <TLorentzVector.h>
+#include <TString.h>
 
 const Int_t AliITSvBeamTestITS04::fgkNumberOfSPD = 4;
 const Int_t AliITSvBeamTestITS04::fgkNumberOfSDD = 2;
@@ -138,8 +141,8 @@ void AliITSvBeamTestITS04::CreateMaterials(){
     // Media defined here should correspond to the one defined in galice.cuts
     // This file is read in (AliMC*) fMCApp::Init() { ReadTransPar(); }
     // Create ITS materials
-    Int_t   ifield = gAlice->Field()->Integ();
-    Float_t fieldm = gAlice->Field()->Max();
+    Int_t   ifield = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Integ();
+    Float_t fieldm = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Max();
     
     Float_t tmaxfdSi = 0.1;
     Float_t stemaxSi = 0.0075;
@@ -399,11 +402,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 +414,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(AliITSresponseSDD::DefaultDriftSpeed());
+      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 +433,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!");}