,fRecPoints(NULL)
,fTracklets(NULL)
,fTracks(NULL)
- ,fTrackletTree(NULL)
,fDigitsManager(new AliTRDdigitsManager())
- ,fTrackletContainer(NULL)
,fRawVersion(2)
,fTransform(new AliTRDtransform(0))
,fDigits(NULL)
,fRecPoints(NULL)
,fTracklets(NULL)
,fTracks(NULL)
- ,fTrackletTree(NULL)
,fDigitsManager(new AliTRDdigitsManager())
- ,fTrackletContainer(NULL)
,fRawVersion(2)
,fTransform(new AliTRDtransform(0))
,fDigits(NULL)
,fRecPoints(NULL)
,fTracklets(NULL)
,fTracks(NULL)
- ,fTrackletTree(NULL)
,fDigitsManager(NULL)
- ,fTrackletContainer(NULL)
,fRawVersion(2)
,fTransform(NULL)
,fDigits(NULL)
// AliTRDclusterizer destructor
//
- if (fRecPoints/* && IsClustersOwner()*/){
- fRecPoints->Delete();
- delete fRecPoints;
- }
-
- if (fTracklets){
- fTracklets->Delete();
- delete fTracklets;
- }
-
- if (fTracks){
- fTracks->Delete();
- delete fTracks;
- }
-
if (fDigitsManager) {
delete fDigitsManager;
fDigitsManager = NULL;
delete fRawStream;
fRawStream = NULL;
}
-
}
//_____________________________________________________________________________
((AliTRDclusterizer &) c).fClusterTree = NULL;
((AliTRDclusterizer &) c).fRecPoints = NULL;
- ((AliTRDclusterizer &) c).fTrackletTree = NULL;
((AliTRDclusterizer &) c).fDigitsManager = NULL;
((AliTRDclusterizer &) c).fRawVersion = fRawVersion;
((AliTRDclusterizer &) c).fTransform = NULL;
AliError(Form("Unexpected detector index %d.\n",det));
return kFALSE;
}
+ Int_t nRecPoints = RecPoints()->GetEntriesFast();
+ if(!nRecPoints) return kTRUE;
TObjArray *ioArray = new TObjArray(400);
TBranch *branch = fClusterTree->GetBranch("TRDcluster");
fClusterTree->Branch("TRDcluster","TObjArray",&ioArray,32000,0);
} else branch->SetAddress(&ioArray);
- Int_t nRecPoints = RecPoints()->GetEntriesFast();
+ AliTRDcluster *c(NULL);
if(det >= 0){
for (Int_t i = 0; i < nRecPoints; i++) {
- AliTRDcluster *c = (AliTRDcluster *) RecPoints()->UncheckedAt(i);
+ if(!(c = (AliTRDcluster *) RecPoints()->UncheckedAt(i))) continue;
if(det != c->GetDetector()) continue;
ioArray->AddLast(c);
}
fClusterTree->Fill();
ioArray->Clear();
} else {
- Int_t detOld = -1, nw(0);
- for (Int_t i = 0; i < nRecPoints; i++) {
- AliTRDcluster *c = (AliTRDcluster *) RecPoints()->UncheckedAt(i);
+ if(!(c = (AliTRDcluster*)RecPoints()->UncheckedAt(0))){
+ AliError("Missing first cluster.");
+ delete ioArray;
+ return kFALSE;
+ }
+ Int_t detOld(c->GetDetector()), nw(0);
+ ioArray->AddLast(c);
+ for (Int_t i(1); i<nRecPoints; i++) {
+ if(!(c = (AliTRDcluster *) RecPoints()->UncheckedAt(i))) continue;
if(c->GetDetector() != detOld){
nw += ioArray->GetEntriesFast();
+ // fill & clear previously detector set of clusters
fClusterTree->Fill();
ioArray->Clear();
detOld = c->GetDetector();
}
if(ioArray->GetEntriesFast()){
nw += ioArray->GetEntriesFast();
+ // fill & clear last detector set of clusters (if any)
fClusterTree->Fill();
ioArray->Clear();
}
AliDebug(2, Form("Clusters FOUND[%d] WRITTEN[%d] STATUS[%s]", nRecPoints, nw, nw==nRecPoints?"OK":"FAILED"));
+ if(nw!=nRecPoints) AliWarning(Form("Clusters FOUND[%d] WRITTEN[%d]", nRecPoints, nw));
}
delete ioArray;
if (!trackletLoader) {
return kFALSE;
}
-
- // simulated tracklets
trackletLoader->Load();
+
+ Bool_t loaded = kFALSE;
+ // look for simulated tracklets
TTree *trackletTree = trackletLoader->Tree();
- if (trackletTree) {
- TBranch *trklbranch = trackletTree->GetBranch("mcmtrklbranch");
- TClonesArray *trklArray = TrackletsArray("AliTRDtrackletMCM");
- if (trklbranch && trklArray) {
- AliTRDtrackletMCM *trkl = 0x0;
- trklbranch->SetAddress(&trkl);
- for (Int_t iTracklet = 0; iTracklet < trklbranch->GetEntries(); iTracklet++) {
- trklbranch->GetEntry(iTracklet);
- new ((*trklArray)[trklArray->GetEntries()]) AliTRDtrackletMCM(*trkl);
- }
- return kTRUE;
- }
- }
- return kFALSE;
+ if (trackletTree) {
+ TBranch *trklbranch = trackletTree->GetBranch("mcmtrklbranch");
+ TClonesArray *trklArray = TrackletsArray("AliTRDtrackletMCM");
+ if (trklbranch && trklArray) {
+ AliTRDtrackletMCM *trkl = 0x0;
+ trklbranch->SetAddress(&trkl);
+ Int_t nTracklets = trklbranch->GetEntries();
+ for (Int_t iTracklet = 0; iTracklet < nTracklets; iTracklet++) {
+ trklbranch->GetEntry(iTracklet);
+ new ((*trklArray)[trklArray->GetEntries()]) AliTRDtrackletMCM(*trkl);
+ }
+ loaded = kTRUE;
+ }
+ }
+ else {
+ // if no simulated tracklets found, look for raw tracklets
+ AliTreeLoader *treeLoader = (AliTreeLoader*) trackletLoader->GetBaseLoader("tracklets-raw");
+ trackletTree = treeLoader ? treeLoader->Load(), treeLoader->Tree() : 0x0;
+
+ if (trackletTree) {
+ TClonesArray *trklArray = TrackletsArray("AliTRDtrackletWord");
+
+ Int_t hc;
+ TClonesArray *ar = 0x0;
+ trackletTree->SetBranchAddress("hc", &hc);
+ trackletTree->SetBranchAddress("trkl", &ar);
+
+ Int_t nEntries = trackletTree->GetEntries();
+ for (Int_t iEntry = 0; iEntry < nEntries; iEntry++) {
+ trackletTree->GetEntry(iEntry);
+ Int_t nTracklets = ar->GetEntriesFast();
+ AliDebug(2, Form("%i tracklets in HC %i", nTracklets, hc));
+ for (Int_t iTracklet = 0; iTracklet < nTracklets; iTracklet++) {
+ AliTRDtrackletWord *trklWord = (AliTRDtrackletWord*) (*ar)[iTracklet];
+ new ((*trklArray)[trklArray->GetEntries()]) AliTRDtrackletWord(trklWord->GetTrackletWord(), hc);
+ }
+ }
+ loaded = kTRUE;
+ }
+ }
+
+ trackletLoader->UnloadAll();
+ trackletLoader->CloseFile();
+
+ return loaded;
}
Bool_t AliTRDclusterizer::ReadTracks()
return kFALSE;
}
+ Bool_t loaded = kFALSE;
+
trackLoader->Load();
TTree *trackTree = trackLoader->Tree();
- if (!trackTree) {
- return kFALSE;
+ if (trackTree) {
+ TClonesArray *trackArray = TracksArray();
+ AliTRDtrackGTU *trk = 0x0;
+ trackTree->SetBranchAddress("TRDtrackGTU", &trk);
+ for (Int_t iTrack = 0; iTrack < trackTree->GetEntries(); iTrack++) {
+ trackTree->GetEntry(iTrack);
+ new ((*trackArray)[trackArray->GetEntries()]) AliESDTrdTrack(*(trk->CreateTrdTrack()));
+ }
+ loaded = kTRUE;
}
- TClonesArray *trackArray = TracksArray();
- AliTRDtrackGTU *trk = 0x0;
- trackTree->SetBranchAddress("TRDtrackGTU", &trk);
- for (Int_t iTrack = 0; iTrack < trackTree->GetEntries(); iTrack++) {
- trackTree->GetEntry(iTrack);
- new ((*trackArray)[trackArray->GetEntries()]) AliESDTrdTrack(*(trk->CreateTrdTrack()));
- }
+ trackLoader->UnloadAll();
+ trackLoader->CloseFile();
- return kTRUE;
+ return loaded;
}
//_____________________________________________________________________________
if(fReconstructor->IsWritingClusters()) WriteClusters(-1);
- AliInfo(Form("Number of found clusters : %d", RecPoints()->GetEntriesFast()));
+ AliInfo(Form("Found :: clusters[%d] tracklets[%d] tracks[%d]",
+ RecPoints()?RecPoints()->GetEntriesFast():0,
+ TrackletsArray()?TrackletsArray()->GetEntriesFast():0,
+ TracksArray()?TracksArray()->GetEntriesFast():0));
return fReturn;
fDigitsManager->SetUseDictionaries(TestBit(kLabels));
- // ----- preparing tracklet output -----
- if (fReconstructor->IsWritingTracklets()) {
- AliDataLoader *trklLoader = AliRunLoader::Instance()->GetLoader("TRDLoader")->GetDataLoader("tracklets");
- if (!trklLoader) {
- //AliInfo("Could not get the tracklets data loader, adding it now!");
- trklLoader = new AliDataLoader("TRD.Tracklets.root","tracklets", "tracklets");
- AliRunLoader::Instance()->GetLoader("TRDLoader")->AddDataLoader(trklLoader);
- }
- AliTreeLoader *trklTreeLoader = dynamic_cast<AliTreeLoader*> (trklLoader->GetBaseLoader("tracklets-raw"));
- if (!trklTreeLoader) {
- trklTreeLoader = new AliTreeLoader("tracklets-raw", trklLoader);
- trklLoader->AddBaseLoader(trklTreeLoader);
- }
- if (!trklTreeLoader->Tree())
- trklTreeLoader->MakeTree();
- }
-
if(!fRawStream)
fRawStream = new AliTRDrawStream(rawReader);
else
//}
// register tracklet array for output
- fRawStream->SetTrackletArray(TrackletsArray("AliTRDtrackletMCM"));
+ fRawStream->SetTrackletArray(TrackletsArray("AliTRDtrackletWord"));
fRawStream->SetTrackArray(TracksArray());
UInt_t det = 0;
}
}
- if (fReconstructor->IsWritingTracklets()) {
- if (AliDataLoader *trklLoader = AliRunLoader::Instance()->GetLoader("TRDLoader")->GetDataLoader("tracklets")) {
- if (trklLoader) {
- if (AliTreeLoader *trklTreeLoader = (AliTreeLoader*) trklLoader->GetBaseLoader("tracklets-raw"))
- trklTreeLoader->WriteData("OVERWRITE");
- trklLoader->UnloadAll();
- }
- }
- }
-
for (Int_t iSector = 0; iSector < AliTRDgeometry::kNsector; iSector++) {
fTrgFlags[iSector] = fRawStream->GetTriggerFlags(iSector);
}
fRawStream = NULL;
}
- AliInfo(Form("Number of found clusters : %d", fNoOfClusters));
+ AliInfo(Form("Found :: clusters[%d] tracklets[%d] tracks[%d]",
+ RecPoints()?RecPoints()->GetEntriesFast():0,
+ TrackletsArray()?TrackletsArray()->GetEntriesFast():0,
+ TracksArray()?TracksArray()->GetEntriesFast():0));
return kTRUE;
}
}else{
if(nTimeOCDB == -1){
AliDebug(1, "Undefined number of timebins in OCDB, using value from raw data.");
- if(!fTimeTotal>0){
+ if(!(fTimeTotal>0)){
AliError(Form("Number of timebins in raw data is negative, skipping chamber[%3d]!", fDet));
return kFALSE;
}
Float_t noiseMiddleThresh = fMinMaxCutSigma*fCalNoiseDetValue*fCalNoiseROC->GetValue(Max.col, Max.row);
if (Signals[1] <= noiseMiddleThresh) return kFALSE;
- UChar_t status[3]={
+ Char_t status[3]={
fCalPadStatusROC->GetStatus(Max.col-1, Max.row)
,fCalPadStatusROC->GetStatus(Max.col, Max.row)
,fCalPadStatusROC->GetStatus(Max.col+1, Max.row)
void AliTRDclusterizer::CreateCluster(const MaxStruct &Max)
{
//
- // Creates a cluster at the given position and saves it in fRecPoints
+ // Creates a cluster at the given position and saves it in RecPoints
//
Int_t nPadCount = 1;
irc = calibration->PadResponse(ampRight,maxRight,layer,newRightSignal);
// Calculate new overlapping ratio
- ratio = TMath::Min((Double_t) 1.0
- ,newLeftSignal[2] / (newLeftSignal[2] + newRightSignal[0]));
+ // Coverity
+ if (irc != 0) {
+ ratio = TMath::Min((Double_t) 1.0
+ ,newLeftSignal[2] / (newLeftSignal[2] + newRightSignal[0]));
+ }
}
for (int k = 0; k < 2; k++) {
correction += reminder[k] = rates[k] * (reminder[k] + coefficients[k] * result);
}
-
- }
-
-}
-
-//_____________________________________________________________________________
-void AliTRDclusterizer::ResetRecPoints()
-{
- //
- // Resets the list of rec points
- //
-
- if (fRecPoints) {
- fRecPoints->Clear();
- fNoOfClusters = 0;
- // delete fRecPoints;
}
}
// Returns the list of rec points
//
- if (!fRecPoints) {
- if(!(fRecPoints = AliTRDReconstructor::GetClusters())){
- // determine number of clusters which has to be allocated
- Float_t nclusters = fReconstructor->GetRecoParam()->GetNClusters();
-
- fRecPoints = new TClonesArray("AliTRDcluster", Int_t(nclusters));
- }
- //SetClustersOwner(kTRUE);
- AliTRDReconstructor::SetClusters(0x0);
- }
+ fRecPoints = AliTRDReconstructor::GetClusters();
+ if (!fRecPoints) AliError("Missing cluster array");
return fRecPoints;
-
}
//_____________________________________________________________________________
//
// Returns the array of on-line tracklets
//
-
- if (trkltype.Length() != 0) {
- if (!fTracklets) {
- fTracklets = new TClonesArray(trkltype, 200);
- }
- else if (TClass::GetClass(trkltype.Data()) != fTracklets->GetClass()){
- fTracklets->Delete();
- delete fTracklets;
- fTracklets = new TClonesArray(trkltype, 200);
- }
- }
+ fTracklets = AliTRDReconstructor::GetTracklets(trkltype.Data());
+ if (!fTracklets) AliError("Missing online tracklets array");
return fTracklets;
}
{
// return array of GTU tracks (create TClonesArray if necessary)
- if (!fTracks) {
- fTracks = new TClonesArray("AliESDTrdTrack",100);
- }
+ fTracks = AliTRDReconstructor::GetTracks();
+ if (!fTracks) AliError("Missing online tracks array");
return fTracks;
}
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff