ReadRaw(): TGraphs are created once per event (B.Polichtchouk)

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

diff --git a/ITS/AliITSvSSD03.cxx b/ITS/AliITSvSSD03.cxx
index a8a7bad875f66e7390175f8a044164c98cf7daa3..4d9803e0e70817a36c068c2f9aafee92ef30d510 100644 (file)
--- a/ITS/AliITSvSSD03.cxx
+++ b/ITS/AliITSvSSD03.cxx
@@ -32,7 +32,7 @@
 #include "AliITSgeom.h"
 #include "AliITSgeomSSD.h"
 #include "AliITSDetTypeSim.h"
-#include "AliITSresponseSSD.h"
+#include "AliITSCalibrationSSD.h"
 #include "AliITSsegmentationSSD.h"
 #include "AliITSsimulationSSD.h"
 #include "AliMC.h"
@@ -381,7 +381,7 @@ void AliITSvSSD03::CreateMaterials(){
     // Monte Carlo simulations for the geometries AliITSv1, AliITSv3,
     // AliITSvSSD03.
     // 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.
@@ -412,7 +412,7 @@ void AliITSvSSD03::CreateMaterials2003(){
     // Monte Carlo simulations for the geometries AliITSv1, AliITSv3,
     // AliITSvSSD03.
     // 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.
@@ -528,7 +528,7 @@ void AliITSvSSD03::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,kSSD,t,r);
+      GetITSgeom()->CreateMatrix(mod,lay,lad,det,kSSD,t,r);
       
       npar=3;par[0]=3.5;par[1]=0.5*300.0E-4;par[2]=2.0;
       
@@ -580,7 +580,7 @@ void AliITSvSSD03::InitAliITSgeom(){
       mod = lay-1;
       ig->GetGeometry(kndeep,lnam,lnum,t,r,idshape,npar,natt,par,att,
                      imat,imed);
-      GetITSgeom()->CreatMatrix(mod,lay,lad,det,kSSD,t,r);
+      GetITSgeom()->CreateMatrix(mod,lay,lad,det,kSSD,t,r);
       //cout<<mod<<" "<<lay<<" "<<lad<<" "<<det<<endl;
       //cout<<npar<<" "<<par[0]<<" "<<par[1]<<" "<<par[2]<<endl;
       if(!(GetITSgeom()->IsShapeDefined((Int_t)kSSD)))
@@ -638,17 +638,17 @@ void AliITSvSSD03::SetDefaults(){
     if(!fDetTypeSim) fDetTypeSim = new AliITSDetTypeSim();
     fDetTypeSim->SetITSgeom(GetITSgeom());
     AliITSgeomSSD  *s0;
-    fDetTypeSim->ResetResponse();
+    fDetTypeSim->ResetCalibrationArray();
     fDetTypeSim->ResetSegmentation();
  
     //SSD
 
     // Get shape info. Do it this way for now.
     s0 = (AliITSgeomSSD*) GetITSgeom()->GetShape(kSSD);
-    AliITSresponse *resp0=new AliITSresponseSSD("simulated");
-    SetResponseModel(GetITSgeom()->GetStartSSD(),resp0);       
+    AliITSCalibration *resp0=new AliITSCalibrationSSD("simulated");
+    SetCalibrationModel(GetITSgeom()->GetStartSSD(),resp0);    
 
-    AliITSsegmentationSSD *seg0=new AliITSsegmentationSSD(GetITSgeom());
+    AliITSsegmentationSSD *seg0=new AliITSsegmentationSSD();
     seg0->SetDetSize(s0->GetDx()*2.*kconv, // base this on AliITSgeomSSD
                     s0->GetDz()*2.*kconv, // for now.
                     s0->GetDy()*2.*kconv); // x,z,y full width in microns.
@@ -657,18 +657,18 @@ void AliITSvSSD03::SetDefaults(){
     SetSegmentationModel(kSSD,seg0);
 
     // set digit and raw cluster classes to be used
-    const char *kData0=(fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSSD()))->DataType();
+    const char *kData0=(fDetTypeSim->GetCalibrationModel(GetITSgeom()->GetStartSSD()))->DataType();
     if (strstr(kData0,"real")) fDetTypeSim->SetDigitClassName(kSSD,"AliITSdigit");
     else fDetTypeSim->SetDigitClassName(kSSD,"AliITSdigitSSD");
 //    SetSimulationModel(kSSD,new AliITSsimulationSSD(seg0,resp0));
 //    iDetType->ReconstructionModel(new AliITSClusterFinderSSD());
 
 /*
-    SetResponseModel(kSPD,new AliITSresponseSPD());
+    SetResponseModel(kSPD,new AliITSCalibrationSPD());
     SetSegmentationModel(kSPD,new AliITSsegmentationSPD());
     fDetTypeSim->SetDigitClassName(kSPD,"AliITSdigitSPD");
 
-    SetResponseModel(kSDD,new AliITSresponseSDD());
+    SetResponseModel(kSDD,new AliITSCalibrationSDD());
     SetSegmentationModel(kSDD,new AliITSsegmentationSDD());
     fDetTypeSim->SetDigitClassName(kSDD,"AliITSdigitSDD");
 */
@@ -694,22 +694,22 @@ void AliITSvSSD03::SetDefaultSimulation(){
 
   AliITSsimulation *sim;
   //  AliITSsegmentation *seg;
-  // AliITSresponse *res;
+  // AliITSCalibration *res;
   /*
   //SPD
   if(fDetTypeSim){
     sim = fDetTypeSim->GetSimulationModel(kSPD);
     if (!sim) {
       seg = (AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSPD);
-      res = (AliITSresponse*)fDetTypeSim->GetResponseModel(nspd);
+      res = (AliITSCalibration*)fDetTypeSim->GetResponseModel(nspd);
       sim = new AliITSsimulationSPDdubna(seg,res,1);
       SetSimulationModel(kSPD,sim);
     }else{ // simulation exists, make sure it is set up properly.
       sim->SetSegmentationModel((AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSPD));
-      sim->SetResponseModel((AliITSresponse*)fDetTypeSim->GetResponseModel(nspd));
+      sim->SetResponseModel((AliITSCalibration*)fDetTypeSim->GetResponseModel(nspd));
       ((AliITSsimulation*)sim)->Init();
       //        if(sim->GetResponseModel()==0) sim->SetResponseModel(
-      //            (AliITSresponse*)iDetType->GetResponseModel());
+      //            (AliITSCalibration*)iDetType->GetResponseModel());
       //        if(sim->GetSegmentationModel()==0) sim->SetSegmentationModel(
       //            (AliITSsegmentation*)iDetType->GetSegmentationModel());
     } // end if
@@ -720,16 +720,16 @@ void AliITSvSSD03::SetDefaultSimulation(){
     sim = fDetTypeSim->GetSimulationModel(kSDD);
     if (!sim) {
       seg = (AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSDD);
-      res = (AliITSresponse*)fDetTypeSim->GetResponseModel(nsdd);
+      res = (AliITSCalibration*)fDetTypeSim->GetResponseModel(nsdd);
       sim = new AliITSsimulationSDD(seg,res);
       SetSimulationModel(kSDD,sim);
     }else{ // simulation exists, make sure it is set up properly.
       sim->SetSegmentationModel((AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSDD));
-      sim->SetResponseModel((AliITSresponse*)fDetTypeSim->GetResponseModel(nsdd));
+      sim->SetResponseModel((AliITSCalibration*)fDetTypeSim->GetResponseModel(nsdd));
 
       ((AliITSsimulation*)sim)->Init();
       //        if(sim->GetResponseModel()==0) sim->SetResponseModel(
-      //            (AliITSresponse*)iDetType->GetResponseModel());
+      //            (AliITSCalibration*)iDetType->GetResponseModel());
       //        if(sim->GetSegmentationModel()==0) sim->SetSegmentationModel(
       //            (AliITSsegmentation*)iDetType->GetSegmentationModel());
     } //end if
@@ -740,15 +740,15 @@ void AliITSvSSD03::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(fDetTypeSim);
       SetSimulationModel(kSSD,sim);
     }else{ // simulation exists, make sure it is set up properly.
       sim->SetSegmentationModel(kSSD,(AliITSsegmentation*)fDetTypeSim->GetSegmentationModel(kSSD));
-      sim->SetResponseModel(GetITSgeom()->GetStartSSD(),(AliITSresponse*)fDetTypeSim->GetResponseModel(GetITSgeom()->GetStartSSD()));
+      sim->SetCalibrationModel(GetITSgeom()->GetStartSSD(),(AliITSCalibration*)fDetTypeSim->GetCalibrationModel(GetITSgeom()->GetStartSSD()));
       ((AliITSsimulation*)sim)->Init();
       //        if(sim->GetResponseModel()==0) sim->SetResponseModel(
-      //            (AliITSresponse*)iDetType->GetResponseModel());
+      //            (AliITSCalibration*)iDetType->GetResponseModel());
       //        if(sim->GetSegmentationModel()==0) sim->SetSegmentationModel(
       //            (AliITSsegmentation*)iDetType->GetSegmentationModel());
     } // end if