#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 "AliITSNoiseSSD.h"
+#include "AliITSGainSSD.h"
+#include "AliITSBadChannelsSSD.h"
+#include "AliITSPedestalSSD.h"
#include "AliITSsegmentationSPD.h"
#include "AliITSsegmentationSDD.h"
#include "AliITSsegmentationSSD.h"
//________________________________________________________________
AliITSDetTypeRec::AliITSDetTypeRec(): TObject(),
fNMod(0),
+fITSgeom(0),
fReconstruction(0),
fSegmentation(0),
fCalibration(0),
fPreProcess(0),
fPostProcess(0),
fDigits(0),
+fDDLMapSDD(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:
fDigClassName[i]=0;
fRecPointClassName[i]=0;
}
+ fDDLMapSDD=new AliITSDDLModuleMapSDD();
fNdtype = new Int_t[fgkNdettypes];
fCtype = new TObjArray(fgkNdettypes);
fNctype = new Int_t[fgkNdettypes];
}
SelectVertexer(" ");
- SetRunNumber();
}
//______________________________________________________________________
AliITSDetTypeRec::AliITSDetTypeRec(const AliITSDetTypeRec & rec):TObject(rec),
fNMod(rec.fNMod),
+fITSgeom(rec.fITSgeom),
fReconstruction(rec.fReconstruction),
fSegmentation(rec.fSegmentation),
fCalibration(rec.fCalibration),
fPreProcess(rec.fPreProcess),
fPostProcess(rec.fPostProcess),
fDigits(rec.fDigits),
+fDDLMapSDD(rec.fDDLMapSDD),
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)
{
//_____________________________________________________________________
AliITSDetTypeRec::~AliITSDetTypeRec(){
//Destructor
-
+
if(fReconstruction){
fReconstruction->Delete();
delete fReconstruction;
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())) {
+ 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(fPreProcess) delete fPreProcess;
if(fPostProcess) delete fPostProcess;
-
+ if(fDDLMapSDD) delete fDDLMapSDD;
if(fDigits){
fDigits->Delete();
delete fDigits;
delete [] fNctype;
delete [] fNdtype;
delete [] fNMod;
- if(fLoader) delete fLoader;
+ if (fITSgeom) delete fITSgeom;
+
}
//___________________________________________________________________
return (AliITSCalibration*)fCalibration->At(iMod);
}
-//______________________________________________________________________
-void AliITSDetTypeRec::SetTreeAddress(){
- // Set branch address for the Trees.
-
- TTree *treeR = fLoader->TreeR();
- TTree *treeD = fLoader->TreeD();
-
- SetTreeAddressD(treeD);
- SetTreeAddressR(treeR);
-}
//______________________________________________________________________
void AliITSDetTypeRec::SetTreeAddressD(TTree *treeD){
// Set branch address for the tree of digits.
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
for(Int_t dettype=0;dettype<fgkNdettypes;dettype++){
if(dettype==0){
- seg = new AliITSsegmentationSPD(GetITSgeom());
+ seg = new AliITSsegmentationSPD();
SetSegmentationModel(dettype,seg);
SetDigitClassName(dettype,"AliITSdigitSPD");
SetClusterClassName(dettype,"AliITSRawClusterSPD");
}
if(dettype==1){
AliITSCalibrationSDD* res=(AliITSCalibrationSDD*) GetCalibrationModel(GetITSgeom()->GetStartSDD());
- seg = new AliITSsegmentationSDD(GetITSgeom(),res);
+ seg = new AliITSsegmentationSDD();
SetSegmentationModel(dettype,seg);
const char *kopt = ((AliITSresponseSDD*)res->GetResponse())->ZeroSuppOption();
- if((!strstr(kopt,"2D"))&&(!strstr(kopt,"1D"))) SetDigitClassName(dettype,"AliITSdigit");
+ if(!strstr(kopt,"ZS")) SetDigitClassName(dettype,"AliITSdigit");
else SetDigitClassName(dettype,"AliITSdigitSDD");
SetClusterClassName(dettype,"AliITSRawClusterSDD");
}
if(dettype==2){
- AliITSsegmentationSSD* seg2 = new AliITSsegmentationSSD(GetITSgeom());
+ AliITSsegmentationSSD* seg2 = new AliITSsegmentationSSD();
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.
fFirstcall = kFALSE;
}
- SetRunNumber((Int_t)AliCDBManager::Instance()->GetRun());
- Int_t run=GetRunNumber();
- if(run<0)run=0; // if the run number is not yet set, use fake run # 0
+ // 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){
- AliWarning("Calibration object retrieval failed! Dummy calibration will be used.");
- AliCDBStorage *localStor =
- AliCDBManager::Instance()->GetStorage("local://$ALICE_ROOT");
-
- entrySPD = localStor->Get("ITS/Calib/CalibSPD", run);
- entrySDD = localStor->Get("ITS/Calib/CalibSDD", run);
- entrySSD = localStor->Get("ITS/Calib/CalibSSD", run);
- entry2SPD = localStor->Get("ITS/Calib/RespSPD", run);
- entry2SDD = localStor->Get("ITS/Calib/RespSDD", run);
- entry2SSD = localStor->Get("ITS/Calib/RespSSD", run);
- }
-
- if(!entrySPD || !entrySDD || !entrySSD || !entry2SPD || !entry2SDD || !entry2SSD){
- AliError("Calibration data was not found in $ALICE_ROOT!");
- return kFALSE;
- }
+ // dead pixel are not used for local reconstruction
+ AliCDBEntry *entrySPD = AliCDBManager::Instance()->Get("ITS/Calib/SPDNoisy");
+ 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 *entryPedestalSSD = AliCDBManager::Instance()->Get("ITS/Calib/PedestalSSD");
+ AliCDBEntry *entryGainSSD = AliCDBManager::Instance()->Get("ITS/Calib/GainSSD");
+ AliCDBEntry *entryBadChannelsSSD = AliCDBManager::Instance()->Get("ITS/Calib/BadChannelsSSD");
+ // Entry for the AliITSRecoParam object
+ AliCDBEntry *entryRP = AliCDBManager::Instance()->Get("ITS/Calib/RecoParam/");
+ 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 || !entrySDD || !entryNoiseSSD || !entryGainSSD ||
+ !entryPedestalSSD || !entryBadChannelsSSD ||
+ !entry2SPD || !entry2SDD || !entry2SSD || !drSpSDD || !ddlMapSDD || !mapASDD || !mapTSDD || !entryRP){
+ 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);
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);
+
+ TObjArray *noiseSSD = (TObjArray *)entryNoiseSSD->GetObject();
+ if(!cacheStatus)entryNoiseSSD->SetObject(NULL);
+ entryNoiseSSD->SetOwner(kTRUE);
+
+ TObjArray *pedestalSSD = (TObjArray *)entryPedestalSSD->GetObject();
+ if(!cacheStatus)entryPedestalSSD->SetObject(NULL);
+ entryPedestalSSD->SetOwner(kTRUE);
+
+ TObjArray *gainSSD = (TObjArray *)entryGainSSD->GetObject();
+ if(!cacheStatus)entryGainSSD->SetObject(NULL);
+ entryGainSSD->SetOwner(kTRUE);
+
+ TObjArray *badchannelsSSD = (TObjArray *)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);
+ AliITSRecoParam *rp = (AliITSRecoParam*)entryRP->GetObject();
+ if(!cacheStatus)entryRP->SetObject(NULL);
+ entryRP->SetOwner(kTRUE);
+ if(!AliITSReconstructor::GetRecoParam()){
+ AliITSReconstructor::SetRecoParam(rp);
+ }
+ else {
+ AliWarning("AliITSRecoPAram object has been already set in AliITSReconstructor. The OCDB instance will not be used\n");
+ }
+
// DB entries are deleted. In this way metadeta objects are deleted as well
- if(!isCacheActive){
+ if(!cacheStatus){
delete entrySPD;
delete entrySDD;
- delete entrySSD;
+ delete entryNoiseSSD;
+ delete entryPedestalSSD;
+ 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) || (!calSDD) || (!drSp) || (!ddlsdd)
+ || (!mapAn) || (!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;
cal = (AliITSCalibration*) calSPD->At(i);
cal->SetResponse((AliITSresponse*)pSPD);
SetCalibrationModel(i, cal);
- }
- for (Int_t i=0; i<fNMod[1]; i++) {
- cal = (AliITSCalibration*) calSDD->At(i);
- cal->SetResponse((AliITSresponse*)pSDD);
- Int_t iMod = i + fNMod[0];
- SetCalibrationModel(iMod, cal);
- }
+ }
+
+ fDDLMapSDD->SetDDLMap(ddlsdd);
+ for(Int_t iddl=0; iddl<AliITSDDLModuleMapSDD::GetNDDLs(); iddl++){
+ for(Int_t icar=0; icar<AliITSDDLModuleMapSDD::GetNModPerDDL();icar++){
+ Int_t iMod=fDDLMapSDD->GetModuleNumber(iddl,icar);
+ if(iMod==-1) continue;
+ Int_t i=iMod - fgkDefaultNModulesSPD;
+ cal = (AliITSCalibration*) calSDD->At(i);
+ cal->SetResponse((AliITSresponse*)pSDD);
+ 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);
+ }
+ }
for (Int_t i=0; i<fNMod[2]; i++) {
- cal = (AliITSCalibration*) calSSD->At(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);
+
+ Int_t iMod = i + fgkDefaultNModulesSPD + fgkDefaultNModulesSDD;
+ SetCalibrationModel(iMod, calibSSD);
}
return kTRUE;
AliITSClusterFinder *clf;
- MakeTreeC();
-
- for(Int_t dettype=0;dettype<fgkNdettypes;dettype++){
+ for(Int_t dettype=0;dettype<fgkNdettypes;dettype++){
//SPD
if(dettype==0){
if(!GetReconstructionModel(dettype)){
AliITSClusterFinder *clf;
- MakeTreeC();
for(Int_t dettype=0;dettype<fgkNdettypes;dettype++){
//SPD
if(dettype==0){
}
//______________________________________________________________________
-void AliITSDetTypeRec::MakeBranch(Option_t* option){
+void AliITSDetTypeRec::MakeBranch(TTree* tree, Option_t* option){
//Creates branches for clusters and recpoints
Bool_t cR = (strstr(option,"R")!=0);
if(cRF)cR = kFALSE;
- if(cR) MakeBranchR(0);
- if(cRF) MakeBranchRF(0);
-
-}
-
-//_____________________________________________________________
-void AliITSDetTypeRec::MakeTreeC(){
-
- //Create a separate tree to store the clusters
- if(!fLoader){
- Warning("MakeTreeC","ITS loader is null!");
- return;
- }
- if(fLoader->TreeC()== 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;i<fgkNdettypes;i++){
- cluclass = GetClusterClassName(i);
- if(fCtype==0x0) fCtype = new TObjArray(fgkNdettypes);
- if(!ClustersAddress(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 && 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;i<fgkNdettypes;i++){
- cluclass = GetClusterClassName(i);
- if(fCtype==0x0) fCtype = new TObjArray(fgkNdettypes);
- if(!fCtype->At(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);
}
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:
// 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];
}
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){
}
//______________________________________________________________________
-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")};
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;module<GetITSgeom()->GetIndexMax();module++){
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()];
clusters[iModule] = NULL;
}
for(id=0;id<3;id++){
+ if (!all && !det[id]) continue;
rec = (AliITSClusterFinderV2*)GetReconstructionModel(id);
+ if (!rec)
+ AliFatal("The reconstruction class was not instanciated");
rec->SetDetTypeRec(this);
- if (!rec) {
- Error("DigitsToRecPoints",
- "The reconstruction class was not instanciated");
- exit(1);
- }
rec->RawdataToClusters(rawReader,clusters);
}
Int_t nClusters =0;
+ TClonesArray *emptyArray=new TClonesArray("AliITSRecPoint");
for(Int_t iModule=0;iModule<GetITSgeom()->GetIndexMax();iModule++){
+ id = GetITSgeom()->GetModuleType(iModule);
+ if (!all && !det[id]) continue;
array = clusters[iModule];
if(!array){
- Error("DigitsToRecPoints","data for module %d missing!",iModule);
- array = new TClonesArray("AliITSRecPoint");
+ 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();
- delete array;
+
+ if (array != emptyArray) {
+ array->Delete();
+ delete array;
+ }
}
- fLoader->WriteRecPoints("OVERWRITE");
+ delete emptyArray;
delete[] clusters;
Info("DigitsToRecPoints", "total number of found recpoints in ITS: %d\n",
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff