v6r6

RecSys/cmt/requirements

 package RecSys
-version v6r5
+version v6r6
 
 branches cmt doc python
  
@@ -35,11 +35,11 @@ use TrackUtils           v1r25   Tr   # Eduardo Rodrigues
 
 # Tf packages: Track Pattern Recognition
 use TrackSys             v4r22   Tf   # Stephanie Hansmann-Menzemer 
-use PatAlgorithms        v3r18   Tf   # Stephanie Hansmann-Menzemer
+use PatAlgorithms        v3r20   Tf   # Stephanie Hansmann-Menzemer
 use PatVelo              v3r12   Tf   # David Hutchcroft
 use PatVeloTT            v3r6    Tf   # Mariusz Witek
 use TfTools              v1r7    Tf   # Stephanie Hansmann-Menzemer
-use TrackMatching        v2r21p1 Tf   # Eduardo Rodrigues
+use TrackMatching        v2r21p2 Tf   # Eduardo Rodrigues
 use TrackSeeding         v1r4p2  Tf   # Eduardo Rodrigues, Henk Jan Bulten
 use TsaAlgorithms        v3r9    Tf   # Matt Needham
 

RecSys/cmt/version.cmt

-v6r5
+v6r6

RecSys/doc/release.notes

@@ -5,6 +5,18 @@ Purpose: LHCb reconstruction packages.
          This project groups together all the reconstruction packages needed
          by one or more LHCb applications. 
 
+</PRE><H1><A NAME=v6r6>2009-05-12 RecSys v6r6</A></H1><PRE>
+This version uses Gaudi v20r4 and LHCb v26r3. Built on branch v6b
+
+- Packages modified: PatAlgorithms v3r20, TrackMatching v2r21p2
+
+- In PatAlgorithms v3r19, v3r20
+  . Bug fix for PatForward (prevent from overwriting selected hits flags)
+  . Use scale factor from magnetic field service in PatAddTTCoord
+
+- In TrackMatching v2r21p2
+  . In TrackMatchveloSeed, change default for OmitSeedFitOutliers switch to false
+
 </PRE><H1><A NAME=v6r5>2009-04-22 RecSys v6r5</A></H1><PRE>
 This version uses Gaudi v20r4 and LHCb v26r3.
 

Tf/PatAlgorithms/cmt/requirements

@@ -3,7 +3,7 @@
 # Maintainer : Stephanie Hansmann-Menzemer
 #============================================================================
 package           PatAlgorithms
-version           v3r18
+version           v3r20
 
 #============================================================================
 # Structure, i.e. directories to process. 

Tf/PatAlgorithms/cmt/version.cmt

-v3r18
+v3r20

Tf/PatAlgorithms/doc/release.notes

@@ -4,6 +4,14 @@
 ! Purpose     : track finding
 !-----------------------------------------------------------------------------
 
+!========================== PatAlgorithms v3r20 2009-05-12 ===================
+! 2009-05-12 - Stephanie Hansmann-Menzemer
+  - Use scale factor from magnetic field service in PatAddTTCoord
+
+!========================== PatAlgorithms v3r19 2009-05-06 ===================
+! 2009-05-06 - Stephanie Hansmann-Menzemer
+ - bug fix for PatForward (prevent from overwritting selected hits flags)
+
 !========================== PatAlgorithms v3r18 2009-04-22 ===================
 ! 2009-04-22 - Stephanie Hansmann-Menzemer
   - make PatSeedFit safe against unreasonable track input

Tf/PatAlgorithms/src/PatAddTTCoord.cpp

-// $Id: PatAddTTCoord.cpp,v 1.2 2009-04-20 06:24:33 cattanem Exp $
+// $Id: PatAddTTCoord.cpp,v 1.3 2009-05-12 11:02:03 smenzeme Exp $
 // Include files
 
 // from Gaudi
@@ -49,6 +49,8 @@ StatusCode PatAddTTCoord::initialize ( ) {
 
   m_ttHitManager = tool<Tf::TTStationHitManager <PatTTHit> >("PatTTStationHitManager");
 
+  m_magFieldSvc = svc<ILHCbMagnetSvc>( "MagneticFieldSvc", true );
+
   return StatusCode::SUCCESS;
 }
 //=========================================================================
@@ -104,8 +106,10 @@ StatusCode PatAddTTCoord::addTTClusters( LHCb::Track& track ) {
 
     double tyTr = state.ty();
     updateTTHitForTrack( tt, state.y()-state.z()*state.ty(), tyTr );
-    
-    double xPred = state.x() + ( z-state.z() ) * state.tx() + m_ttParam * state.qOverP() * ( z - m_zTTField );
+
+    double magScaleFactor = m_magFieldSvc->scaleFactor() ;
+
+    double xPred = state.x() + ( z-state.z() ) * state.tx() + m_ttParam * magScaleFactor*state.qOverP() * ( z - m_zTTField );
     if ( fabs( xPred - tt->x() ) < tol ) {
       double projDist = ( xPred - tt->x() ) * ( m_zTTProj - m_zTTField ) / ( z - m_zTTField );
       tt->setProjection( projDist );

Tf/PatAlgorithms/src/PatAddTTCoord.h

-// $Id: PatAddTTCoord.h,v 1.1.1.1 2007-10-09 18:23:10 smenzeme Exp $
+// $Id: PatAddTTCoord.h,v 1.2 2009-05-12 11:02:03 smenzeme Exp $
 #ifndef PATADDTTCOORD_H
 #define PATADDTTCOORD_H 1
 
@@ -10,6 +10,8 @@
 #include "Event/State.h"
 #include "Event/STCluster.h"
 #include "TrackInterfaces/IAddTTClusterTool.h"            // Interface
+#include "Kernel/ILHCbMagnetSvc.h"
+
 
 #include "TfKernel/TTStationHitManager.h"
 #include "PatKernel/PatTTHit.h"
@@ -55,7 +57,8 @@
     double m_ttTolSlope;
     double m_zTTField;
     double m_zTTProj;
-    double m_ttMaxChi2;
+    double m_ttMaxChi2; 
+    ILHCbMagnetSvc*     m_magFieldSvc; 
 
   };
 

Tf/PatAlgorithms/src/PatForwardTool.cpp

-// $Id: PatForwardTool.cpp,v 1.14 2009-04-20 06:24:33 cattanem Exp $
+// $Id: PatForwardTool.cpp,v 1.15 2009-05-06 15:35:32 smenzeme Exp $
 // Include files
 
 // from Gaudi
@@ -445,7 +445,6 @@ StatusCode PatForwardTool::tracksFromTrack( const LHCb::Track& seed,
     //== Add reference to the used clusters/, T stations
     for ( PatFwdHits::iterator itH = (*itL).coordBegin(); (*itL).coordEnd() != itH; itH++ ) {
       PatFwdHit* myHit = (*itH);
-      if ( !myHit->isSelected() ) continue;
       fwTra->addToLhcbIDs( myHit->hit()->lhcbID() );
       myHit->hit()->setStatus(Tf::HitBase::UsedByPatForward);
       myHit->setIsUsed(true);

Tf/TrackMatching/cmt/requirements

@@ -3,7 +3,7 @@
 # Maintainer : Eduardo Rodrigues
 #============================================================================
 package           TrackMatching
-version           v2r21p1
+version           v2r21p2
 
 #============================================================================
 # Structure, i.e. directories to process. 

Tf/TrackMatching/cmt/version.cmt

-v2r21p1
+v2r21p2

Tf/TrackMatching/doc/release.notes

@@ -4,6 +4,12 @@
 ! Purpose     : Package for the track matching algorithms
 !-----------------------------------------------------------------------------
 
+!======================= TrackMatching v2r21p2 2009-05-08 ====================
+! built on branch v2r21b
+!
+! 2009-05-08 - Stephanie Hansmann-Menzemer
+ - change default for OmitSeedFitOutliers switch to false
+
 !======================= TrackMatching v2r21p1 2009-02-20 ====================
 ! 2009-02-13 - Marco Cattaneo
  - Fix rare untested StatusCode in TrackMatchVeloSeed

Tf/TrackMatching/src/TrackMatchVeloSeed.cpp

-// $Id: TrackMatchVeloSeed.cpp,v 1.9 2009-02-13 14:13:34 cattanem Exp $
+// $Id: TrackMatchVeloSeed.cpp,v 1.9.2.1 2009-05-08 16:11:04 cattanem Exp $
 // Include files 
 // -------------
 // from Gaudi
@@ -91,7 +91,7 @@ TrackMatchVeloSeed::TrackMatchVeloSeed( const std::string& name,
   declareProperty("nUseT", m_nUseT = 0u);
   declareProperty("nUseVelo", m_nUseVelo = 0u);
   
-  declareProperty("OmitSeedFitOutliers", m_omitSeedFitOutliers = true) ;
+  declareProperty("OmitSeedFitOutliers", m_omitSeedFitOutliers = false) ;
   /*switch on or off NN var. writing*/
   declareProperty( "writeNNVariables", m_writeNNVariables = true);
 }