From a1c095f1e1c202ff3b6e939fd376eda2fcf33737 Mon Sep 17 00:00:00 2001 From: cblume Date: Sat, 19 Feb 2011 21:03:05 +0000 Subject: [PATCH] - remove legacy code for old raw reader - prepare track writing in case of no digits conversion --- TRD/AliTRDclusterizer.cxx | 132 +++++++++----------------------------- TRD/AliTRDclusterizer.h | 8 ++- 2 files changed, 35 insertions(+), 105 deletions(-) diff --git a/TRD/AliTRDclusterizer.cxx b/TRD/AliTRDclusterizer.cxx index ae875f47be3..6801e09b41e 100644 --- a/TRD/AliTRDclusterizer.cxx +++ b/TRD/AliTRDclusterizer.cxx @@ -61,6 +61,7 @@ AliTRDclusterizer::AliTRDclusterizer(const AliTRDReconstructor *const rec) ,fClusterTree(NULL) ,fRecPoints(NULL) ,fTracklets(NULL) + ,fTracks(NULL) ,fTrackletTree(NULL) ,fDigitsManager(new AliTRDdigitsManager()) ,fTrackletContainer(NULL) @@ -119,6 +120,7 @@ AliTRDclusterizer::AliTRDclusterizer(const Text_t *name ,fClusterTree(NULL) ,fRecPoints(NULL) ,fTracklets(NULL) + ,fTracks(NULL) ,fTrackletTree(NULL) ,fDigitsManager(new AliTRDdigitsManager()) ,fTrackletContainer(NULL) @@ -170,6 +172,7 @@ AliTRDclusterizer::AliTRDclusterizer(const AliTRDclusterizer &c) ,fClusterTree(NULL) ,fRecPoints(NULL) ,fTracklets(NULL) + ,fTracks(NULL) ,fTrackletTree(NULL) ,fDigitsManager(NULL) ,fTrackletContainer(NULL) @@ -226,18 +229,16 @@ AliTRDclusterizer::~AliTRDclusterizer() delete fTracklets; } + if (fTracks){ + fTracks->Delete(); + delete fTracks; + } + if (fDigitsManager) { delete fDigitsManager; fDigitsManager = NULL; } - if (fTrackletContainer){ - delete [] fTrackletContainer[0]; - delete [] fTrackletContainer[1]; - delete [] fTrackletContainer; - fTrackletContainer = NULL; - } - if (fTransform){ delete fTransform; fTransform = NULL; @@ -277,7 +278,6 @@ void AliTRDclusterizer::Copy(TObject &c) const ((AliTRDclusterizer &) c).fRecPoints = NULL; ((AliTRDclusterizer &) c).fTrackletTree = NULL; ((AliTRDclusterizer &) c).fDigitsManager = NULL; - ((AliTRDclusterizer &) c).fTrackletContainer = NULL; ((AliTRDclusterizer &) c).fRawVersion = fRawVersion; ((AliTRDclusterizer &) c).fTransform = NULL; ((AliTRDclusterizer &) c).fDigits = NULL; @@ -435,48 +435,6 @@ Bool_t AliTRDclusterizer::WriteClusters(Int_t det) return kTRUE; } -//_____________________________________________________________________________ -Bool_t AliTRDclusterizer::WriteTracklets(Int_t det) -{ - // - // Write the raw data tracklets into seperate file - // - - UInt_t **leaves = new UInt_t *[2]; - for (Int_t i=0; i<2 ;i++){ - leaves[i] = new UInt_t[258]; - leaves[i][0] = det; // det - leaves[i][1] = i; // side - memcpy(leaves[i]+2, fTrackletContainer[i], sizeof(UInt_t) * 256); - } - - if (!fTrackletTree){ - AliDataLoader *dl = fRunLoader->GetLoader("TRDLoader")->GetDataLoader("tracklets"); - dl->MakeTree(); - fTrackletTree = dl->Tree(); - } - - TBranch *trkbranch = fTrackletTree->GetBranch("trkbranch"); - if (!trkbranch) { - trkbranch = fTrackletTree->Branch("trkbranch",leaves[0],"det/i:side/i:tracklets[256]/i"); - } - - for (Int_t i=0; i<2; i++){ - if (leaves[i][2]>0) { - trkbranch->SetAddress(leaves[i]); - fTrackletTree->Fill(); - } - } - -// AliDataLoader *dl = fRunLoader->GetLoader("TRDLoader")->GetDataLoader("tracklets"); //jkl: wrong here -// dl->WriteData("OVERWRITE"); //jkl: wrong here - //dl->Unload(); - delete [] leaves; - - return kTRUE; - -} - //_____________________________________________________________________________ Bool_t AliTRDclusterizer::ReadDigits() { @@ -624,39 +582,28 @@ Bool_t AliTRDclusterizer::Raw2ClustersChamber(AliRawReader *rawReader) trklTreeLoader->MakeTree(); } - // tracklet container for raw tracklet writing - if (!fTrackletContainer && ( fReconstructor->IsWritingTracklets() || fReconstructor->IsProcessingTracklets() )) { - // maximum tracklets for one HC - const Int_t kTrackletChmb=256; - fTrackletContainer = new UInt_t *[2]; - fTrackletContainer[0] = new UInt_t[kTrackletChmb]; - fTrackletContainer[1] = new UInt_t[kTrackletChmb]; - memset(fTrackletContainer[0], 0, kTrackletChmb*sizeof(UInt_t)); //jkl - memset(fTrackletContainer[1], 0, kTrackletChmb*sizeof(UInt_t)); //jkl - } - if(!fRawStream) fRawStream = new AliTRDrawStream(rawReader); else fRawStream->SetReader(rawReader); if(fReconstructor->IsHLT()){ - ((AliTRDrawStream*)fRawStream)->DisableErrorStorage(); + fRawStream->DisableErrorStorage(); } - AliDebug(1,Form("Stream version: %s", fRawStream->IsA()->GetName())); - + // register tracklet array for output + if (fReconstructor->IsProcessingTracklets()) + fRawStream->SetTrackletArray(TrackletsArray()); + fRawStream->SetTrackArray(TracksArray()); + UInt_t det = 0; - while ((det = fRawStream->NextChamber(fDigitsManager,fTrackletContainer)) < AliTRDgeometry::kNdet){ + while ((det = fRawStream->NextChamber(fDigitsManager)) < AliTRDgeometry::kNdet){ if (fDigitsManager->GetIndexes(det)->HasEntry()){ MakeClusters(det); fDigitsManager->ClearArrays(det); } - - if (!fReconstructor->IsWritingTracklets()) continue; - if (*(fTrackletContainer[0]) > 0 || *(fTrackletContainer[1]) > 0) WriteTracklets(det); } - + if (fReconstructor->IsWritingTracklets()) { if (AliDataLoader *trklLoader = AliRunLoader::Instance()->GetLoader("TRDLoader")->GetDataLoader("tracklets")) { if (trklLoader) { @@ -667,13 +614,6 @@ Bool_t AliTRDclusterizer::Raw2ClustersChamber(AliRawReader *rawReader) } } - if (fTrackletContainer){ - delete [] fTrackletContainer[0]; - delete [] fTrackletContainer[1]; - delete [] fTrackletContainer; - fTrackletContainer = NULL; - } - if(fReconstructor->IsWritingClusters()) WriteClusters(-1); if(!TestBit(knewDM)){ @@ -795,9 +735,6 @@ Bool_t AliTRDclusterizer::MakeClusters(Int_t det) Int_t iGeoModule = istack + AliTRDgeometry::Nstack() * isector; fVolid = AliGeomManager::LayerToVolUID(iGeoLayer,iGeoModule); - if(fReconstructor->IsProcessingTracklets() && fTrackletContainer) - AddTrackletsToArray(); - fColMax = fDigits->GetNcol(); fTimeTotal = fDigitsManager->GetDigitsParam()->GetNTimeBins(det); @@ -880,7 +817,7 @@ Bool_t AliTRDclusterizer::MakeClusters(Int_t det) << "NCorrupted=" << nCorrupted << "\n"; } - if (TestBit(kLabels)) AddLabels(); + // if (TestBit(kLabels)) AddLabels(); return kTRUE; @@ -1092,27 +1029,6 @@ void AliTRDclusterizer::AddClusterToArray(AliTRDcluster* cluster) new((*RecPoints())[n]) AliTRDcluster(*cluster); } -//_____________________________________________________________________________ -void AliTRDclusterizer::AddTrackletsToArray() -{ - // - // Add the online tracklets of this chamber to the array - // - - UInt_t* trackletword; - for(Int_t side=0; side<2; side++) - { - Int_t trkl=0; - trackletword=fTrackletContainer[side]; - while(trackletword[trkl]>0){ - Int_t n = TrackletsArray()->GetEntriesFast(); - AliTRDtrackletWord tmp(trackletword[trkl]); - new((*TrackletsArray())[n]) AliTRDcluster(&tmp,fDet,fVolid); - trkl++; - } - } -} - //_____________________________________________________________________________ Bool_t AliTRDclusterizer::AddLabels() { @@ -1373,11 +1289,11 @@ TClonesArray *AliTRDclusterizer::RecPoints() TClonesArray *AliTRDclusterizer::TrackletsArray() { // - // Returns the list of rec points + // Returns the array of on-line tracklets // if (!fTracklets && fReconstructor->IsProcessingTracklets()) { - fTracklets = new TClonesArray("AliTRDcluster", 2*MAXTRACKLETSPERHC); + fTracklets = new TClonesArray("AliTRDtrackletWord", 2*MAXTRACKLETSPERHC); //SetClustersOwner(kTRUE); //AliTRDReconstructor::SetTracklets(0x0); } @@ -1385,3 +1301,13 @@ TClonesArray *AliTRDclusterizer::TrackletsArray() } +//_____________________________________________________________________________ +TClonesArray* AliTRDclusterizer::TracksArray() +{ + // return array of GTU tracks (create TClonesArray if necessary) + + if (!fTracks) { + fTracks = new TClonesArray("AliESDTrdTrack",100); + } + return fTracks; +} diff --git a/TRD/AliTRDclusterizer.h b/TRD/AliTRDclusterizer.h index 0b305f49785..7a9414b6f76 100644 --- a/TRD/AliTRDclusterizer.h +++ b/TRD/AliTRDclusterizer.h @@ -49,6 +49,7 @@ class AliTRDclusterizer : public TNamed ,kLUT = BIT(18) // using look up table for cluster's r-phi position ,kGAUS = BIT(19) // using gauss approx. for cluster's r-phi position ,knewDM = BIT(20) // was the digitsmanger created by raw2clusters? + ,kTracksOwner = BIT(21) // toggle GTU track ownership }; struct MaxStruct @@ -86,7 +87,7 @@ class AliTRDclusterizer : public TNamed void ResetRecPoints(); virtual TClonesArray *RecPoints(); virtual TClonesArray *TrackletsArray(); - Bool_t WriteTracklets(Int_t det); + virtual TClonesArray *TracksArray(); Bool_t Raw2Clusters(AliRawReader *rawReader); Bool_t Raw2ClustersChamber(AliRawReader *rawReader); @@ -105,6 +106,7 @@ class AliTRDclusterizer : public TNamed Bool_t IsClustersOwner() const {return TestBit(kClOwner);} virtual void SetClustersOwner(Bool_t own=kTRUE) {SetBit(kClOwner, own); if(!own) {fRecPoints = 0x0; fNoOfClusters=0;} } void SetTrackletsOwner(Bool_t own=kTRUE) {SetBit(kTrOwner, own); if(!own) {fTracklets = 0x0; } } + void SetTracksOwner(Bool_t own=kTRUE) {SetBit(kTracksOwner, own); if(!own) {fTracks = 0x0; } } void SetSkipTransform(Bool_t b=kTRUE) {SetBit(kSkipTrafo, b); } protected: @@ -123,7 +125,6 @@ protected: void CreateCluster(const MaxStruct &Max); virtual void AddClusterToArray(AliTRDcluster* cluster); - virtual void AddTrackletsToArray(); private: inline void CalcAdditionalInfo(const MaxStruct &Max, Short_t *const signals, Int_t &nPadCount); @@ -134,12 +135,15 @@ protected: TTree *fClusterTree; //! Tree with the cluster TClonesArray *fRecPoints; //! Array of clusters TClonesArray *fTracklets; //! Array of online tracklets + TClonesArray *fTracks; //! Array of GTU tracks TTree *fTrackletTree; //! Tree for tracklets AliTRDdigitsManager *fDigitsManager; //! TRD digits manager UInt_t **fTrackletContainer; //! tracklet container + // legacy code to avoid breakint AliHLTTRDClusterizer + // but it's useless Int_t fRawVersion; // Expected raw version of the data - default is 2 -- 2.43.0