From: abercuci Date: Thu, 9 Oct 2008 08:42:34 +0000 (+0000) Subject: improve debug streaming in AttachClusters X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=a8276d3223033b09eb130412785a31c11fdaac4d;p=u%2Fmrichter%2FAliRoot.git improve debug streaming in AttachClusters --- diff --git a/TRD/AliTRDseedV1.cxx b/TRD/AliTRDseedV1.cxx index c06016054ac..502583a812e 100644 --- a/TRD/AliTRDseedV1.cxx +++ b/TRD/AliTRDseedV1.cxx @@ -367,30 +367,13 @@ Bool_t AliTRDseedV1::AttachClustersIter(AliTRDtrackingChamber *chamber, Float_t } AliTRDchamberTimeBin *layer = 0x0; - if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker)>=7 && c){ - TClonesArray clusters("AliTRDcluster", 24); - clusters.SetOwner(kTRUE); - AliTRDcluster *cc = 0x0; - Int_t det=-1, ncl, ncls = 0; - for (Int_t iTime = 0; iTime < AliTRDtrackerV1::GetNTimeBins(); iTime++) { - if(!(layer = chamber->GetTB(iTime))) continue; - if(!(ncl = Int_t(*layer))) continue; - for(int ic=0; icGetDetector(); - new(clusters[ncls++]) AliTRDcluster(*cc); - } - } - AliInfo(Form("N clusters[%d] = %d", fDet, ncls)); - - Int_t ref = c ? 1 : 0; - TTreeSRedirector &cstreamer = *AliTRDtrackerV1::DebugStreamer(); - cstreamer << "AttachClustersIter" - << "det=" << det - << "ref=" << ref - << "clusters.=" << &clusters + if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker)>=7){ + AliTRDcluster *cl = c ? new AliTRDcluster(*c) : 0x0; + AliTRDtrackingChamber *ch = new AliTRDtrackingChamber(*chamber); + (*AliTRDtrackerV1::DebugStreamer()) << "AttachClustersIter" + << "chamber.=" << ch << "tracklet.=" << this - << "cl.=" << c + << "c.=" << cl << "\n"; } diff --git a/TRD/AliTRDtrackingChamber.cxx b/TRD/AliTRDtrackingChamber.cxx index 5de3712b7b0..ca162a7b19b 100644 --- a/TRD/AliTRDtrackingChamber.cxx +++ b/TRD/AliTRDtrackingChamber.cxx @@ -43,8 +43,9 @@ ClassImp(AliTRDtrackingChamber) //_______________________________________________________ -AliTRDtrackingChamber::AliTRDtrackingChamber(Int_t det) : - fDetector(det) +AliTRDtrackingChamber::AliTRDtrackingChamber(Int_t det) + :TObject() + ,fDetector(det) ,fX0(0.) {} diff --git a/TRD/AliTRDtrackingChamber.h b/TRD/AliTRDtrackingChamber.h index 9ea06db5647..3fe2977e61f 100644 --- a/TRD/AliTRDtrackingChamber.h +++ b/TRD/AliTRDtrackingChamber.h @@ -2,7 +2,7 @@ #define ALITRDTRACKINGCHAMBER_H /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * - * See cxx source for full Copyright notice */ +* See cxx source for full Copyright notice */ /* $Id: AliTRDtrackingChamber.h 22646 2007-11-29 18:13:40Z cblume $ */ @@ -20,38 +20,43 @@ #include "AliTRDchamberTimeBin.h" #endif + +#ifndef ALITRDSEED_H +#include "AliTRDseed.h" +#endif + class AliTRDCalDet; class AliTRDgeometry; class AliTRDReconstructor; -class AliTRDtrackingChamber +class AliTRDtrackingChamber : public TObject { public: - enum{ - kNTimeBins = 35 - }; - AliTRDtrackingChamber(Int_t det); - virtual ~AliTRDtrackingChamber(){} - - Bool_t Build(AliTRDgeometry *geo, const AliTRDCalDet *cal, Bool_t hlt = kFALSE); + enum{ + kNTimeBins = AliTRDseed::knTimebins + }; + AliTRDtrackingChamber(Int_t det); + virtual ~AliTRDtrackingChamber(){} + + Bool_t Build(AliTRDgeometry *geo, const AliTRDCalDet *cal, Bool_t hlt = kFALSE); void Clear(const Option_t *opt = 0x0); - Int_t GetDetector() const {return fDetector;} - Int_t GetNClusters() const; - Double_t GetQuality(); - Bool_t GetSeedingLayer(AliTRDchamberTimeBin *&layer, AliTRDgeometry *geo, const AliTRDReconstructor *rec); - Float_t GetX() const {return fX0;} - AliTRDchamberTimeBin* GetTB(int tb) {return tb >= 0 && tb < kNTimeBins ? &fTB[tb] : 0x0;} - void InsertCluster(AliTRDcluster *c, Int_t index); - + Int_t GetDetector() const {return fDetector;} + Int_t GetNClusters() const; + Double_t GetQuality(); + Bool_t GetSeedingLayer(AliTRDchamberTimeBin *&layer, AliTRDgeometry *geo, const AliTRDReconstructor *rec); + Float_t GetX() const {return fX0;} + AliTRDchamberTimeBin* GetTB(int tb) {return tb >= 0 && tb < kNTimeBins ? &fTB[tb] : 0x0;} + void InsertCluster(AliTRDcluster *c, Int_t index); + private: - Int_t fDetector; // detector number - Float_t fX0; // approximate position of the pad plane - - AliTRDchamberTimeBin fTB[kNTimeBins]; // time bins - - - ClassDef(AliTRDtrackingChamber, 1) // TRD tracker container for one chamber + Int_t fDetector; // detector number + Float_t fX0; // approximate position of the pad plane + + AliTRDchamberTimeBin fTB[kNTimeBins]; // time bins + + + ClassDef(AliTRDtrackingChamber, 1) // TRD tracker container for one chamber }; #endif // ALITRDTRACKINGCHAMBER_H