X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSDetTypeRec.cxx;h=2b7fc6e68e1b362bfcb6b2b21d2d537b70e627b7;hb=e9362f9d5f6bc5b4a8149efea680c317fa74094a;hp=1c16babbac24b286ecb4ce95166345d3aa71d210;hpb=975f3564be14e908521f74ed4ac75b884154b957;p=u%2Fmrichter%2FAliRoot.git diff --git a/ITS/AliITSDetTypeRec.cxx b/ITS/AliITSDetTypeRec.cxx index 1c16babbac2..2b7fc6e68e1 100644 --- a/ITS/AliITSDetTypeRec.cxx +++ b/ITS/AliITSDetTypeRec.cxx @@ -37,12 +37,25 @@ #include "AliITSClusterFinderSDD.h" #include "AliITSClusterFinderSSD.h" #include "AliITSDetTypeRec.h" +#include "AliITSgeom.h" #include "AliITSRawCluster.h" #include "AliITSRawClusterSPD.h" #include "AliITSRawClusterSDD.h" #include "AliITSRawClusterSSD.h" #include "AliITSRecPoint.h" +#include "AliITSReconstructor.h" +#include "AliITSRecoParam.h" #include "AliITSCalibrationSDD.h" +#include "AliITSMapSDD.h" +#include "AliITSDriftSpeedArraySDD.h" +#include "AliITSDriftSpeedSDD.h" +#include "AliITSCalibrationSSD.h" +#include "AliITSNoiseSSDv2.h" +#include "AliITSGainSSDv2.h" +#include "AliITSBadChannelsSSDv2.h" +#include "AliITSNoiseSSD.h" +#include "AliITSGainSSD.h" +#include "AliITSBadChannelsSSD.h" #include "AliITSsegmentationSPD.h" #include "AliITSsegmentationSDD.h" #include "AliITSsegmentationSSD.h" @@ -59,56 +72,23 @@ ClassImp(AliITSDetTypeRec) //________________________________________________________________ AliITSDetTypeRec::AliITSDetTypeRec(): TObject(), fNMod(0), +fITSgeom(0), fReconstruction(0), fSegmentation(0), fCalibration(0), +fSSDCalibration(0), +fSPDDead(0), fPreProcess(0), fPostProcess(0), fDigits(0), +fDDLMapSDD(0), +fRespSDD(0), fNdtype(0), fCtype(0), fNctype(0), fRecPoints(0), fNRecPoints(0), fSelectedVertexer(), -fLoader(0), -fRunNumber(0), -fFirstcall(kTRUE){ - // Default Constructor - // Inputs: - // none. - // Outputs: - // none. - // Return: - // A properly zero-ed AliITSDetTypeRec class. - - for(Int_t i=0; i<3; i++){ - fClusterClassName[i]=0; - fDigClassName[i]=0; - fRecPointClassName[i]=0; - } - - SelectVertexer(" "); - - -} -//________________________________________________________________ -AliITSDetTypeRec::AliITSDetTypeRec(AliITSLoader *loader): TObject(), -fNMod(0), -fReconstruction(0), -fSegmentation(0), -fCalibration(0), -fPreProcess(0), -fPostProcess(0), -fDigits(0), -fNdtype(0), -fCtype(0), -fNctype(0), -fRecPoints(0), -fNRecPoints(0), -fSelectedVertexer(), -fLoader(loader), -fRunNumber(0), fFirstcall(kTRUE){ // Standard Constructor // Inputs: @@ -125,6 +105,7 @@ fFirstcall(kTRUE){ fDigClassName[i]=0; fRecPointClassName[i]=0; } + fSSDCalibration=new AliITSCalibrationSSD(); fNdtype = new Int_t[fgkNdettypes]; fCtype = new TObjArray(fgkNdettypes); fNctype = new Int_t[fgkNdettypes]; @@ -141,26 +122,28 @@ fFirstcall(kTRUE){ } SelectVertexer(" "); - SetRunNumber(); } //______________________________________________________________________ AliITSDetTypeRec::AliITSDetTypeRec(const AliITSDetTypeRec & rec):TObject(rec), fNMod(rec.fNMod), +fITSgeom(rec.fITSgeom), fReconstruction(rec.fReconstruction), fSegmentation(rec.fSegmentation), fCalibration(rec.fCalibration), +fSSDCalibration(rec.fSSDCalibration), +fSPDDead(rec.fSPDDead), fPreProcess(rec.fPreProcess), fPostProcess(rec.fPostProcess), fDigits(rec.fDigits), +fDDLMapSDD(rec.fDDLMapSDD), +fRespSDD(rec.fRespSDD), fNdtype(rec.fNdtype), fCtype(rec.fCtype), fNctype(rec.fNctype), fRecPoints(rec.fRecPoints), fNRecPoints(rec.fNRecPoints), fSelectedVertexer(rec.fSelectedVertexer), -fLoader(rec.fLoader), -fRunNumber(rec.fRunNumber), fFirstcall(rec.fFirstcall) { @@ -179,7 +162,7 @@ AliITSDetTypeRec& AliITSDetTypeRec::operator=(const AliITSDetTypeRec& source){ //_____________________________________________________________________ AliITSDetTypeRec::~AliITSDetTypeRec(){ //Destructor - + if(fReconstruction){ fReconstruction->Delete(); delete fReconstruction; @@ -190,20 +173,36 @@ AliITSDetTypeRec::~AliITSDetTypeRec(){ delete fSegmentation; fSegmentation = 0; } - if(fCalibration && fRunNumber<0){ - AliITSresponse* rspd = ((AliITSCalibration*)fCalibration->At(GetITSgeom()->GetStartSPD()))->GetResponse(); - AliITSresponse* rsdd = ((AliITSCalibration*)fCalibration->At(GetITSgeom()->GetStartSDD()))->GetResponse(); - AliITSresponse* rssd = ((AliITSCalibration*)fCalibration->At(GetITSgeom()->GetStartSSD()))->GetResponse(); - if(rspd) delete rspd; - if(rsdd) delete rsdd; - if(rssd) delete rssd; - fCalibration->Delete(); - delete fCalibration; - fCalibration = 0; + if(fCalibration){ + if(!(AliCDBManager::Instance()->GetCacheFlag())) { + AliITSCalibration * calSPD = (AliITSCalibration*)fCalibration->At(GetITSgeom()->GetStartSPD()); + if (calSPD) { + AliITSresponse* rspd = calSPD->GetResponse(); + if(rspd) delete rspd; + } + + AliITSCalibration * calSSD = (AliITSCalibration*)fCalibration->At(GetITSgeom()->GetStartSSD()); + if (calSSD) { + AliITSresponse* rssd = calSSD->GetResponse(); + if(rssd) delete rssd; + } + fCalibration->Delete(); + delete fCalibration; + fCalibration = 0; + if(fRespSDD) delete fRespSDD; + if(fDDLMapSDD) delete fDDLMapSDD; + } } + if(fSSDCalibration) delete fSSDCalibration; + if(fSPDDead){ + if(!(AliCDBManager::Instance()->GetCacheFlag())) { + fSPDDead->Delete(); + delete fSPDDead; + fSPDDead = 0; + } + } if(fPreProcess) delete fPreProcess; if(fPostProcess) delete fPostProcess; - if(fDigits){ fDigits->Delete(); delete fDigits; @@ -222,8 +221,9 @@ AliITSDetTypeRec::~AliITSDetTypeRec(){ delete [] fNctype; delete [] fNdtype; delete [] fNMod; - if(fLoader) delete fLoader; + if (fITSgeom) delete fITSgeom; + } //___________________________________________________________________ @@ -284,6 +284,20 @@ void AliITSDetTypeRec::SetCalibrationModel(Int_t iMod, AliITSCalibration *cal){ } //_______________________________________________________________________ +void AliITSDetTypeRec::SetSPDDeadModel(Int_t iMod, AliITSCalibration *cal){ + + //Set dead pixel info for the SPD module iMod + if (fSPDDead==0) { + fSPDDead = new TObjArray(fgkDefaultNModulesSPD); + fSPDDead->SetOwner(kTRUE); + fSPDDead->Clear(); + } + + if (fSPDDead->At(iMod) != 0) + delete (AliITSCalibration*) fSPDDead->At(iMod); + fSPDDead->AddAt(cal,iMod); +} +//_______________________________________________________________________ AliITSCalibration* AliITSDetTypeRec::GetCalibrationModel(Int_t iMod){ //Get calibration model for module type @@ -293,19 +307,28 @@ AliITSCalibration* AliITSDetTypeRec::GetCalibrationModel(Int_t iMod){ return 0; } - return (AliITSCalibration*)fCalibration->At(iMod); + if(iModAt(iMod); + }else{ + Int_t i=iMod-(fgkDefaultNModulesSPD+fgkDefaultNModulesSDD); + fSSDCalibration->SetModule(i); + return (AliITSCalibration*)fSSDCalibration; + } + } +//_______________________________________________________________________ +AliITSCalibration* AliITSDetTypeRec::GetSPDDeadModel(Int_t iMod){ + + //Get SPD dead for module iMod + + if(fSPDDead==0) { + AliWarning("fSPDDead is 0!"); + return 0; + } -//______________________________________________________________________ -void AliITSDetTypeRec::SetTreeAddress(){ - // Set branch address for the Trees. - - TTree *treeR = fLoader->TreeR(); - TTree *treeD = fLoader->TreeD(); - - SetTreeAddressD(treeD); - SetTreeAddressR(treeR); + return (AliITSCalibration*)fSPDDead->At(iMod); } + //______________________________________________________________________ void AliITSDetTypeRec::SetTreeAddressD(TTree *treeD){ // Set branch address for the tree of digits. @@ -338,7 +361,7 @@ void AliITSDetTypeRec::SetTreeAddressD(TTree *treeD){ TBranch* AliITSDetTypeRec::MakeBranchInTree(TTree *tree, const char* name, const char *classname, void* address,Int_t size, - Int_t splitlevel, const char */*file*/) + Int_t splitlevel) { // // Makes branch in given tree and diverts them to a separate file @@ -379,27 +402,25 @@ void AliITSDetTypeRec::SetDefaults(){ for(Int_t dettype=0;dettypeGetStartSDD()); - seg = new AliITSsegmentationSDD(GetITSgeom(),res); + seg = new AliITSsegmentationSDD(); + AliITSCalibrationSDD* cal=(AliITSCalibrationSDD*)GetCalibrationModel(fgkDefaultNModulesSPD+1); + if(cal->IsAMAt20MHz()){ + seg->SetPadSize(seg->Dpz(0),20.); + seg->SetNPads(seg->Npz()/2,128); + } SetSegmentationModel(dettype,seg); - const char *kopt = ((AliITSresponseSDD*)res->GetResponse())->ZeroSuppOption(); - if((!strstr(kopt,"2D"))&&(!strstr(kopt,"1D"))) SetDigitClassName(dettype,"AliITSdigit"); - else SetDigitClassName(dettype,"AliITSdigitSDD"); + SetDigitClassName(dettype,"AliITSdigitSDD"); SetClusterClassName(dettype,"AliITSRawClusterSDD"); - } if(dettype==2){ - AliITSsegmentationSSD* seg2 = new AliITSsegmentationSSD(GetITSgeom()); - 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. + AliITSsegmentationSSD* seg2 = new AliITSsegmentationSSD(); SetSegmentationModel(dettype,seg2); SetDigitClassName(dettype,"AliITSdigitSSD"); SetClusterClassName(dettype,"AliITSRawClusterSSD"); @@ -419,76 +440,143 @@ Bool_t AliITSDetTypeRec::GetCalibration() { fFirstcall = kFALSE; } - SetRunNumber((Int_t)AliCDBManager::Instance()->GetRun()); - Int_t run=GetRunNumber(); + // SetRunNumber((Int_t)AliCDBManager::Instance()->GetRun()); + // Int_t run=GetRunNumber(); - Bool_t origCacheStatus = AliCDBManager::Instance()->GetCacheFlag(); - Bool_t isCacheActive = kTRUE; - if(GetRunNumber()<0)isCacheActive=kFALSE; + Bool_t cacheStatus = AliCDBManager::Instance()->GetCacheFlag(); if (fCalibration==0) { fCalibration = new TObjArray(GetITSgeom()->GetIndexMax()); - fCalibration->SetOwner(isCacheActive); + fCalibration->SetOwner(!cacheStatus); fCalibration->Clear(); } - AliCDBManager::Instance()->SetCacheFlag(isCacheActive); - - AliCDBEntry *entrySPD = AliCDBManager::Instance()->Get("ITS/Calib/CalibSPD", run); - AliCDBEntry *entrySDD = AliCDBManager::Instance()->Get("ITS/Calib/CalibSDD", run); - AliCDBEntry *entrySSD = AliCDBManager::Instance()->Get("ITS/Calib/CalibSSD", run); - AliCDBEntry *entry2SPD = AliCDBManager::Instance()->Get("ITS/Calib/RespSPD", run); - AliCDBEntry *entry2SDD = AliCDBManager::Instance()->Get("ITS/Calib/RespSDD", run); - AliCDBEntry *entry2SSD = AliCDBManager::Instance()->Get("ITS/Calib/RespSSD", run); - - if(!entrySPD || !entrySDD || !entrySSD || !entry2SPD || !entry2SDD || !entry2SSD){ + // dead pixel are not used for local reconstruction + AliCDBEntry *entrySPD = AliCDBManager::Instance()->Get("ITS/Calib/SPDNoisy"); + AliCDBEntry *deadSPD = AliCDBManager::Instance()->Get("ITS/Calib/SPDDead"); + AliCDBEntry *entrySDD = AliCDBManager::Instance()->Get("ITS/Calib/CalibSDD"); + + // AliCDBEntry *entrySSD = AliCDBManager::Instance()->Get("ITS/Calib/CalibSSD"); + AliCDBEntry *entryNoiseSSD = AliCDBManager::Instance()->Get("ITS/Calib/NoiseSSD"); + AliCDBEntry *entryGainSSD = AliCDBManager::Instance()->Get("ITS/Calib/GainSSD"); + AliCDBEntry *entryBadChannelsSSD = AliCDBManager::Instance()->Get("ITS/Calib/BadChannelsSSD"); + AliCDBEntry *entry2SPD = AliCDBManager::Instance()->Get("ITS/Calib/RespSPD"); + AliCDBEntry *entry2SDD = AliCDBManager::Instance()->Get("ITS/Calib/RespSDD"); + AliCDBEntry *entry2SSD = AliCDBManager::Instance()->Get("ITS/Calib/RespSSD"); + AliCDBEntry *drSpSDD = AliCDBManager::Instance()->Get("ITS/Calib/DriftSpeedSDD"); + AliCDBEntry *ddlMapSDD = AliCDBManager::Instance()->Get("ITS/Calib/DDLMapSDD"); +// AliCDBEntry *mapASDD = AliCDBManager::Instance()->Get("ITS/Calib/MapsAnodeSDD"); + AliCDBEntry *mapTSDD = AliCDBManager::Instance()->Get("ITS/Calib/MapsTimeSDD"); + + if(!entrySPD || !deadSPD || !entrySDD || !entryNoiseSSD || !entryGainSSD || + !entryBadChannelsSSD || + !entry2SPD || !entry2SDD || !entry2SSD || !drSpSDD || !ddlMapSDD || !mapTSDD ){ AliFatal("Calibration object retrieval failed! "); return kFALSE; } TObjArray *calSPD = (TObjArray *)entrySPD->GetObject(); - if(!isCacheActive)entrySPD->SetObject(NULL); + if(!cacheStatus)entrySPD->SetObject(NULL); entrySPD->SetOwner(kTRUE); + TObjArray *caldeadSPD = (TObjArray *)deadSPD->GetObject(); + if(!cacheStatus)deadSPD->SetObject(NULL); + deadSPD->SetOwner(kTRUE); + AliITSresponseSPD *pSPD = (AliITSresponseSPD*)entry2SPD->GetObject(); - if(!isCacheActive)entry2SPD->SetObject(NULL); + if(!cacheStatus)entry2SPD->SetObject(NULL); entry2SPD->SetOwner(kTRUE); TObjArray *calSDD = (TObjArray *)entrySDD->GetObject(); - if(!isCacheActive)entrySDD->SetObject(NULL); + if(!cacheStatus)entrySDD->SetObject(NULL); entrySDD->SetOwner(kTRUE); AliITSresponseSDD *pSDD = (AliITSresponseSDD*)entry2SDD->GetObject(); - if(!isCacheActive)entry2SDD->SetObject(NULL); + if(!cacheStatus)entry2SDD->SetObject(NULL); entry2SDD->SetOwner(kTRUE); - TObjArray *calSSD = (TObjArray *)entrySSD->GetObject(); - if(!isCacheActive)entrySSD->SetObject(NULL); - entrySSD->SetOwner(kTRUE); + TObjArray *drSp = (TObjArray *)drSpSDD->GetObject(); + if(!cacheStatus)drSpSDD->SetObject(NULL); + drSpSDD->SetOwner(kTRUE); + + AliITSDDLModuleMapSDD *ddlsdd=(AliITSDDLModuleMapSDD*)ddlMapSDD->GetObject(); + if(!cacheStatus)ddlMapSDD->SetObject(NULL); + ddlMapSDD->SetOwner(kTRUE); + +// TObjArray *mapAn = (TObjArray *)mapASDD->GetObject(); +// if(!cacheStatus)mapASDD->SetObject(NULL); +// mapASDD->SetOwner(kTRUE); + + TObjArray *mapT = (TObjArray *)mapTSDD->GetObject(); + if(!cacheStatus)mapTSDD->SetObject(NULL); + mapTSDD->SetOwner(kTRUE); + + TObject *emptyssd = 0; TString ssdobjectname = 0; + AliITSNoiseSSDv2 *noiseSSD = new AliITSNoiseSSDv2(); + emptyssd = (TObject *)entryNoiseSSD->GetObject(); + ssdobjectname = emptyssd->GetName(); + if(ssdobjectname=="TObjArray") { + TObjArray *noiseSSDOld = (TObjArray *)entryNoiseSSD->GetObject(); + ReadOldSSDNoise(noiseSSDOld, noiseSSD); + } + else if(ssdobjectname=="AliITSNoiseSSDv2") + noiseSSD = (AliITSNoiseSSDv2 *)entryNoiseSSD->GetObject(); + if(!cacheStatus)entryNoiseSSD->SetObject(NULL); + entryNoiseSSD->SetOwner(kTRUE); + + AliITSGainSSDv2 *gainSSD = new AliITSGainSSDv2(); + emptyssd = (TObject *)entryGainSSD->GetObject(); + ssdobjectname = emptyssd->GetName(); + if(ssdobjectname=="Gain") { + TObjArray *gainSSDOld = (TObjArray *)entryGainSSD->GetObject(); + ReadOldSSDGain(gainSSDOld, gainSSD); + } + else if(ssdobjectname=="AliITSGainSSDv2") + gainSSD = (AliITSGainSSDv2 *)entryGainSSD->GetObject(); + if(!cacheStatus)entryGainSSD->SetObject(NULL); + entryGainSSD->SetOwner(kTRUE); + + AliITSBadChannelsSSDv2 *badChannelsSSD = new AliITSBadChannelsSSDv2(); + emptyssd = (TObject *)entryBadChannelsSSD->GetObject(); + ssdobjectname = emptyssd->GetName(); + if(ssdobjectname=="TObjArray") { + TObjArray *badChannelsSSDOld = (TObjArray *)entryBadChannelsSSD->GetObject(); + ReadOldSSDBadChannels(badChannelsSSDOld, badChannelsSSD); + } + else if(ssdobjectname=="AliITSBadChannelsSSDv2") + badChannelsSSD = (AliITSBadChannelsSSDv2*)entryBadChannelsSSD->GetObject(); + if(!cacheStatus)entryBadChannelsSSD->SetObject(NULL); + entryBadChannelsSSD->SetOwner(kTRUE); AliITSresponseSSD *pSSD = (AliITSresponseSSD*)entry2SSD->GetObject(); - if(!isCacheActive)entry2SSD->SetObject(NULL); + if(!cacheStatus)entry2SSD->SetObject(NULL); entry2SSD->SetOwner(kTRUE); // DB entries are deleted. In this way metadeta objects are deleted as well - if(!isCacheActive){ + if(!cacheStatus){ delete entrySPD; + delete deadSPD; delete entrySDD; - delete entrySSD; + delete entryNoiseSSD; + delete entryGainSSD; + delete entryBadChannelsSSD; delete entry2SPD; delete entry2SDD; delete entry2SSD; + //delete mapASDD; + delete mapTSDD; + delete drSpSDD; + delete ddlMapSDD; } - AliCDBManager::Instance()->SetCacheFlag(origCacheStatus); - - if ((!pSPD)||(!pSDD)||(!pSSD) || (!calSPD) || (!calSDD) || (!calSSD)) { + if ((!pSPD)||(!pSDD)||(!pSSD) || (!calSPD) || (!caldeadSPD) ||(!calSDD) || (!drSp) || (!ddlsdd) + || (!mapT) || (!noiseSSD)|| (!gainSSD)|| (!badChannelsSSD)) { AliWarning("Can not get calibration from calibration database !"); return kFALSE; } fNMod[0] = calSPD->GetEntries(); fNMod[1] = calSDD->GetEntries(); - fNMod[2] = calSSD->GetEntries(); + //fNMod[2] = noiseSSD->GetEntries(); AliInfo(Form("%i SPD, %i SDD and %i SSD in calibration database", fNMod[0], fNMod[1], fNMod[2])); AliITSCalibration* cal; @@ -496,19 +584,63 @@ Bool_t AliITSDetTypeRec::GetCalibration() { cal = (AliITSCalibration*) calSPD->At(i); cal->SetResponse((AliITSresponse*)pSPD); SetCalibrationModel(i, cal); - } - for (Int_t i=0; iAt(i); - cal->SetResponse((AliITSresponse*)pSDD); - Int_t iMod = i + fNMod[0]; - SetCalibrationModel(iMod, cal); - } + cal = (AliITSCalibration*) caldeadSPD->At(i); + SetSPDDeadModel(i, cal); + } + + fDDLMapSDD=ddlsdd; + fRespSDD=pSDD; + for(Int_t iddl=0; iddlGetModuleNumber(iddl,icar); + if(iMod==-1) continue; + Int_t i=iMod - fgkDefaultNModulesSPD; + cal = (AliITSCalibration*) calSDD->At(i); + Int_t i0=2*i; + Int_t i1=1+2*i; + AliITSDriftSpeedArraySDD* arr0 = (AliITSDriftSpeedArraySDD*) drSp->At(i0); + // AliITSMapSDD* ma0 = (AliITSMapSDD*)mapAn->At(i0); + AliITSMapSDD* mt0 = (AliITSMapSDD*)mapT->At(i0); + AliITSDriftSpeedArraySDD* arr1 = (AliITSDriftSpeedArraySDD*) drSp->At(i1); + // AliITSMapSDD* ma1 = (AliITSMapSDD*)mapAn->At(i1); + AliITSMapSDD* mt1 = (AliITSMapSDD*)mapT->At(i1); + cal->SetDriftSpeed(0,arr0); + cal->SetDriftSpeed(1,arr1); +// cal->SetMapA(0,ma0); +// cal->SetMapA(1,ma1); + cal->SetMapT(0,mt0); + cal->SetMapT(1,mt1); + SetCalibrationModel(iMod, cal); + } + } + + fSSDCalibration->SetResponse((AliITSresponse*)pSSD); + fSSDCalibration->SetNoise(noiseSSD); + fSSDCalibration->SetGain(gainSSD); + fSSDCalibration->SetBadChannels(badChannelsSSD); + //fSSDCalibration->FillBadChipMap(); + + + /* for (Int_t i=0; iAt(i); - cal->SetResponse((AliITSresponse*)pSSD); - Int_t iMod = i + fNMod[0] + fNMod[1]; - SetCalibrationModel(iMod, cal); + + AliITSCalibrationSSD *calibSSD = new AliITSCalibrationSSD(); + calibSSD->SetResponse((AliITSresponse*)pSSD); + + AliITSNoiseSSD *noise = (AliITSNoiseSSD*) (noiseSSD->At(i)); + calibSSD->SetNoise(noise); + AliITSPedestalSSD *pedestal = (AliITSPedestalSSD*) (pedestalSSD->At(i)); + calibSSD->SetPedestal(pedestal); + AliITSGainSSD *gain = (AliITSGainSSD*) (gainSSD->At(i)); + calibSSD->SetGain(gain); + AliITSBadChannelsSSD *bad = (AliITSBadChannelsSSD*) (badchannelsSSD->At(i)); + calibSSD->SetBadChannels(bad); + calibSSD->FillBadChipMap(); + + Int_t iMod = i + fgkDefaultNModulesSPD + fgkDefaultNModulesSDD; + SetCalibrationModel(iMod, calibSSD); } + */ return kTRUE; } @@ -526,9 +658,7 @@ void AliITSDetTypeRec::SetDefaultClusterFinders(){ AliITSClusterFinder *clf; - MakeTreeC(); - - for(Int_t dettype=0;dettypeTreeC()== 0x0) fLoader->MakeTree("C"); - MakeBranchC(); -} - -//______________________________________________________________ -void AliITSDetTypeRec::MakeBranchC(){ - - //Make branches in the tree of clusters - - if(!fLoader){ - Warning("MakeBranchC","ITS loader is null!"); - return; - } - TTree* lTC = fLoader->TreeC(); - if(lTC==0x0){ - Error("MakeTreeC","Can not get TreeC from loader"); - return; - } - - Int_t buffersize = 4000; - Char_t branchname[30]; - Char_t* cluclass; - const char *det[4]={"SPD","SDD","SSD","ITS"}; - - for(Int_t i=0;iAddAt(new TClonesArray(cluclass,1000),i); - } - if(fgkNdettypes==3) sprintf(branchname,"%sClusters%s",det[3],det[i]); - else sprintf(branchname,"%sClusters%d",det[3],i+1); - if(fCtype && lTC){ - if(lTC->GetBranch(branchname)){ - Warning("MakeBranchC","Branch %s already exists in TreeC",branchname); - } else{ - Info("MakeBranchC","Creating branch %s in TreeC",branchname); - lTC->Branch(branchname,&((*fCtype)[i]),buffersize); - } - } - - } - -} - -//_______________________________________________________________ -void AliITSDetTypeRec::GetTreeC(Int_t event){ - - //Get the clusters tree for this event and - //sets the branch address - - - if(!fLoader){ - Warning("GetTreeC","ITS loader is null!"); - return; - } - - Char_t branchname[30]; - const char *det[4] = {"SPD","SDD","SSD","ITS"}; - TTree* lTC = fLoader->TreeC(); - - ResetClusters(); - if(lTC) fLoader->CleanRawClusters(); - - TBranch* branch; - if(lTC){ - Char_t* cluclass; - for(Int_t i=0;iAt(i)) fCtype->AddAt(new TClonesArray(cluclass,1000),i); - if(fgkNdettypes==3) sprintf(branchname,"%sClusters%s",det[3],det[i]); - else sprintf(branchname,"%sClusters%d",det[3],i+1); - if(fCtype){ - branch = lTC->GetBranch(branchname); - if(branch) branch->SetAddress(&((*fCtype)[i])); - } - } - } else{ - Error("GetTreeC","cannot find clusters Tree for vent %d",event); - } + if(cR) MakeBranchR(tree); + if(cRF) MakeBranchRF(tree); } @@ -771,7 +808,7 @@ void AliITSDetTypeRec::ResetClusters(Int_t i){ if (fNctype) fNctype[i]=0; } //__________________________________________________________________ -void AliITSDetTypeRec::MakeBranchR(const char *file, Option_t *opt){ +void AliITSDetTypeRec::MakeBranchR(TTree *treeR, Option_t *opt){ //Creates tree branches for recpoints // Inputs: @@ -779,11 +816,6 @@ void AliITSDetTypeRec::MakeBranchR(const char *file, Option_t *opt){ // to. If blank it write the SDigits to the same // file in which the Hits were found. - if(!fLoader){ - Warning("MakeBranchR","ITS loader is null!"); - return; - } - Int_t buffsz = 4000; char branchname[30]; @@ -800,13 +832,8 @@ void AliITSDetTypeRec::MakeBranchR(const char *file, Option_t *opt){ } if(!fRecPoints)fRecPoints = new TClonesArray("AliITSRecPoint",1000); - if (fLoader->TreeR()) { - if(fRecPoints==0x0) fRecPoints = new TClonesArray("AliITSRecPoint", - 1000); - MakeBranchInTree(fLoader->TreeR(),branchname,0,&fRecPoints,buffsz,99,file); - } // end if - - + if (treeR) + MakeBranchInTree(treeR,branchname,0,&fRecPoints,buffsz,99); } //______________________________________________________________________ void AliITSDetTypeRec::SetTreeAddressR(TTree *treeR){ @@ -852,28 +879,20 @@ void AliITSDetTypeRec::AddRecPoint(const AliITSRecPoint &r){ } //______________________________________________________________________ -void AliITSDetTypeRec::DigitsToRecPoints(Int_t evNumber,Int_t lastentry,Option_t *opt, Bool_t v2){ +void AliITSDetTypeRec::DigitsToRecPoints(TTree *treeD,TTree *treeR,Int_t lastentry,Option_t *opt, Bool_t v2){ // cluster finding and reconstruction of space points // the condition below will disappear when the geom class will be // initialized for all versions - for the moment it is only for v5 ! // 7 is the SDD beam test version // Inputs: - // Int_t evNumber Event number to be processed. + // TTree *treeD Digits tree + // TTree *treeR Clusters tree // Int_t lastentry Offset for module when not all of the modules // are processed. // Option_t *opt String indicating which ITS sub-detectors should // be processed. If ="All" then all of the ITS // sub detectors are processed. - if(!GetITSgeom()){ - Warning("DigitsToRecPoints","Null pointer to AliITSgeom !"); - return; - } - if(!fLoader){ - Warning("DigitsToRecPoints","ITS loader is null!"); - return; - } - const char *all = strstr(opt,"All"); const char *det[3] = {strstr(opt,"SPD"),strstr(opt,"SDD"), strstr(opt,"SSD")}; @@ -886,11 +905,6 @@ void AliITSDetTypeRec::DigitsToRecPoints(Int_t evNumber,Int_t lastentry,Option_t AliInfo("V2 cluster finder has been selected \n"); } - TTree *treeC=fLoader->TreeC(); - if(!treeC){ - MakeTreeC(); - MakeBranchC(); - } AliITSClusterFinder *rec = 0; Int_t id,module,first=0; for(module=0;moduleGetIndexMax();module++){ @@ -899,69 +913,47 @@ void AliITSDetTypeRec::DigitsToRecPoints(Int_t evNumber,Int_t lastentry,Option_t if(det[id]) first = GetITSgeom()->GetStartDet(id); rec = (AliITSClusterFinder*)GetReconstructionModel(id); TClonesArray *itsDigits = DigitsAddress(id); - if (!rec) { - Error("DigitsToRecPoints", - "The reconstruction class was not instanciated! event=%d", - evNumber); - exit(1); - } - ResetDigits(); - TTree *lTD = fLoader->TreeD(); + if (!rec) + AliFatal("The reconstruction class was not instanciated!"); + ResetDigits(); // MvL: Not sure we neeed this when rereading anyways if (all) { - lTD->GetEvent(lastentry+module); + treeD->GetEvent(lastentry+module); }else { - lTD->GetEvent(lastentry+(module-first)); + treeD->GetEvent(lastentry+(module-first)); } Int_t ndigits = itsDigits->GetEntriesFast(); if(ndigits>0){ rec->SetDetTypeRec(this); rec->SetDigits(DigitsAddress(id)); - rec->SetClusters(ClustersAddress(id)); + // rec->SetClusters(ClustersAddress(id)); rec->FindRawClusters(module); } // end if - fLoader->TreeR()->Fill(); + treeR->Fill(); ResetRecPoints(); - treeC->Fill(); ResetClusters(); } - - fLoader->WriteRecPoints("OVERWRITE"); - fLoader->WriteRawClusters("OVERWRITE"); } //______________________________________________________________________ -void AliITSDetTypeRec::DigitsToRecPoints(AliRawReader* rawReader){ +void AliITSDetTypeRec::DigitsToRecPoints(AliRawReader* rawReader,TTree *treeR,Option_t *opt){ // cluster finding and reconstruction of space points // the condition below will disappear when the geom class will be // initialized for all versions - for the moment it is only for v5 ! // 7 is the SDD beam test version // Inputs: - // Int_t evNumber Event number to be processed. - // Int_t lastentry Offset for module when not all of the modules - // are processed. - // Option_t *opt String indicating which ITS sub-detectors should - // be processed. If ="All" then all of the ITS - // sub detectors are processed. + // AliRawReader *rawReader Pointer to the raw-data reader + // TTree *treeR Clusters tree // Outputs: // none. // Return: // none. - if(!GetITSgeom()){ - Warning("DigitsToRecPoints","Null pointer to AliITSgeom !"); - return; - } - if(!fLoader){ - Warning("DigitsToRecPoints","ITS loader is null!"); - return; - } - - + const char *all = strstr(opt,"All"); + const char *det[3] = {strstr(opt,"SPD"),strstr(opt,"SDD"), + strstr(opt,"SSD")}; AliITSClusterFinderV2 *rec = 0; Int_t id=0; - if(!fLoader->TreeR()) fLoader->MakeTree("R"); - TTree* cTree = fLoader->TreeR(); TClonesArray *array=new TClonesArray("AliITSRecPoint",1000); - cTree->Branch("ITSRecPoints",&array); + TBranch *branch = treeR->Branch("ITSRecPoints",&array); delete array; TClonesArray** clusters = new TClonesArray*[GetITSgeom()->GetIndexMax()]; @@ -969,33 +961,110 @@ void AliITSDetTypeRec::DigitsToRecPoints(AliRawReader* rawReader){ clusters[iModule] = NULL; } for(id=0;id<3;id++){ + if (!all && !det[id]) continue; rec = (AliITSClusterFinderV2*)GetReconstructionModel(id); - rec->SetDetTypeRec(this); if (!rec) AliFatal("The reconstruction class was not instanciated"); - + rec->SetDetTypeRec(this); rec->RawdataToClusters(rawReader,clusters); } Int_t nClusters =0; TClonesArray *emptyArray=new TClonesArray("AliITSRecPoint"); for(Int_t iModule=0;iModuleGetIndexMax();iModule++){ + id = GetITSgeom()->GetModuleType(iModule); + if (!all && !det[id]) continue; array = clusters[iModule]; if(!array){ AliDebug(1,Form("data for module %d missing!",iModule)); array = emptyArray; } - cTree->SetBranchAddress("ITSRecPoints",&array); - cTree->Fill(); + branch->SetAddress(&array); + treeR->Fill(); nClusters+=array->GetEntriesFast(); + + if (array != emptyArray) { + array->Delete(); + delete array; + } } delete emptyArray; - fLoader->WriteRecPoints("OVERWRITE"); - delete[] clusters; Info("DigitsToRecPoints", "total number of found recpoints in ITS: %d\n", nClusters); } +//______________________________________________________________________ +void AliITSDetTypeRec::ReadOldSSDNoise(TObjArray *array, + AliITSNoiseSSDv2 *noiseSSD) { + //Reads the old SSD calibration object and converts it to the new format + const Int_t fgkSSDSTRIPSPERMODULE = 1536; + const Int_t fgkSSDPSIDESTRIPSPERMODULE = 768; + + Int_t fNMod = array->GetEntries(); + cout<<"Converting old calibration object for noise..."<At(iModule)); + for(Int_t iStrip = 0; iStrip < fgkSSDSTRIPSPERMODULE; iStrip++) { + noise = (iStrip < fgkSSDPSIDESTRIPSPERMODULE) ? noiseModule->GetNoiseP(iStrip) : noiseModule->GetNoiseN(1535 - iStrip); + if(iStrip < fgkSSDPSIDESTRIPSPERMODULE) + noiseSSD->AddNoiseP(iModule,iStrip,noise); + if(iStrip >= fgkSSDPSIDESTRIPSPERMODULE) + noiseSSD->AddNoiseN(iModule,1535 - iStrip,noise); + }//loop over strips + }//loop over modules +} + +//______________________________________________________________________ +void AliITSDetTypeRec::ReadOldSSDBadChannels(TObjArray *array, + AliITSBadChannelsSSDv2 *badChannelsSSD) { + //Reads the old SSD calibration object and converts it to the new format + Int_t fNMod = array->GetEntries(); + cout<<"Converting old calibration object for bad channels..."<At(iModule)); + TArrayI arrayPSide = bad->GetBadPChannelsList(); + for(Int_t iPCounter = 0; iPCounter < arrayPSide.GetSize(); iPCounter++) + badChannelsSSD->AddBadChannelP(iModule, + iPCounter, + (Char_t)arrayPSide.At(iPCounter)); + + TArrayI arrayNSide = bad->GetBadNChannelsList(); + for(Int_t iNCounter = 0; iNCounter < arrayNSide.GetSize(); iNCounter++) + badChannelsSSD->AddBadChannelN(iModule, + iNCounter, + (Char_t)arrayNSide.At(iNCounter)); + + }//loop over modules +} + +//______________________________________________________________________ +void AliITSDetTypeRec::ReadOldSSDGain(TObjArray *array, + AliITSGainSSDv2 *gainSSD) { + //Reads the old SSD calibration object and converts it to the new format + + Int_t fNMod = array->GetEntries(); + cout<<"Converting old calibration object for gain..."<At(iModule)); + TArrayF arrayPSide = gainModule->GetGainP(); + for(Int_t iPCounter = 0; iPCounter < arrayPSide.GetSize(); iPCounter++) + gainSSD->AddGainP(iModule, + iPCounter, + arrayPSide.At(iPCounter)); + TArrayF arrayNSide = gainModule->GetGainN(); + for(Int_t iNCounter = 0; iNCounter < arrayNSide.GetSize(); iNCounter++) + gainSSD->AddGainN(iModule, + iNCounter, + arrayNSide.At(iNCounter)); + }//loop over modules +} +