From: nilsen Date: Wed, 10 Mar 2004 19:10:21 +0000 (+0000) Subject: Bug fix. Now works with the reconstruction up to and including creating X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=6671ac44c0da104a372c17ac9bdb36a81f45d6f9;p=u%2Fmrichter%2FAliRoot.git Bug fix. Now works with the reconstruction up to and including creating RecPoints. --- diff --git a/ITS/AliITSvSPD02.cxx b/ITS/AliITSvSPD02.cxx index e292ad0ead0..00c77b38ee6 100644 --- a/ITS/AliITSvSPD02.cxx +++ b/ITS/AliITSvSPD02.cxx @@ -34,13 +34,13 @@ #include "AliITSgeomSPD.h" #include "AliITSgeomSSD.h" #include "AliITSDetType.h" -#include "AliITSresponseSPDdubna.h" +#include "AliITSresponseSPD.h" #include "AliITSresponseSDD.h" #include "AliITSresponseSSD.h" #include "AliITSsegmentationSPD.h" #include "AliITSsegmentationSDD.h" #include "AliITSsegmentationSSD.h" -#include "AliITSsimulationSPDdubna.h" +#include "AliITSsimulationSPD.h" #include "AliITSsimulationSDD.h" #include "AliITSsimulationSSD.h" #include "AliMC.h" @@ -701,7 +701,7 @@ void AliITSvSPD02::SetDefaults(){ iDetType=DetType(kSPD); // Get shape info. Do it this way for now. s0 = (AliITSgeomSPD*) fITSgeom->GetShape(kSPD); - AliITSresponse *resp0=new AliITSresponseSPDdubna(); + AliITSresponse *resp0=new AliITSresponseSPD(); resp0->SetTemperature(); resp0->SetDistanceOverVoltage(); SetResponseModel(kSPD,resp0); @@ -754,31 +754,31 @@ void AliITSvSPD02::SetDefaultSimulation(){ AliITSDetType *iDetType; AliITSsimulation *sim; - iDetType=DetType(0); + iDetType=DetType(kSPD); sim = iDetType->GetSimulationModel(); if (!sim) { AliITSsegmentation *seg0= (AliITSsegmentation*)iDetType->GetSegmentationModel(); AliITSresponse *res0 = (AliITSresponse*)iDetType->GetResponseModel(); - AliITSsimulationSPDdubna *sim0=new AliITSsimulationSPDdubna(seg0,res0); - SetSimulationModel(0,sim0); + AliITSsimulationSPD *sim0=new AliITSsimulationSPD(seg0,res0); + SetSimulationModel(kSPD,sim0); }else{ // simulation exists, make sure it is set up properly. - ((AliITSsimulationSPDdubna*)sim)->Init( + ((AliITSsimulationSPD*)sim)->Init( (AliITSsegmentationSPD*) iDetType->GetSegmentationModel(), - (AliITSresponseSPDdubna*) iDetType->GetResponseModel()); + (AliITSresponseSPD*) iDetType->GetResponseModel()); // if(sim->GetResponseModel()==0) sim->SetResponseModel( // (AliITSresponse*)iDetType->GetResponseModel()); // if(sim->GetSegmentationModel()==0) sim->SetSegmentationModel( // (AliITSsegmentation*)iDetType->GetSegmentationModel()); } // end if - iDetType=DetType(1); + iDetType=DetType(kSDD); sim = iDetType->GetSimulationModel(); if (!sim) { AliITSsegmentation *seg1= (AliITSsegmentation*)iDetType->GetSegmentationModel(); AliITSresponse *res1 = (AliITSresponse*)iDetType->GetResponseModel(); AliITSsimulationSDD *sim1=new AliITSsimulationSDD(seg1,res1); - SetSimulationModel(1,sim1); + SetSimulationModel(kSDD,sim1); }else{ // simulation exists, make sure it is set up properly. ((AliITSsimulationSDD*)sim)->Init( (AliITSsegmentationSDD*) iDetType->GetSegmentationModel(), @@ -788,14 +788,14 @@ void AliITSvSPD02::SetDefaultSimulation(){ // if(sim->GetSegmentationModel()==0) sim->SetSegmentationModel( // (AliITSsegmentation*)iDetType->GetSegmentationModel()); } //end if - iDetType=DetType(2); + iDetType=DetType(kSSD); sim = iDetType->GetSimulationModel(); if (!sim) { AliITSsegmentation *seg2= (AliITSsegmentation*)iDetType->GetSegmentationModel(); AliITSresponse *res2 = (AliITSresponse*)iDetType->GetResponseModel(); AliITSsimulationSSD *sim2=new AliITSsimulationSSD(seg2,res2); - SetSimulationModel(2,sim2); + SetSimulationModel(kSDD,sim2); }else{ // simulation exists, make sure it is set up properly. ((AliITSsimulationSSD*)sim)->Init( (AliITSsegmentationSSD*) iDetType->GetSegmentationModel(),