From: shahoian Date: Mon, 22 Sep 2014 15:56:41 +0000 (+0200) Subject: fixes in standalone tracker code X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=d83c91700b232e8548ae6a45c80e645379d40480 fixes in standalone tracker code --- diff --git a/HLT/ITS/trackingSAP/AliITSSAPLayer.cxx b/HLT/ITS/trackingSAP/AliITSSAPLayer.cxx index a3eb91589b5..cde288f54f7 100644 --- a/HLT/ITS/trackingSAP/AliITSSAPLayer.cxx +++ b/HLT/ITS/trackingSAP/AliITSSAPLayer.cxx @@ -33,8 +33,9 @@ AliITSSAPLayer::AliITSSAPLayer() : ,fNFoundClusters(0) ,fFoundClusterIterator(0) ,fFoundBinIterator(0) - ,fFoundBins(0) - ,fSortedClInfo(0) + ,fFoundBins() + ,fSortedClInfo() + ,fDetectors() { // def. c-tor } @@ -61,8 +62,9 @@ AliITSSAPLayer::AliITSSAPLayer(int id, float zspan,int nzbins,int nphibins, int ,fNFoundClusters(0) ,fFoundClusterIterator(0) ,fFoundBinIterator(0) - ,fFoundBins(0) - ,fSortedClInfo(0) + ,fFoundBins() + ,fSortedClInfo() + ,fDetectors() { // c-tor Init(buffer); diff --git a/HLT/ITS/trackingSAP/AliITSSAPLayer.h b/HLT/ITS/trackingSAP/AliITSSAPLayer.h index 58199a7943a..f4098893612 100644 --- a/HLT/ITS/trackingSAP/AliITSSAPLayer.h +++ b/HLT/ITS/trackingSAP/AliITSSAPLayer.h @@ -85,6 +85,10 @@ class AliITSSAPLayer virtual void Clear(Option_t *opt=""); virtual void Print(Option_t *opt="") const; + private: + AliITSSAPLayer(const AliITSSAPLayer&); + AliITSSAPLayer& operator=(const AliITSSAPLayer&); + // protected: TObjArray* fClusters; // externally supplied clusters int fLrID; // layer id diff --git a/HLT/ITS/trackingSAP/AliITSSAPTracker.cxx b/HLT/ITS/trackingSAP/AliITSSAPTracker.cxx index 419a79a4f10..9853a220f7b 100644 --- a/HLT/ITS/trackingSAP/AliITSSAPTracker.cxx +++ b/HLT/ITS/trackingSAP/AliITSSAPTracker.cxx @@ -68,7 +68,10 @@ const char* AliITSSAPTracker::fgkSWNames[AliITSSAPTracker::kNSW] = { //______________________________________________ AliITSSAPTracker::AliITSSAPTracker() : - fBlacklist(0) + fSPD2Discard() + ,fTracklets() + ,fSPD1Tracklet() + ,fBlacklist(0) ,fPhiShift(0.0045) ,fSigThetaTracklet(0.025) ,fSigPhiTracklet(0.08) @@ -92,6 +95,8 @@ AliITSSAPTracker::AliITSSAPTracker() : ,fMissChi2Penalty(3) ,fMaxMissedLayers(1) ,fNTracks(0) + ,fTracks() + ,fTrackVertex() ,fFitVertex(kTRUE) // ,fSPDVertex(0) @@ -211,6 +216,12 @@ void AliITSSAPTracker::ProcessEvent() #ifdef _CONTROLH_ FillRecoStat(); #endif + /* + PrintTracklets(); + PrintTracks(); + if (fSPDVertex) {printf("SPDvtx: "); fSPDVertex->Print();} + printf("TRKVtx: "); fTrackVertex.Print(); + */ } @@ -431,7 +442,7 @@ void AliITSSAPTracker::Tracklets2Tracks() } //______________________________________________ -Bool_t AliITSSAPTracker::IsAcceptableTrack(const AliITSSAPTracker::ITStrack_t& track) const +Bool_t AliITSSAPTracker::IsAcceptableTrack(const AliITSSAPTracker::ITStrack_t& /*track*/) const { // check if the track is acceptable return kTRUE; diff --git a/HLT/ITS/trackingSAP/AliITSSAPTracker.h b/HLT/ITS/trackingSAP/AliITSSAPTracker.h index 7fcad2519a7..19e1935b88e 100644 --- a/HLT/ITS/trackingSAP/AliITSSAPTracker.h +++ b/HLT/ITS/trackingSAP/AliITSSAPTracker.h @@ -40,6 +40,7 @@ class AliITSSAPTracker : public TObject typedef struct SPDtracklet SPDtracklet_t; // struct ITStrack { + ITStrack() : paramOut(),paramInw(),chi2(0),ncl(0),nmiss(0),label(0),trackletID(0) {} AliExternalTrackParam paramOut; AliExternalTrackParam paramInw; float chi2;