X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSreconstruction.cxx;h=0e099239b85e9991eff1f2a7606237a5694063f7;hb=392aa81938250c958a4b28dbea85c4d5500f8937;hp=0fd484bccaf234b1c702263c1e665a4c98838b8d;hpb=5d2c2f860c4b7cefbee8cb3490202e1bb069ce93;p=u%2Fmrichter%2FAliRoot.git diff --git a/ITS/AliITSreconstruction.cxx b/ITS/AliITSreconstruction.cxx index 0fd484bccaf..0e099239b85 100644 --- a/ITS/AliITSreconstruction.cxx +++ b/ITS/AliITSreconstruction.cxx @@ -28,7 +28,8 @@ #include "AliITSreconstruction.h" #include "AliITSgeom.h" - +using std::endl; +using std::cout; ClassImp(AliITSreconstruction) //______________________________________________________________________ @@ -93,36 +94,12 @@ AliITSreconstruction::AliITSreconstruction(const char* filename): fRunLoader = AliRunLoader::Open(filename); if (fRunLoader == 0x0) { - Error("AliITSreconstruction","Can not load the session",filename); + Error("AliITSreconstruction","Can not load the session %s \n",filename); return; } } -//______________________________________________________________________ -AliITSreconstruction::AliITSreconstruction(const AliITSreconstruction &rec):TTask(rec), -fInit(rec.fInit), -fEnt(rec.fEnt), -fEnt0(rec.fEnt0), -fDetTypeRec(rec.fDetTypeRec), -fDfArp(rec.fDfArp), -fITSgeom(rec.fITSgeom), -fLoader(rec.fLoader), -fRunLoader(rec.fRunLoader) -{ - // Copy constructor. - - -} - -//______________________________________________________________________ -AliITSreconstruction& AliITSreconstruction::operator=(const AliITSreconstruction& source){ - // Assignment operator. - this->~AliITSreconstruction(); - new(this) AliITSreconstruction(source); - return *this; - -} //______________________________________________________________________ AliITSreconstruction::~AliITSreconstruction(){ @@ -141,7 +118,7 @@ Bool_t AliITSreconstruction::Init(){ // none. // Return: // kTRUE if no errors initilizing this class occurse else kFALSE - Info("Init",""); + Info("Init"," Init ITS reconstruction"); if (fRunLoader == 0x0) { Error("Init","Run Loader is NULL"); @@ -167,7 +144,6 @@ Bool_t AliITSreconstruction::Init(){ fDet[0] = fDet[1] = fDet[2] = kTRUE; fEnt0 = 0; - //fEnt = gAlice->GetEventsPerRun(); fEnt = Int_t(fRunLoader->GetNumberOfEvents()); fLoader->LoadDigits("read"); @@ -210,8 +186,14 @@ void AliITSreconstruction::Exec(const Option_t *opt){ // none. Option_t *lopt; Int_t evnt; - - if(strstr(opt,"All")||strstr(opt,"ALL")||strstr(opt,"ITS")||opt==0){ + Bool_t condition =kFALSE; + if(opt){ + if(strstr(opt,"All")||strstr(opt,"ALL")||strstr(opt,"ITS"))condition =kTRUE; + } + else{ + condition = kTRUE; + } + if(condition){ fDet[0] = fDet[1] = fDet[2] = kTRUE; lopt = "All"; }else{ @@ -229,9 +211,9 @@ void AliITSreconstruction::Exec(const Option_t *opt){ } // end if !fInit for(evnt=0;evntGetEvent(evnt); if (fLoader->TreeR() == 0x0) fLoader->MakeTree("R");