using new TPC offline functions (r27421) to significantly speed up the reconstruction...

[u/mrichter/AliRoot.git] / HLT / TPCLib / AliHLTTPCConfMapTrack.cxx

diff --git a/HLT/TPCLib/AliHLTTPCConfMapTrack.cxx b/HLT/TPCLib/AliHLTTPCConfMapTrack.cxx
index 18e40f417c1970e0b19003f6824748391c110a2a..58c457cd77ac97e67cf21ef62f4135267989bd93 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCConfMapTrack.cxx
+++ b/HLT/TPCLib/AliHLTTPCConfMapTrack.cxx
@@ -1,22 +1,22 @@
 // @(#) $Id$
 // Original: AliHLTConfMapTrack.cxx,v 1.16 2005/06/14 10:55:21 cvetan 
 
-/**************************************************************************
- * This file is property of and copyright by the ALICE HLT Project        * 
- * ALICE Experiment at CERN, All rights reserved.                         *
- *                                                                        *
- * Primary Authors: Anders Vestbo, maintained by                          *
- *                  Matthias Richter <Matthias.Richter@ift.uib.no>        *
- *                  for The ALICE HLT Project.                            *
- *                                                                        *
- * Permission to use, copy, modify and distribute this software and its   *
- * documentation strictly for non-commercial purposes is hereby granted   *
- * without fee, provided that the above copyright notice appears in all   *
- * copies and that both the copyright notice and this permission notice   *
- * appear in the supporting documentation. The authors make no claims     *
- * about the suitability of this software for any purpose. It is          *
- * provided "as is" without express or implied warranty.                  *
- **************************************************************************/
+//**************************************************************************
+//* This file is property of and copyright by the ALICE HLT Project        * 
+//* ALICE Experiment at CERN, All rights reserved.                         *
+//*                                                                        *
+//* Primary Authors: Anders Vestbo, maintained by                          *
+//*                  Matthias Richter <Matthias.Richter@ift.uib.no>        *
+//*                  for The ALICE HLT Project.                            *
+//*                                                                        *
+//* Permission to use, copy, modify and distribute this software and its   *
+//* documentation strictly for non-commercial purposes is hereby granted   *
+//* without fee, provided that the above copyright notice appears in all   *
+//* copies and that both the copyright notice and this permission notice   *
+//* appear in the supporting documentation. The authors make no claims     *
+//* about the suitability of this software for any purpose. It is          *
+//* provided "as is" without express or implied warranty.                  *
+//**************************************************************************
 
 /** @file   AliHLTTPCConfMapTrack.cxx
     @author Anders Vestbo, maintained by Matthias Richter
@@ -31,7 +31,6 @@
 #include "AliHLTTPCConfMapFit.h"
 #include "AliHLTTPCConfMapTrack.h"
 #include "AliHLTTPCTransform.h"
-//#include "AliHLTTPC.h"
 
 #if __GNUC__ >= 3
 using namespace std;
@@ -67,39 +66,6 @@ AliHLTTPCConfMapTrack::AliHLTTPCConfMapTrack()
   fChiSq[1] = 0.;
 }
 
-AliHLTTPCConfMapTrack::AliHLTTPCConfMapTrack(const AliHLTTPCConfMapTrack&)
-  :
-  fCurrentHit(0),
-  fLastHit(0),
-  fFirstHit(0),
-  fs11Xy(0),
-  fs12Xy(0),
-  fs22Xy(0),
-  fg1Xy(0),
-  fg2Xy(0),
-  fs11Sz(0),
-  fs12Sz(0),
-  fs22Sz(0),
-  fg1Sz(0),
-  fg2Sz(0),
-  fddXy(0),
-  fa1Xy(0),
-  fa2Xy(0),
-  fddSz(0),
-  fa1Sz(0),
-  fa2Sz(0)
-{
-  // dummy copy constructor
-  //HLTFatal("copy constructor untested");
-}
-
-AliHLTTPCConfMapTrack& AliHLTTPCConfMapTrack::operator=(const AliHLTTPCConfMapTrack&)
-{ 
-  // dummy assignment operator
-  //HLTFatal("assignment operator untested");
-  return *this;
-}
-
 AliHLTTPCConfMapTrack::~AliHLTTPCConfMapTrack()
 {
   //deconstructor
@@ -229,7 +195,6 @@ void AliHLTTPCConfMapTrack::Fill(AliHLTTPCVertex *vertex,Double_t max_Dca)
 {
     //Fill track variables with or without fit.
     
-// #### -B0-CHANGE-START == JMT
     // for straight line fit
     if (AliHLTTPCTransform::GetBFieldValue() == 0.0 ){
 
@@ -260,18 +225,18 @@ void AliHLTTPCConfMapTrack::Fill(AliHLTTPCVertex *vertex,Double_t max_Dca)
     }
     // for helix fit
     else { 
-// #### -B0-UNCHANGED-START == JMT
-       //fRadius = sqrt(fa2Xy*fa2Xy+1)/(2*fabs(fa1Xy));
-       Double_t radius = sqrt(fa2Xy*fa2Xy+1)/(2*fabs(fa1Xy));
-       SetRadius(radius);
-       
-       //fPt = (Double_t)(AliHLTTPCTransform::GetBFieldValue() * fRadius);
-       Double_t pt = (Double_t)(AliHLTTPCTransform::GetBFieldValue() * GetRadius());
-       SetPt(pt);
-       
-       if(GetPt() > max_Dca) //go for fit of helix in real space
+      //fRadius = sqrt(fa2Xy*fa2Xy+1)/(2*fabs(fa1Xy));
+      Double_t radius = sqrt(fa2Xy*fa2Xy+1)/(2*fabs(fa1Xy));
+      SetRadius(radius);
+      
+      //fPt = (Double_t)(AliHLTTPCTransform::GetBFieldValue() * fRadius);
+      Double_t pt = (Double_t)(AliHLTTPCTransform::GetBFieldValue() * GetRadius());
+      SetPt(pt);
+      //Set Error here?????
+      
+      if(GetPt() > max_Dca) //go for fit of helix in real space
        {
-           AliHLTTPCConfMapFit *fit = new AliHLTTPCConfMapFit(this,vertex);
+         AliHLTTPCConfMapFit *fit = new AliHLTTPCConfMapFit(this,vertex);
     /* Matthias 13.12.2006
      * the global variable AliHLTTPCS::fgDoVertexFit has never been used so far
      * and has always been kTRUE.
@@ -281,30 +246,28 @@ void AliHLTTPCConfMapTrack::Fill(AliHLTTPCVertex *vertex,Double_t max_Dca)
      * anyway. 
            ComesFromMainVertex(AliHLTTPC::DoVertexFit());
      */
-           ComesFromMainVertex(kTRUE);
-           fit->FitHelix();
-           
-           //AliHLTTPCConfMapPoint *lHit = (AliHLTTPCConfMapPoint*)fLastHit;
-           AliHLTTPCConfMapPoint *fHit = (AliHLTTPCConfMapPoint*)fFirstHit;
-           SetLastPoint(fHit->GetX(),fHit->GetY(),fHit->GetZ());
-           
-           UpdateToFirstPoint();
-           
-           delete fit;
+         ComesFromMainVertex(kTRUE);
+         fit->FitHelix();
+         
+         //AliHLTTPCConfMapPoint *lHit = (AliHLTTPCConfMapPoint*)fLastHit;
+         AliHLTTPCConfMapPoint *fHit = (AliHLTTPCConfMapPoint*)fFirstHit;
+         SetLastPoint(fHit->GetX(),fHit->GetY(),fHit->GetZ());
+         
+         UpdateToFirstPoint();
+         
+         delete fit;
        }
-       else if(GetPt() == 0) 
+      else if(GetPt() == 0) 
        {
-           LOG(AliHLTTPCLog::kError,"AliHLTTPCConfMapTrack::Fill","Tracks")<<AliHLTTPCLog::kDec<<
-               "Found track with Pt=0!!!"<<ENDLOG;
+         LOG(AliHLTTPCLog::kError,"AliHLTTPCConfMapTrack::Fill","Tracks")<<AliHLTTPCLog::kDec<<
+           "Found track with Pt=0!!!"<<ENDLOG;
        }
-       else
+      else
        {
-           LOG(AliHLTTPCLog::kError,"AliHLTTPCConfMapTrack::Fill","Tracks")<<AliHLTTPCLog::kDec<<
-               "Track with pt<max_Dca :"<<GetPt()<<ENDLOG;
+         LOG(AliHLTTPCLog::kError,"AliHLTTPCConfMapTrack::Fill","Tracks")<<AliHLTTPCLog::kDec<<
+           "Track with pt<max_Dca :"<<GetPt()<<ENDLOG;
        }
-// #### -B0-UNCHANGED-END == JMT
     }
-// #### -B0-CHANGE-END == JMT
 }
 
 Int_t AliHLTTPCConfMapTrack::GetMCLabel()