new SDD preprocessor + removal of eff C++ warning (base) - E. Crescio

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

diff --git a/ITS/AliITSvSPD02.cxx b/ITS/AliITSvSPD02.cxx
index f8622659ecb67719e1ea3b7f7e659cd183baecd5..abe2999ffd8e31a91333467b92e07ce1e01d1b7e 100644 (file)
--- a/ITS/AliITSvSPD02.cxx
+++ b/ITS/AliITSvSPD02.cxx
@@ -31,9 +31,9 @@
 #include "AliITSgeom.h"
 #include "AliITSgeomSPD.h"
 #include "AliITSDetTypeSim.h"
-#include "AliITSresponseSPD.h"
+#include "AliITSCalibrationSPD.h"
 #include "AliITSsegmentationSPD.h"
-#include "AliITSsimulationSPDdubna.h"
+#include "AliITSsimulationSPD.h"
 #include "AliMC.h"
 
 
@@ -485,7 +485,7 @@ void AliITSvSPD02::CreateMaterials(){
     // Monte Carlo simulations for the geometries AliITSv1, AliITSv3,
     // AliITSvSPD02.
     // In general it is automatically replaced by
-    // the CreatMaterials routine defined in AliITSv?. Should the function
+    // the CreateMaterials routine defined in AliITSv?. Should the function
     // CreateMaterials not exist for the geometry version you are using this
     // one is used. See the definition found in AliITSv5 or the other routine
     // for a complete definition.
@@ -516,7 +516,7 @@ void AliITSvSPD02::CreateMaterials2002(){
     // Monte Carlo simulations for the geometries AliITSv1, AliITSv3,
     // AliITSvSPD02.
     // In general it is automatically replaced by
-    // the CreatMaterials routine defined in AliITSv?. Should the function
+    // the CreateMaterials routine defined in AliITSv?. Should the function
     // CreateMaterials not exist for the geometry version you are using this
     // one is used. See the definition found in AliITSv5 or the other routine
     // for a complete definition.
@@ -593,7 +593,7 @@ void AliITSvSPD02::InitAliITSgeom(){
             lad = 1;
             det = mod+1;
             t[0] = tt[mod][0]; t[1] = tt[mod][1]; t[2] = tt[mod][2];
-            GetITSgeom()->CreatMatrix(mod,lay,lad,det,kSPD,t,r);
+            GetITSgeom()->CreateMatrix(mod,lay,lad,det,kSPD,t,r);
             npar=3;par[0]=0.64;par[1]=0.5*300.0E-4;par[2]=3.48;
             GetITSgeom()->ReSetShape(kSPD,new AliITSgeomSPD425Short(npar,par));
         } // end for det
@@ -644,7 +644,7 @@ void AliITSvSPD02::InitAliITSgeom(){
             mod = lay-1;
             ig->GetGeometry(kndeep,lnam,lnum,t,r,idshape,npar,natt,par,att,
                             imat,imed);
-            GetITSgeom()->CreatMatrix(mod,lay,lad,det,kSPD,t,r);
+            GetITSgeom()->CreateMatrix(mod,lay,lad,det,kSPD,t,r);
             if(!(GetITSgeom()->IsShapeDefined((Int_t)kSPD)))
                 GetITSgeom()->ReSetShape(kSPD,
                                      new AliITSgeomSPD425Short(npar,par));
@@ -703,22 +703,18 @@ void AliITSvSPD02::SetDefaults(){
     AliITSgeomSPD  *s0;
     Int_t i;
     Float_t bx[256],bz[280];
-    fDetTypeSim->ResetResponse();
+    fDetTypeSim->ResetCalibrationArray();
     fDetTypeSim->ResetSegmentation();
  
     //SPD
     // Get shape info. Do it this way for now.
     s0 = (AliITSgeomSPD*) GetITSgeom()->GetShape(kSPD);
-    AliITSresponse *resp0=0;
-    for(Int_t nmod=0;nmod<GetITSgeom()->GetIndexMax();nmod++){      
-      if(GetITSgeom()->GetModuleType(nmod)==kSPD){
-       resp0 = new AliITSresponseSPD();
-       resp0->SetTemperature();
-       resp0->SetDistanceOverVoltage();
-       SetResponseModel(nmod,resp0);
-      }
-    }
-    AliITSsegmentationSPD *seg0=new AliITSsegmentationSPD(GetITSgeom());
+    AliITSCalibration *resp0=new AliITSCalibrationSPD();
+    resp0->SetTemperature();
+    resp0->SetDistanceOverVoltage();
+    SetCalibrationModel(0,resp0); 
+       
+    AliITSsegmentationSPD *seg0=new AliITSsegmentationSPD();
     seg0->SetDetSize(s0->GetDx()*2.*kconv, // base this on AliITSgeomSPD
                     s0->GetDz()*2.*kconv, // for now.
                     s0->GetDy()*2.*kconv); // x,z,y full width in microns.
@@ -734,18 +730,18 @@ void AliITSvSPD02::SetDefaults(){
     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->GetResponseModel(GetITSgeom()->GetStartSPD()))->DataType();
+    const char *kData0=(fDetTypeSim->GetCalibrationModel(0))->DataType();
     if (strstr(kData0,"real")) fDetTypeSim->SetDigitClassName(kSPD,"AliITSdigit");
     else fDetTypeSim->SetDigitClassName(kSPD,"AliITSdigitSPD");
 //    SetSimulationModel(kSPD,new AliITSsimulationSPDdubna(seg0,resp0));
 //    iDetType->ReconstructionModel(new AliITSClusterFinderSPD());
    
 /*
-    SetResponseModel(kSDD,new AliITSresponseSDD());
+    SetResponseModel(kSDD,new AliITSCalibrationSDD());
     SetSegmentationModel(kSDD,new AliITSsegmentationSDD());
     DetType(kSDD)->ClassNames("AliITSdigitSDD","AliITSRawClusterSDD");
 
-    SetResponseModel(kSSD,new AliITSresponseSSD());
+    SetResponseModel(kSSD,new AliITSCalibrationSSD());
     SetSegmentationModel(kSSD,new AliITSsegmentationSSD());
     DetType(kSSD)->ClassNames("AliITSdigitSSD","AliITSRawClusterSSD");
 */
@@ -772,32 +768,32 @@ void AliITSvSPD02::SetDefaultSimulation(){
 
   if(!fDetTypeSim) fDetTypeSim = new AliITSDetTypeSim();
   AliITSsimulation *sim;
-  AliITSsegmentation *seg;
-  AliITSresponse *res;
-    if(fDetTypeSim){
-        sim = fDetTypeSim->GetSimulationModel(kSPD);
-        if (!sim) {
-            seg = (AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSPD);
-            res = (AliITSresponse*)fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSPD());
-            sim = new AliITSsimulationSPDdubna(seg,res,0);
-            SetSimulationModel(kSPD,sim);
-        }else{ // simulation exists, make sure it is set up properly.
-         sim->SetResponseModel((AliITSresponse*)fDetTypeSim->GetResponseModel(kSPD));
-         sim->SetSegmentationModel((AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSPD));
-         sim->Init();
-        } // end if
-    } // end if iDetType
-
+  //AliITSsegmentation *seg;
+  //AliITSCalibration *res;
+  if(fDetTypeSim){
+    sim = fDetTypeSim->GetSimulationModel(kSPD);
+    if (!sim) {
+      //seg = (AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSPD);
+      //res = (AliITSCalibration*)fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSPD());
+      sim = new AliITSsimulationSPD(fDetTypeSim);
+      SetSimulationModel(kSPD,sim);
+    }else{ // simulation exists, make sure it is set up properly.
+      sim->SetCalibrationModel(GetITSgeom()->GetStartSPD(),(AliITSCalibration*)fDetTypeSim->GetCalibrationModel(GetITSgeom()->GetStartSPD()));
+      sim->SetSegmentationModel(kSPD,(AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSPD));
+      sim->Init();
+    } // end if
+  } // end if iDetType
+  
     /*
-    if(fDetTypeSim){
+      if(fDetTypeSim){
         sim = fDetTypeSim->GetSimulationModel(kSDD);
         if (!sim) {
             seg = (AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSDD);
-            res = (AliITSresponse*)fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSDD());
+            res = (AliITSCalibration*)fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSDD());
             sim = new AliITSsimulationSDD(seg,res);
             SetSimulationModel(kSDD,sim);
         }else{ // simulation exists, make sure it is set up properly.
-         sim->SetResponseModel((AliITSresponse*)fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSDD()));
+         sim->SetResponseModel((AliITSCalibration*)fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSDD()));
          sim->SetSegmentationModel((AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSDD));
          sim->Init();
         } //end if
@@ -806,11 +802,11 @@ void AliITSvSPD02::SetDefaultSimulation(){
         sim = fDetTypeSim->GetSimulationModel(kSSD);
         if (!sim) {
             seg = (AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSSD);
-            res = (AliITSresponse*)fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSSD());
+            res = (AliITSCalibration*)fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSSD());
             sim = new AliITSsimulationSSD(seg,res);
             SetSimulationModel(kSSD,sim);
         }else{ // simulation exists, make sure it is set up properly.
-         sim->SetResponseModel((AliITSresponse*)fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSSD()));
+         sim->SetResponseModel((AliITSCalibration*)fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSSD()));
          sim->SetSegmentationModel((AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSSD));
          sim->Init();
         } // end if